[U-Boot] [PATCH v2 0/6] Clean up top-level directory structure
Changes since v1: - squashed lib_<ARCH> move into 1 commit - moved examples to examples/standalone - moved api_examples to examples/api
This series moves api_examples to api/examples and moves all lib* directories into a common lib/ directory. It also moves the <ARCH>_config.mk files into their corresponding lib directory.
Seeing 12 lib_<ARCH> directories and 12 <ARCH>_config.mk files in U-Boot's top level always annoyed me, and I finally had some time to reorganize:)
I compile tested on all PPC boards and verified an out of tree build.
This series needs the api_examples Make cleanup applied: http://www.mail-archive.com/u-boot@lists.denx.de/msg16032.html
Peter Tyser (6): Move architecture specific config.mk files into subdirs Move lib_<ARCH> directories to lib/<ARCH> Move lib_generic to lib/generic Move libfdt to lib/libfdt Move examples/ to examples/standalone Move api_examples to examples/api
Makefile | 36 +++++++++++--------- README | 24 ++++++------ board/BuS/EB+MCF-EV123/u-boot.lds | 8 ++-- board/LEOX/elpt860/u-boot.lds | 18 +++++----- board/LEOX/elpt860/u-boot.lds.debug | 4 +- board/RPXClassic/u-boot.lds | 8 ++-- board/RPXClassic/u-boot.lds.debug | 4 +- board/RPXlite/u-boot.lds | 8 ++-- board/RPXlite/u-boot.lds.debug | 4 +- board/RPXlite_dw/u-boot.lds | 8 ++-- board/RPXlite_dw/u-boot.lds.debug | 4 +- board/RRvision/u-boot.lds | 12 +++--- board/actux1/u-boot.lds | 6 ++-- board/actux2/u-boot.lds | 6 ++-- board/actux3/u-boot.lds | 6 ++-- board/amirix/ap1000/u-boot.lds | 6 ++-- board/atum8548/u-boot.lds | 6 ++-- board/bf518f-ezbrd/config.mk | 2 +- board/bf526-ezbrd/config.mk | 2 +- board/bf527-ezkit/config.mk | 2 +- board/bf533-ezkit/config.mk | 2 +- board/bf533-stamp/config.mk | 2 +- board/bf537-stamp/config.mk | 2 +- board/bf538f-ezkit/config.mk | 2 +- board/bf548-ezkit/config.mk | 2 +- board/bf561-ezkit/config.mk | 2 +- board/c2mon/u-boot.lds | 8 ++-- board/c2mon/u-boot.lds.debug | 4 +- board/cm-bf527/config.mk | 2 +- board/cm-bf533/config.mk | 2 +- board/cm-bf537e/config.mk | 2 +- board/cm-bf548/config.mk | 2 +- board/cm-bf561/config.mk | 2 +- board/cobra5272/u-boot.lds | 4 +- board/cogent/u-boot.lds.debug | 4 +- board/cray/L1/u-boot.lds | 6 ++-- board/cray/L1/u-boot.lds.debug | 6 ++-- board/csb272/u-boot.lds | 8 ++-- board/csb472/u-boot.lds | 8 ++-- board/dave/PPChameleonEVB/u-boot.lds | 6 ++-- board/eltec/mhpc/u-boot.lds.debug | 4 +- board/emk/top860/u-boot.lds.debug | 6 ++-- board/eric/u-boot.lds | 6 ++-- board/esd/ocrtc/u-boot.lds | 6 ++-- board/esd/tasreg/u-boot.lds | 4 +- board/esteem192e/u-boot.lds | 8 ++-- board/etx094/u-boot.lds | 4 +- board/etx094/u-boot.lds.debug | 8 ++-- board/exbitgen/u-boot.lds | 6 ++-- board/fads/u-boot.lds.debug | 6 ++-- board/flagadm/u-boot.lds.debug | 4 +- board/freescale/m52277evb/u-boot.spa | 4 +- board/freescale/m5235evb/u-boot.16 | 6 ++-- board/freescale/m5235evb/u-boot.32 | 4 +- board/freescale/m5249evb/u-boot.lds | 4 +- board/freescale/m5253demo/u-boot.lds | 4 +- board/freescale/m5253evbe/u-boot.lds | 4 +- board/freescale/m5271evb/u-boot.lds | 4 +- board/freescale/m5272c3/u-boot.lds | 4 +- board/freescale/m5275evb/u-boot.lds | 4 +- board/freescale/m5282evb/u-boot.lds | 6 ++-- board/freescale/m53017evb/u-boot.lds | 4 +- board/freescale/m5329evb/u-boot.lds | 6 ++-- board/freescale/m5373evb/u-boot.lds | 6 ++-- board/freescale/m54451evb/u-boot.spa | 6 ++-- board/freescale/m54451evb/u-boot.stm | 4 +- board/freescale/m54455evb/u-boot.atm | 6 ++-- board/freescale/m54455evb/u-boot.int | 6 ++-- board/freescale/m547xevb/u-boot.lds | 4 +- board/freescale/m548xevb/u-boot.lds | 4 +- board/freescale/mpc7448hpc2/tsi108_init.c | 2 +- board/freescale/mpc8610hpcd/u-boot.lds | 6 ++-- board/freescale/mpc8641hpcn/u-boot.lds | 6 ++-- board/freescale/mx31ads/u-boot.lds | 2 +- board/genietv/u-boot.lds | 8 ++-- board/genietv/u-boot.lds.debug | 8 ++-- board/hermes/u-boot.lds | 8 ++-- board/hermes/u-boot.lds.debug | 6 ++-- board/hymod/u-boot.lds | 8 ++-- board/hymod/u-boot.lds.debug | 4 +- board/icu862/u-boot.lds | 8 ++-- board/icu862/u-boot.lds.debug | 6 ++-- board/idmr/u-boot.lds | 4 +- board/ip860/u-boot.lds | 6 ++-- board/ip860/u-boot.lds.debug | 6 ++-- board/ivm/u-boot.lds.debug | 6 ++-- board/jse/jse.c | 6 ++-- board/jse/sdram.c | 2 +- board/keymile/km8xx/u-boot.lds | 12 +++--- board/kup/kup4k/u-boot.lds | 8 ++-- board/kup/kup4k/u-boot.lds.debug | 4 +- board/kup/kup4x/u-boot.lds | 8 ++-- board/kup/kup4x/u-boot.lds.debug | 4 +- board/lantec/u-boot.lds | 8 ++-- board/lantec/u-boot.lds.debug | 4 +- board/lwmon/u-boot.lds.debug | 6 ++-- board/mbx8xx/u-boot.lds.debug | 6 ++-- board/ml2/u-boot.lds | 6 ++-- board/ml2/u-boot.lds.debug | 6 ++-- board/mousse/u-boot.lds | 10 +++--- board/mousse/u-boot.lds.rom | 8 ++-- board/mpc8540eval/u-boot.lds | 6 ++-- board/mpl/mip405/u-boot.lds | 6 ++-- board/mpl/pip405/u-boot.lds | 6 ++-- board/mpl/pip405/u-boot.lds.debug | 6 ++-- board/netphone/u-boot.lds | 12 +++--- board/netphone/u-boot.lds.debug | 4 +- board/netstal/hcu4/hcu4.c | 2 +- board/netstal/hcu5/README.txt | 6 ++-- board/netstal/hcu5/hcu5.c | 2 +- board/netstal/mcu25/mcu25.c | 2 +- board/netstar/Makefile | 4 +- board/netta/u-boot.lds | 12 +++--- board/netta/u-boot.lds.debug | 4 +- board/netta2/u-boot.lds | 12 +++--- board/netta2/u-boot.lds.debug | 4 +- board/netvia/u-boot.lds | 12 +++--- board/netvia/u-boot.lds.debug | 4 +- board/nx823/u-boot.lds.debug | 4 +- board/pcs440ep/u-boot.lds | 2 +- board/pm854/u-boot.lds | 6 ++-- board/pm856/u-boot.lds | 6 ++-- board/purple/u-boot.lds | 2 +- board/quantum/u-boot.lds | 8 ++-- board/quantum/u-boot.lds.debug | 4 +- board/rbc823/u-boot.lds | 8 ++-- board/rmu/u-boot.lds | 8 ++-- board/rmu/u-boot.lds.debug | 4 +- board/sandburst/karef/u-boot.lds | 6 ++-- board/sandburst/karef/u-boot.lds.debug | 6 ++-- board/sandburst/metrobox/u-boot.lds | 6 ++-- board/sandburst/metrobox/u-boot.lds.debug | 6 ++-- board/sbc405/u-boot.lds | 6 ++-- board/sbc8548/u-boot.lds | 6 ++-- board/sbc8560/u-boot.lds | 6 ++-- board/sbc8641d/u-boot.lds | 6 ++-- board/sc3/u-boot.lds | 6 ++-- board/siemens/CCM/u-boot.lds | 8 ++-- board/siemens/CCM/u-boot.lds.debug | 4 +- board/siemens/IAD210/u-boot.lds | 4 +- board/siemens/pcu_e/u-boot.lds.debug | 6 ++-- board/snmc/qs850/u-boot.lds | 12 +++--- board/snmc/qs860t/u-boot.lds | 12 +++--- board/socrates/u-boot.lds | 6 ++-- board/spc1920/u-boot.lds | 12 +++--- board/spd8xx/u-boot.lds.debug | 6 ++-- board/stxgp3/u-boot.lds | 6 ++-- board/stxssa/stxssa.c | 2 +- board/stxssa/u-boot.lds | 6 ++-- board/stxxtc/u-boot.lds | 12 +++--- board/stxxtc/u-boot.lds.debug | 4 +- board/svm_sc8xx/u-boot.lds | 12 +++--- board/svm_sc8xx/u-boot.lds.debug | 4 +- board/tcm-bf537/config.mk | 2 +- board/tqc/tqm85xx/u-boot.lds | 6 ++-- board/tqc/tqm8xx/u-boot.lds | 10 +++--- board/tqc/tqm8xx/u-boot.lds.debug | 4 +- board/trab/Makefile | 6 ++-- board/trab/u-boot.lds | 8 ++-- board/uc100/u-boot.lds | 12 +++--- board/uc100/u-boot.lds.debug | 4 +- board/v37/u-boot.lds | 12 +++--- board/voiceblue/Makefile | 2 +- board/w7o/u-boot.lds.debug | 6 ++-- board/westel/amx860/u-boot.lds | 8 ++-- board/westel/amx860/u-boot.lds.debug | 6 ++-- board/xes/xpedite5170/u-boot.lds | 6 ++-- board/xilinx/ml300/u-boot.lds | 6 ++-- board/xilinx/ml300/u-boot.lds.debug | 6 ++-- board/xpedite1k/u-boot.lds | 6 ++-- board/xpedite1k/u-boot.lds.debug | 6 ++-- config.mk | 2 +- cpu/mpc5xxx/u-boot-customlayout.lds | 6 ++-- doc/README.LED | 2 +- doc/README.alaska8220 | 2 +- doc/README.m52277evb | 12 +++--- doc/README.m53017evb | 12 +++--- doc/README.m5373evb | 12 +++--- doc/README.m54455evb | 12 +++--- doc/README.m5475evb | 10 +++--- doc/README.mpc5xx | 6 ++-- doc/README.nios | 2 +- doc/TODO-i386 | 2 +- {api_examples => examples/api}/.gitignore | 0 {api_examples => examples/api}/Makefile | 22 ++++++------ {api_examples => examples/api}/crt0.S | 0 {api_examples => examples/api}/demo.c | 0 {api_examples => examples/api}/glue.c | 0 {api_examples => examples/api}/glue.h | 0 {api_examples => examples/api}/libgenwrap.c | 2 +- examples/{ => standalone}/.gitignore | 0 examples/{ => standalone}/82559_eeprom.c | 0 examples/{ => standalone}/Makefile | 0 examples/{ => standalone}/README.smc91111_eeprom | 0 examples/{ => standalone}/eepro100_eeprom.c | 0 examples/{ => standalone}/hello_world.c | 0 examples/{ => standalone}/interrupt.c | 0 examples/{ => standalone}/mem_to_mem_idma2intr.c | 0 examples/{ => standalone}/mips.lds | 0 examples/{ => standalone}/nios.lds | 0 examples/{ => standalone}/nios2.lds | 0 examples/{ => standalone}/ppc_longjmp.S | 0 examples/{ => standalone}/ppc_setjmp.S | 0 examples/{ => standalone}/sched.c | 0 examples/{ => standalone}/smc91111_eeprom.c | 0 examples/{ => standalone}/smc911x_eeprom.c | 0 examples/{ => standalone}/sparc.lds | 0 examples/{ => standalone}/stubs.c | 0 examples/{ => standalone}/test_burst.c | 0 examples/{ => standalone}/test_burst.h | 0 examples/{ => standalone}/test_burst_lib.S | 0 examples/{ => standalone}/timer.c | 0 examples/{ => standalone}/x86-testapp.c | 0 include/asm-i386/interrupt.h | 2 +- include/asm-i386/u-boot-i386.h | 4 +- include/common.h | 14 ++++---- include/configs/B2.h | 2 +- include/configs/bf533-stamp.h | 2 +- include/configs/bf537-pnav.h | 2 +- include/configs/bf537-stamp.h | 2 +- include/configs/bf538f-ezkit.h | 2 +- include/configs/bf561-ezkit.h | 4 +- include/configs/cm-bf537e.h | 2 +- include/configs/ibf-dsp561.h | 4 +- include/configs/tcm-bf537.h | 2 +- include/lzma/LzmaDecode.h | 2 +- include/lzma/LzmaTools.h | 2 +- include/lzma/LzmaTypes.h | 2 +- {lib_arm => lib/arm}/Makefile | 0 {lib_arm => lib/arm}/_ashldi3.S | 0 {lib_arm => lib/arm}/_ashrdi3.S | 0 {lib_arm => lib/arm}/_divsi3.S | 0 {lib_arm => lib/arm}/_modsi3.S | 0 {lib_arm => lib/arm}/_udivsi3.S | 0 {lib_arm => lib/arm}/_umodsi3.S | 0 {lib_arm => lib/arm}/board.c | 0 {lib_arm => lib/arm}/bootm.c | 0 {lib_arm => lib/arm}/cache-cp15.c | 0 {lib_arm => lib/arm}/cache.c | 0 arm_config.mk => lib/arm/config.mk | 0 {lib_arm => lib/arm}/div0.c | 0 {lib_arm => lib/arm}/interrupts.c | 0 {lib_arm => lib/arm}/reset.c | 0 {lib_avr32 => lib/avr32}/Makefile | 0 {lib_avr32 => lib/avr32}/board.c | 0 {lib_avr32 => lib/avr32}/bootm.c | 0 avr32_config.mk => lib/avr32/config.mk | 0 {lib_avr32 => lib/avr32}/interrupts.c | 0 {lib_avr32 => lib/avr32}/memset.S | 0 {lib_blackfin => lib/blackfin}/.gitignore | 0 {lib_blackfin => lib/blackfin}/Makefile | 0 {lib_blackfin => lib/blackfin}/board.c | 0 {lib_blackfin => lib/blackfin}/boot.c | 0 {lib_blackfin => lib/blackfin}/cache.c | 0 {lib_blackfin => lib/blackfin}/clocks.c | 0 blackfin_config.mk => lib/blackfin/config.mk | 2 +- {lib_blackfin => lib/blackfin}/memcmp.S | 0 {lib_blackfin => lib/blackfin}/memcpy.S | 0 {lib_blackfin => lib/blackfin}/memmove.S | 0 {lib_blackfin => lib/blackfin}/memset.S | 0 {lib_blackfin => lib/blackfin}/muldi3.c | 0 {lib_blackfin => lib/blackfin}/post.c | 0 {lib_blackfin => lib/blackfin}/string.c | 0 {lib_blackfin => lib/blackfin}/tests.c | 0 {lib_blackfin => lib/blackfin}/u-boot.lds.S | 0 {lib_generic => lib/generic}/Makefile | 0 {lib_generic => lib/generic}/addr_map.c | 0 {lib_generic => lib/generic}/bzlib.c | 0 {lib_generic => lib/generic}/bzlib_crctable.c | 0 {lib_generic => lib/generic}/bzlib_decompress.c | 0 {lib_generic => lib/generic}/bzlib_huffman.c | 0 {lib_generic => lib/generic}/bzlib_private.h | 0 {lib_generic => lib/generic}/bzlib_randtable.c | 0 {lib_generic => lib/generic}/crc16.c | 0 {lib_generic => lib/generic}/crc32.c | 0 {lib_generic => lib/generic}/ctype.c | 0 {lib_generic => lib/generic}/display_options.c | 0 {lib_generic => lib/generic}/div64.c | 0 {lib_generic => lib/generic}/gunzip.c | 0 {lib_generic => lib/generic}/ldiv.c | 0 {lib_generic => lib/generic}/lmb.c | 0 {lib_generic => lib/generic}/lzma/LGPL.txt | 0 {lib_generic => lib/generic}/lzma/LzmaDecode.c | 0 {lib_generic => lib/generic}/lzma/LzmaDecode.h | 0 {lib_generic => lib/generic}/lzma/LzmaTools.c | 0 {lib_generic => lib/generic}/lzma/LzmaTools.h | 0 {lib_generic => lib/generic}/lzma/LzmaTypes.h | 0 {lib_generic => lib/generic}/lzma/Makefile | 0 {lib_generic => lib/generic}/lzma/README.txt | 0 {lib_generic => lib/generic}/lzma/history.txt | 0 .../generic}/lzma/import_lzmasdk.sh | 0 {lib_generic => lib/generic}/lzma/lzma.txt | 0 {lib_generic => lib/generic}/lzo/Makefile | 0 .../generic}/lzo/lzo1x_decompress.c | 0 {lib_generic => lib/generic}/lzo/lzodefs.h | 0 {lib_generic => lib/generic}/md5.c | 0 {lib_generic => lib/generic}/rbtree.c | 0 {lib_generic => lib/generic}/sha1.c | 0 {lib_generic => lib/generic}/sha256.c | 0 {lib_generic => lib/generic}/string.c | 0 {lib_generic => lib/generic}/strmhz.c | 0 {lib_generic => lib/generic}/vsprintf.c | 0 {lib_generic => lib/generic}/zlib.c | 0 {lib_i386 => lib/i386}/Makefile | 0 {lib_i386 => lib/i386}/bios.S | 0 {lib_i386 => lib/i386}/bios.h | 0 {lib_i386 => lib/i386}/bios_pci.S | 0 {lib_i386 => lib/i386}/bios_setup.c | 0 {lib_i386 => lib/i386}/board.c | 0 {lib_i386 => lib/i386}/bootm.c | 0 i386_config.mk => lib/i386/config.mk | 0 {lib_i386 => lib/i386}/interrupts.c | 0 {lib_i386 => lib/i386}/pcat_interrupts.c | 0 {lib_i386 => lib/i386}/pcat_timer.c | 0 {lib_i386 => lib/i386}/pci.c | 0 {lib_i386 => lib/i386}/pci_type1.c | 0 {lib_i386 => lib/i386}/realmode.c | 0 {lib_i386 => lib/i386}/realmode_switch.S | 0 {lib_i386 => lib/i386}/timer.c | 0 {lib_i386 => lib/i386}/video.c | 0 {lib_i386 => lib/i386}/video_bios.c | 0 {lib_i386 => lib/i386}/zimage.c | 0 {libfdt => lib/libfdt}/Makefile | 0 {libfdt => lib/libfdt}/README | 0 {libfdt => lib/libfdt}/fdt.c | 0 {libfdt => lib/libfdt}/fdt_ro.c | 0 {libfdt => lib/libfdt}/fdt_rw.c | 0 {libfdt => lib/libfdt}/fdt_strerror.c | 0 {libfdt => lib/libfdt}/fdt_sw.c | 0 {libfdt => lib/libfdt}/fdt_wip.c | 0 {libfdt => lib/libfdt}/libfdt_internal.h | 0 {lib_m68k => lib/m68k}/Makefile | 0 {lib_m68k => lib/m68k}/board.c | 0 {lib_m68k => lib/m68k}/bootm.c | 0 {lib_m68k => lib/m68k}/cache.c | 0 m68k_config.mk => lib/m68k/config.mk | 0 {lib_m68k => lib/m68k}/interrupts.c | 0 {lib_m68k => lib/m68k}/time.c | 0 {lib_m68k => lib/m68k}/traps.c | 0 {lib_microblaze => lib/microblaze}/Makefile | 0 {lib_microblaze => lib/microblaze}/board.c | 0 {lib_microblaze => lib/microblaze}/bootm.c | 0 {lib_microblaze => lib/microblaze}/cache.c | 0 microblaze_config.mk => lib/microblaze/config.mk | 0 {lib_microblaze => lib/microblaze}/time.c | 0 {lib_mips => lib/mips}/Makefile | 0 {lib_mips => lib/mips}/board.c | 0 {lib_mips => lib/mips}/bootm.c | 0 {lib_mips => lib/mips}/bootm_qemu_mips.c | 0 mips_config.mk => lib/mips/config.mk | 0 {lib_mips => lib/mips}/time.c | 0 {lib_nios => lib/nios}/Makefile | 0 {lib_nios => lib/nios}/board.c | 0 {lib_nios => lib/nios}/bootm.c | 0 {lib_nios => lib/nios}/cache.c | 0 nios_config.mk => lib/nios/config.mk | 0 {lib_nios => lib/nios}/divmod.c | 0 {lib_nios => lib/nios}/math.h | 0 {lib_nios => lib/nios}/mult.c | 0 {lib_nios => lib/nios}/time.c | 0 {lib_nios2 => lib/nios2}/Makefile | 0 {lib_nios2 => lib/nios2}/board.c | 0 {lib_nios2 => lib/nios2}/bootm.c | 0 {lib_nios2 => lib/nios2}/cache.S | 0 nios2_config.mk => lib/nios2/config.mk | 0 {lib_nios2 => lib/nios2}/divmod.c | 0 {lib_nios2 => lib/nios2}/math.h | 0 {lib_nios2 => lib/nios2}/mult.c | 0 {lib_nios2 => lib/nios2}/time.c | 0 {lib_ppc => lib/ppc}/Makefile | 0 {lib_ppc => lib/ppc}/bat_rw.c | 0 {lib_ppc => lib/ppc}/board.c | 0 {lib_ppc => lib/ppc}/bootm.c | 0 {lib_ppc => lib/ppc}/cache.c | 0 ppc_config.mk => lib/ppc/config.mk | 0 {lib_ppc => lib/ppc}/extable.c | 0 {lib_ppc => lib/ppc}/interrupts.c | 0 {lib_ppc => lib/ppc}/kgdb.c | 0 {lib_ppc => lib/ppc}/ppccache.S | 0 {lib_ppc => lib/ppc}/ppcstring.S | 0 {lib_ppc => lib/ppc}/ticks.S | 0 {lib_ppc => lib/ppc}/time.c | 0 {lib_sh => lib/sh}/Makefile | 0 {lib_sh => lib/sh}/board.c | 0 {lib_sh => lib/sh}/bootm.c | 0 sh_config.mk => lib/sh/config.mk | 0 {lib_sh => lib/sh}/time.c | 0 {lib_sh => lib/sh}/time_sh2.c | 0 {lib_sparc => lib/sparc}/Makefile | 0 {lib_sparc => lib/sparc}/board.c | 0 {lib_sparc => lib/sparc}/bootm.c | 0 {lib_sparc => lib/sparc}/cache.c | 0 sparc_config.mk => lib/sparc/config.mk | 0 {lib_sparc => lib/sparc}/interrupts.c | 0 {lib_sparc => lib/sparc}/time.c | 0 nand_spl/board/freescale/mpc8313erdb/Makefile | 6 ++-- nand_spl/board/sheldon/simpc8313/Makefile | 6 ++-- tools/Makefile | 12 +++--- tools/env/Makefile | 2 +- tools/imls/Makefile | 14 ++++---- 400 files changed, 617 insertions(+), 613 deletions(-) rename {api_examples => examples/api}/.gitignore (100%) rename {api_examples => examples/api}/Makefile (80%) rename {api_examples => examples/api}/crt0.S (100%) rename {api_examples => examples/api}/demo.c (100%) rename {api_examples => examples/api}/glue.c (100%) rename {api_examples => examples/api}/glue.h (100%) rename {api_examples => examples/api}/libgenwrap.c (96%) rename examples/{ => standalone}/.gitignore (100%) rename examples/{ => standalone}/82559_eeprom.c (100%) rename examples/{ => standalone}/Makefile (100%) rename examples/{ => standalone}/README.smc91111_eeprom (100%) rename examples/{ => standalone}/eepro100_eeprom.c (100%) rename examples/{ => standalone}/hello_world.c (100%) rename examples/{ => standalone}/interrupt.c (100%) rename examples/{ => standalone}/mem_to_mem_idma2intr.c (100%) rename examples/{ => standalone}/mips.lds (100%) rename examples/{ => standalone}/nios.lds (100%) rename examples/{ => standalone}/nios2.lds (100%) rename examples/{ => standalone}/ppc_longjmp.S (100%) rename examples/{ => standalone}/ppc_setjmp.S (100%) rename examples/{ => standalone}/sched.c (100%) rename examples/{ => standalone}/smc91111_eeprom.c (100%) rename examples/{ => standalone}/smc911x_eeprom.c (100%) rename examples/{ => standalone}/sparc.lds (100%) rename examples/{ => standalone}/stubs.c (100%) rename examples/{ => standalone}/test_burst.c (100%) rename examples/{ => standalone}/test_burst.h (100%) rename examples/{ => standalone}/test_burst_lib.S (100%) rename examples/{ => standalone}/timer.c (100%) rename examples/{ => standalone}/x86-testapp.c (100%) rename {lib_arm => lib/arm}/Makefile (100%) rename {lib_arm => lib/arm}/_ashldi3.S (100%) rename {lib_arm => lib/arm}/_ashrdi3.S (100%) rename {lib_arm => lib/arm}/_divsi3.S (100%) rename {lib_arm => lib/arm}/_modsi3.S (100%) rename {lib_arm => lib/arm}/_udivsi3.S (100%) rename {lib_arm => lib/arm}/_umodsi3.S (100%) rename {lib_arm => lib/arm}/board.c (100%) rename {lib_arm => lib/arm}/bootm.c (100%) rename {lib_arm => lib/arm}/cache-cp15.c (100%) rename {lib_arm => lib/arm}/cache.c (100%) rename arm_config.mk => lib/arm/config.mk (100%) rename {lib_arm => lib/arm}/div0.c (100%) rename {lib_arm => lib/arm}/interrupts.c (100%) rename {lib_arm => lib/arm}/reset.c (100%) rename {lib_avr32 => lib/avr32}/Makefile (100%) rename {lib_avr32 => lib/avr32}/board.c (100%) rename {lib_avr32 => lib/avr32}/bootm.c (100%) rename avr32_config.mk => lib/avr32/config.mk (100%) rename {lib_avr32 => lib/avr32}/interrupts.c (100%) rename {lib_avr32 => lib/avr32}/memset.S (100%) rename {lib_blackfin => lib/blackfin}/.gitignore (100%) rename {lib_blackfin => lib/blackfin}/Makefile (100%) rename {lib_blackfin => lib/blackfin}/board.c (100%) rename {lib_blackfin => lib/blackfin}/boot.c (100%) rename {lib_blackfin => lib/blackfin}/cache.c (100%) rename {lib_blackfin => lib/blackfin}/clocks.c (100%) rename blackfin_config.mk => lib/blackfin/config.mk (98%) rename {lib_blackfin => lib/blackfin}/memcmp.S (100%) rename {lib_blackfin => lib/blackfin}/memcpy.S (100%) rename {lib_blackfin => lib/blackfin}/memmove.S (100%) rename {lib_blackfin => lib/blackfin}/memset.S (100%) rename {lib_blackfin => lib/blackfin}/muldi3.c (100%) rename {lib_blackfin => lib/blackfin}/post.c (100%) rename {lib_blackfin => lib/blackfin}/string.c (100%) rename {lib_blackfin => lib/blackfin}/tests.c (100%) rename {lib_blackfin => lib/blackfin}/u-boot.lds.S (100%) rename {lib_generic => lib/generic}/Makefile (100%) rename {lib_generic => lib/generic}/addr_map.c (100%) rename {lib_generic => lib/generic}/bzlib.c (100%) rename {lib_generic => lib/generic}/bzlib_crctable.c (100%) rename {lib_generic => lib/generic}/bzlib_decompress.c (100%) rename {lib_generic => lib/generic}/bzlib_huffman.c (100%) rename {lib_generic => lib/generic}/bzlib_private.h (100%) rename {lib_generic => lib/generic}/bzlib_randtable.c (100%) rename {lib_generic => lib/generic}/crc16.c (100%) rename {lib_generic => lib/generic}/crc32.c (100%) rename {lib_generic => lib/generic}/ctype.c (100%) rename {lib_generic => lib/generic}/display_options.c (100%) rename {lib_generic => lib/generic}/div64.c (100%) rename {lib_generic => lib/generic}/gunzip.c (100%) rename {lib_generic => lib/generic}/ldiv.c (100%) rename {lib_generic => lib/generic}/lmb.c (100%) rename {lib_generic => lib/generic}/lzma/LGPL.txt (100%) rename {lib_generic => lib/generic}/lzma/LzmaDecode.c (100%) rename {lib_generic => lib/generic}/lzma/LzmaDecode.h (100%) rename {lib_generic => lib/generic}/lzma/LzmaTools.c (100%) rename {lib_generic => lib/generic}/lzma/LzmaTools.h (100%) rename {lib_generic => lib/generic}/lzma/LzmaTypes.h (100%) rename {lib_generic => lib/generic}/lzma/Makefile (100%) rename {lib_generic => lib/generic}/lzma/README.txt (100%) rename {lib_generic => lib/generic}/lzma/history.txt (100%) rename {lib_generic => lib/generic}/lzma/import_lzmasdk.sh (100%) rename {lib_generic => lib/generic}/lzma/lzma.txt (100%) rename {lib_generic => lib/generic}/lzo/Makefile (100%) rename {lib_generic => lib/generic}/lzo/lzo1x_decompress.c (100%) rename {lib_generic => lib/generic}/lzo/lzodefs.h (100%) rename {lib_generic => lib/generic}/md5.c (100%) rename {lib_generic => lib/generic}/rbtree.c (100%) rename {lib_generic => lib/generic}/sha1.c (100%) rename {lib_generic => lib/generic}/sha256.c (100%) rename {lib_generic => lib/generic}/string.c (100%) rename {lib_generic => lib/generic}/strmhz.c (100%) rename {lib_generic => lib/generic}/vsprintf.c (100%) rename {lib_generic => lib/generic}/zlib.c (100%) rename {lib_i386 => lib/i386}/Makefile (100%) rename {lib_i386 => lib/i386}/bios.S (100%) rename {lib_i386 => lib/i386}/bios.h (100%) rename {lib_i386 => lib/i386}/bios_pci.S (100%) rename {lib_i386 => lib/i386}/bios_setup.c (100%) rename {lib_i386 => lib/i386}/board.c (100%) rename {lib_i386 => lib/i386}/bootm.c (100%) rename i386_config.mk => lib/i386/config.mk (100%) rename {lib_i386 => lib/i386}/interrupts.c (100%) rename {lib_i386 => lib/i386}/pcat_interrupts.c (100%) rename {lib_i386 => lib/i386}/pcat_timer.c (100%) rename {lib_i386 => lib/i386}/pci.c (100%) rename {lib_i386 => lib/i386}/pci_type1.c (100%) rename {lib_i386 => lib/i386}/realmode.c (100%) rename {lib_i386 => lib/i386}/realmode_switch.S (100%) rename {lib_i386 => lib/i386}/timer.c (100%) rename {lib_i386 => lib/i386}/video.c (100%) rename {lib_i386 => lib/i386}/video_bios.c (100%) rename {lib_i386 => lib/i386}/zimage.c (100%) rename {libfdt => lib/libfdt}/Makefile (100%) rename {libfdt => lib/libfdt}/README (100%) rename {libfdt => lib/libfdt}/fdt.c (100%) rename {libfdt => lib/libfdt}/fdt_ro.c (100%) rename {libfdt => lib/libfdt}/fdt_rw.c (100%) rename {libfdt => lib/libfdt}/fdt_strerror.c (100%) rename {libfdt => lib/libfdt}/fdt_sw.c (100%) rename {libfdt => lib/libfdt}/fdt_wip.c (100%) rename {libfdt => lib/libfdt}/libfdt_internal.h (100%) rename {lib_m68k => lib/m68k}/Makefile (100%) rename {lib_m68k => lib/m68k}/board.c (100%) rename {lib_m68k => lib/m68k}/bootm.c (100%) rename {lib_m68k => lib/m68k}/cache.c (100%) rename m68k_config.mk => lib/m68k/config.mk (100%) rename {lib_m68k => lib/m68k}/interrupts.c (100%) rename {lib_m68k => lib/m68k}/time.c (100%) rename {lib_m68k => lib/m68k}/traps.c (100%) rename {lib_microblaze => lib/microblaze}/Makefile (100%) rename {lib_microblaze => lib/microblaze}/board.c (100%) rename {lib_microblaze => lib/microblaze}/bootm.c (100%) rename {lib_microblaze => lib/microblaze}/cache.c (100%) rename microblaze_config.mk => lib/microblaze/config.mk (100%) rename {lib_microblaze => lib/microblaze}/time.c (100%) rename {lib_mips => lib/mips}/Makefile (100%) rename {lib_mips => lib/mips}/board.c (100%) rename {lib_mips => lib/mips}/bootm.c (100%) rename {lib_mips => lib/mips}/bootm_qemu_mips.c (100%) rename mips_config.mk => lib/mips/config.mk (100%) rename {lib_mips => lib/mips}/time.c (100%) rename {lib_nios => lib/nios}/Makefile (100%) rename {lib_nios => lib/nios}/board.c (100%) rename {lib_nios => lib/nios}/bootm.c (100%) rename {lib_nios => lib/nios}/cache.c (100%) rename nios_config.mk => lib/nios/config.mk (100%) rename {lib_nios => lib/nios}/divmod.c (100%) rename {lib_nios => lib/nios}/math.h (100%) rename {lib_nios => lib/nios}/mult.c (100%) rename {lib_nios => lib/nios}/time.c (100%) rename {lib_nios2 => lib/nios2}/Makefile (100%) rename {lib_nios2 => lib/nios2}/board.c (100%) rename {lib_nios2 => lib/nios2}/bootm.c (100%) rename {lib_nios2 => lib/nios2}/cache.S (100%) rename nios2_config.mk => lib/nios2/config.mk (100%) rename {lib_nios2 => lib/nios2}/divmod.c (100%) rename {lib_nios2 => lib/nios2}/math.h (100%) rename {lib_nios2 => lib/nios2}/mult.c (100%) rename {lib_nios2 => lib/nios2}/time.c (100%) rename {lib_ppc => lib/ppc}/Makefile (100%) rename {lib_ppc => lib/ppc}/bat_rw.c (100%) rename {lib_ppc => lib/ppc}/board.c (100%) rename {lib_ppc => lib/ppc}/bootm.c (100%) rename {lib_ppc => lib/ppc}/cache.c (100%) rename ppc_config.mk => lib/ppc/config.mk (100%) rename {lib_ppc => lib/ppc}/extable.c (100%) rename {lib_ppc => lib/ppc}/interrupts.c (100%) rename {lib_ppc => lib/ppc}/kgdb.c (100%) rename {lib_ppc => lib/ppc}/ppccache.S (100%) rename {lib_ppc => lib/ppc}/ppcstring.S (100%) rename {lib_ppc => lib/ppc}/ticks.S (100%) rename {lib_ppc => lib/ppc}/time.c (100%) rename {lib_sh => lib/sh}/Makefile (100%) rename {lib_sh => lib/sh}/board.c (100%) rename {lib_sh => lib/sh}/bootm.c (100%) rename sh_config.mk => lib/sh/config.mk (100%) rename {lib_sh => lib/sh}/time.c (100%) rename {lib_sh => lib/sh}/time_sh2.c (100%) rename {lib_sparc => lib/sparc}/Makefile (100%) rename {lib_sparc => lib/sparc}/board.c (100%) rename {lib_sparc => lib/sparc}/bootm.c (100%) rename {lib_sparc => lib/sparc}/cache.c (100%) rename sparc_config.mk => lib/sparc/config.mk (100%) rename {lib_sparc => lib/sparc}/interrupts.c (100%) rename {lib_sparc => lib/sparc}/time.c (100%)
This cleans up U-Boot's toplevel directory a bit and makes the architecture 'config.mk' file naming and location similar to board and cpu 'config.mk' files
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- config.mk | 2 +- arm_config.mk => lib_arm/config.mk | 0 avr32_config.mk => lib_avr32/config.mk | 0 blackfin_config.mk => lib_blackfin/config.mk | 0 i386_config.mk => lib_i386/config.mk | 0 m68k_config.mk => lib_m68k/config.mk | 0 microblaze_config.mk => lib_microblaze/config.mk | 0 mips_config.mk => lib_mips/config.mk | 0 nios_config.mk => lib_nios/config.mk | 0 nios2_config.mk => lib_nios2/config.mk | 0 ppc_config.mk => lib_ppc/config.mk | 0 sh_config.mk => lib_sh/config.mk | 0 sparc_config.mk => lib_sparc/config.mk | 0 13 files changed, 1 insertions(+), 1 deletions(-) rename arm_config.mk => lib_arm/config.mk (100%) rename avr32_config.mk => lib_avr32/config.mk (100%) rename blackfin_config.mk => lib_blackfin/config.mk (100%) rename i386_config.mk => lib_i386/config.mk (100%) rename m68k_config.mk => lib_m68k/config.mk (100%) rename microblaze_config.mk => lib_microblaze/config.mk (100%) rename mips_config.mk => lib_mips/config.mk (100%) rename nios_config.mk => lib_nios/config.mk (100%) rename nios2_config.mk => lib_nios2/config.mk (100%) rename ppc_config.mk => lib_ppc/config.mk (100%) rename sh_config.mk => lib_sh/config.mk (100%) rename sparc_config.mk => lib_sparc/config.mk (100%)
diff --git a/config.mk b/config.mk index 7fc0453..02700f3 100644 --- a/config.mk +++ b/config.mk @@ -85,3 +85,3 @@ sinclude $(OBJTREE)/include/autoconf.mk ifdef ARCH -sinclude $(TOPDIR)/$(ARCH)_config.mk # include architecture dependend rules +sinclude $(TOPDIR)/lib_$(ARCH)/config.mk # include architecture dependend rules endif diff --git a/arm_config.mk b/lib_arm/config.mk similarity index 100% rename from arm_config.mk rename to lib_arm/config.mk diff --git a/avr32_config.mk b/lib_avr32/config.mk similarity index 100% rename from avr32_config.mk rename to lib_avr32/config.mk diff --git a/blackfin_config.mk b/lib_blackfin/config.mk similarity index 100% rename from blackfin_config.mk rename to lib_blackfin/config.mk diff --git a/i386_config.mk b/lib_i386/config.mk similarity index 100% rename from i386_config.mk rename to lib_i386/config.mk diff --git a/m68k_config.mk b/lib_m68k/config.mk similarity index 100% rename from m68k_config.mk rename to lib_m68k/config.mk diff --git a/microblaze_config.mk b/lib_microblaze/config.mk similarity index 100% rename from microblaze_config.mk rename to lib_microblaze/config.mk diff --git a/mips_config.mk b/lib_mips/config.mk similarity index 100% rename from mips_config.mk rename to lib_mips/config.mk diff --git a/nios_config.mk b/lib_nios/config.mk similarity index 100% rename from nios_config.mk rename to lib_nios/config.mk diff --git a/nios2_config.mk b/lib_nios2/config.mk similarity index 100% rename from nios2_config.mk rename to lib_nios2/config.mk diff --git a/ppc_config.mk b/lib_ppc/config.mk similarity index 100% rename from ppc_config.mk rename to lib_ppc/config.mk diff --git a/sh_config.mk b/lib_sh/config.mk similarity index 100% rename from sh_config.mk rename to lib_sh/config.mk diff --git a/sparc_config.mk b/lib_sparc/config.mk similarity index 100% rename from sparc_config.mk rename to lib_sparc/config.mk
Dear Peter Tyser,
In message 1247241800-29059-2-git-send-email-ptyser@xes-inc.com you wrote:
This cleans up U-Boot's toplevel directory a bit and makes the architecture 'config.mk' file naming and location similar to board and cpu 'config.mk' files
Signed-off-by: Peter Tyser ptyser@xes-inc.com
config.mk | 2 +- arm_config.mk => lib_arm/config.mk | 0 avr32_config.mk => lib_avr32/config.mk | 0 blackfin_config.mk => lib_blackfin/config.mk | 0 i386_config.mk => lib_i386/config.mk | 0 m68k_config.mk => lib_m68k/config.mk | 0 microblaze_config.mk => lib_microblaze/config.mk | 0 mips_config.mk => lib_mips/config.mk | 0 nios_config.mk => lib_nios/config.mk | 0 nios2_config.mk => lib_nios2/config.mk | 0 ppc_config.mk => lib_ppc/config.mk | 0 sh_config.mk => lib_sh/config.mk | 0 sparc_config.mk => lib_sparc/config.mk | 0 13 files changed, 1 insertions(+), 1 deletions(-) rename arm_config.mk => lib_arm/config.mk (100%) rename avr32_config.mk => lib_avr32/config.mk (100%) rename blackfin_config.mk => lib_blackfin/config.mk (100%) rename i386_config.mk => lib_i386/config.mk (100%) rename m68k_config.mk => lib_m68k/config.mk (100%) rename microblaze_config.mk => lib_microblaze/config.mk (100%) rename mips_config.mk => lib_mips/config.mk (100%) rename nios_config.mk => lib_nios/config.mk (100%) rename nios2_config.mk => lib_nios2/config.mk (100%) rename ppc_config.mk => lib_ppc/config.mk (100%) rename sh_config.mk => lib_sh/config.mk (100%) rename sparc_config.mk => lib_sparc/config.mk (100%)
Applied, thanks.
Best regards,
Wolfgang Denk
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 6 +++--- README | 22 +++++++++++----------- api_examples/Makefile | 4 ++-- board/LEOX/elpt860/u-boot.lds | 10 +++++----- board/RPXClassic/u-boot.lds | 2 +- board/RPXlite/u-boot.lds | 2 +- board/RPXlite_dw/u-boot.lds | 2 +- board/RRvision/u-boot.lds | 6 +++--- board/actux1/u-boot.lds | 2 +- board/actux2/u-boot.lds | 2 +- board/actux3/u-boot.lds | 2 +- board/amirix/ap1000/u-boot.lds | 2 +- board/atum8548/u-boot.lds | 2 +- board/c2mon/u-boot.lds | 2 +- board/cobra5272/u-boot.lds | 2 +- board/cray/L1/u-boot.lds | 2 +- board/cray/L1/u-boot.lds.debug | 2 +- board/csb272/u-boot.lds | 4 ++-- board/csb472/u-boot.lds | 4 ++-- board/dave/PPChameleonEVB/u-boot.lds | 2 +- board/emk/top860/u-boot.lds.debug | 2 +- board/eric/u-boot.lds | 2 +- board/esd/ocrtc/u-boot.lds | 2 +- board/esd/tasreg/u-boot.lds | 2 +- board/esteem192e/u-boot.lds | 2 +- board/etx094/u-boot.lds.debug | 4 ++-- board/exbitgen/u-boot.lds | 2 +- board/fads/u-boot.lds.debug | 2 +- board/freescale/m52277evb/u-boot.spa | 2 +- board/freescale/m5235evb/u-boot.16 | 4 ++-- board/freescale/m5235evb/u-boot.32 | 2 +- board/freescale/m5249evb/u-boot.lds | 2 +- board/freescale/m5253demo/u-boot.lds | 2 +- board/freescale/m5253evbe/u-boot.lds | 2 +- board/freescale/m5271evb/u-boot.lds | 2 +- board/freescale/m5272c3/u-boot.lds | 2 +- board/freescale/m53017evb/u-boot.lds | 2 +- board/freescale/m5329evb/u-boot.lds | 4 ++-- board/freescale/m5373evb/u-boot.lds | 4 ++-- board/freescale/m54451evb/u-boot.spa | 4 ++-- board/freescale/m54451evb/u-boot.stm | 2 +- board/freescale/m54455evb/u-boot.atm | 4 ++-- board/freescale/m54455evb/u-boot.int | 4 ++-- board/freescale/m547xevb/u-boot.lds | 4 ++-- board/freescale/m548xevb/u-boot.lds | 4 ++-- board/freescale/mpc7448hpc2/tsi108_init.c | 2 +- board/freescale/mpc8610hpcd/u-boot.lds | 2 +- board/freescale/mpc8641hpcn/u-boot.lds | 2 +- board/freescale/mx31ads/u-boot.lds | 2 +- board/genietv/u-boot.lds | 2 +- board/genietv/u-boot.lds.debug | 2 +- board/hermes/u-boot.lds | 6 +++--- board/hermes/u-boot.lds.debug | 6 +++--- board/hymod/u-boot.lds | 2 +- board/icu862/u-boot.lds | 2 +- board/icu862/u-boot.lds.debug | 2 +- board/idmr/u-boot.lds | 2 +- board/ip860/u-boot.lds | 6 +++--- board/ip860/u-boot.lds.debug | 6 +++--- board/ivm/u-boot.lds.debug | 2 +- board/jse/jse.c | 6 +++--- board/jse/sdram.c | 2 +- board/keymile/km8xx/u-boot.lds | 6 +++--- board/kup/kup4k/u-boot.lds | 2 +- board/kup/kup4x/u-boot.lds | 2 +- board/lantec/u-boot.lds | 2 +- board/lwmon/u-boot.lds.debug | 2 +- board/mbx8xx/u-boot.lds.debug | 2 +- board/ml2/u-boot.lds | 2 +- board/ml2/u-boot.lds.debug | 2 +- board/mousse/u-boot.lds | 4 ++-- board/mousse/u-boot.lds.rom | 2 +- board/mpc8540eval/u-boot.lds | 2 +- board/mpl/mip405/u-boot.lds | 2 +- board/mpl/pip405/u-boot.lds | 2 +- board/mpl/pip405/u-boot.lds.debug | 2 +- board/netphone/u-boot.lds | 6 +++--- board/netstal/hcu4/hcu4.c | 2 +- board/netstal/hcu5/README.txt | 6 +++--- board/netstal/hcu5/hcu5.c | 2 +- board/netstal/mcu25/mcu25.c | 2 +- board/netta/u-boot.lds | 6 +++--- board/netta2/u-boot.lds | 6 +++--- board/netvia/u-boot.lds | 6 +++--- board/pm854/u-boot.lds | 2 +- board/pm856/u-boot.lds | 2 +- board/quantum/u-boot.lds | 2 +- board/rbc823/u-boot.lds | 2 +- board/rmu/u-boot.lds | 2 +- board/sandburst/karef/u-boot.lds | 2 +- board/sandburst/karef/u-boot.lds.debug | 2 +- board/sandburst/metrobox/u-boot.lds | 2 +- board/sandburst/metrobox/u-boot.lds.debug | 2 +- board/sbc405/u-boot.lds | 2 +- board/sbc8548/u-boot.lds | 2 +- board/sbc8560/u-boot.lds | 2 +- board/sbc8641d/u-boot.lds | 2 +- board/sc3/u-boot.lds | 2 +- board/siemens/CCM/u-boot.lds | 2 +- board/siemens/IAD210/u-boot.lds | 4 ++-- board/siemens/pcu_e/u-boot.lds.debug | 2 +- board/snmc/qs850/u-boot.lds | 6 +++--- board/snmc/qs860t/u-boot.lds | 6 +++--- board/socrates/u-boot.lds | 2 +- board/spc1920/u-boot.lds | 6 +++--- board/spd8xx/u-boot.lds.debug | 2 +- board/stxgp3/u-boot.lds | 2 +- board/stxssa/stxssa.c | 2 +- board/stxssa/u-boot.lds | 2 +- board/stxxtc/u-boot.lds | 6 +++--- board/svm_sc8xx/u-boot.lds | 6 +++--- board/tqc/tqm85xx/u-boot.lds | 2 +- board/tqc/tqm8xx/u-boot.lds | 4 ++-- board/trab/Makefile | 4 ++-- board/trab/u-boot.lds | 2 +- board/uc100/u-boot.lds | 6 +++--- board/v37/u-boot.lds | 6 +++--- board/w7o/u-boot.lds.debug | 2 +- board/westel/amx860/u-boot.lds | 2 +- board/westel/amx860/u-boot.lds.debug | 2 +- board/xes/xpedite5170/u-boot.lds | 2 +- board/xilinx/ml300/u-boot.lds | 2 +- board/xilinx/ml300/u-boot.lds.debug | 2 +- board/xpedite1k/u-boot.lds | 2 +- board/xpedite1k/u-boot.lds.debug | 2 +- config.mk | 2 +- cpu/mpc5xxx/u-boot-customlayout.lds | 4 ++-- doc/README.LED | 2 +- doc/README.alaska8220 | 2 +- doc/README.m52277evb | 12 ++++++------ doc/README.m53017evb | 12 ++++++------ doc/README.m5373evb | 12 ++++++------ doc/README.m54455evb | 12 ++++++------ doc/README.m5475evb | 10 +++++----- doc/README.mpc5xx | 6 +++--- doc/README.nios | 2 +- doc/TODO-i386 | 2 +- include/asm-i386/interrupt.h | 2 +- include/asm-i386/u-boot-i386.h | 4 ++-- include/common.h | 8 ++++---- include/configs/B2.h | 2 +- {lib_arm => lib/arm}/Makefile | 0 {lib_arm => lib/arm}/_ashldi3.S | 0 {lib_arm => lib/arm}/_ashrdi3.S | 0 {lib_arm => lib/arm}/_divsi3.S | 0 {lib_arm => lib/arm}/_modsi3.S | 0 {lib_arm => lib/arm}/_udivsi3.S | 0 {lib_arm => lib/arm}/_umodsi3.S | 0 {lib_arm => lib/arm}/board.c | 0 {lib_arm => lib/arm}/bootm.c | 0 {lib_arm => lib/arm}/cache-cp15.c | 0 {lib_arm => lib/arm}/cache.c | 0 {lib_arm => lib/arm}/config.mk | 0 {lib_arm => lib/arm}/div0.c | 0 {lib_arm => lib/arm}/interrupts.c | 0 {lib_arm => lib/arm}/reset.c | 0 {lib_avr32 => lib/avr32}/Makefile | 0 {lib_avr32 => lib/avr32}/board.c | 0 {lib_avr32 => lib/avr32}/bootm.c | 0 {lib_avr32 => lib/avr32}/config.mk | 0 {lib_avr32 => lib/avr32}/interrupts.c | 0 {lib_avr32 => lib/avr32}/memset.S | 0 {lib_blackfin => lib/blackfin}/.gitignore | 0 {lib_blackfin => lib/blackfin}/Makefile | 0 {lib_blackfin => lib/blackfin}/board.c | 0 {lib_blackfin => lib/blackfin}/boot.c | 0 {lib_blackfin => lib/blackfin}/cache.c | 0 {lib_blackfin => lib/blackfin}/clocks.c | 0 {lib_blackfin => lib/blackfin}/config.mk | 2 +- {lib_blackfin => lib/blackfin}/memcmp.S | 0 {lib_blackfin => lib/blackfin}/memcpy.S | 0 {lib_blackfin => lib/blackfin}/memmove.S | 0 {lib_blackfin => lib/blackfin}/memset.S | 0 {lib_blackfin => lib/blackfin}/muldi3.c | 0 {lib_blackfin => lib/blackfin}/post.c | 0 {lib_blackfin => lib/blackfin}/string.c | 0 {lib_blackfin => lib/blackfin}/tests.c | 0 {lib_blackfin => lib/blackfin}/u-boot.lds.S | 0 {lib_i386 => lib/i386}/Makefile | 0 {lib_i386 => lib/i386}/bios.S | 0 {lib_i386 => lib/i386}/bios.h | 0 {lib_i386 => lib/i386}/bios_pci.S | 0 {lib_i386 => lib/i386}/bios_setup.c | 0 {lib_i386 => lib/i386}/board.c | 0 {lib_i386 => lib/i386}/bootm.c | 0 {lib_i386 => lib/i386}/config.mk | 0 {lib_i386 => lib/i386}/interrupts.c | 0 {lib_i386 => lib/i386}/pcat_interrupts.c | 0 {lib_i386 => lib/i386}/pcat_timer.c | 0 {lib_i386 => lib/i386}/pci.c | 0 {lib_i386 => lib/i386}/pci_type1.c | 0 {lib_i386 => lib/i386}/realmode.c | 0 {lib_i386 => lib/i386}/realmode_switch.S | 0 {lib_i386 => lib/i386}/timer.c | 0 {lib_i386 => lib/i386}/video.c | 0 {lib_i386 => lib/i386}/video_bios.c | 0 {lib_i386 => lib/i386}/zimage.c | 0 {lib_m68k => lib/m68k}/Makefile | 0 {lib_m68k => lib/m68k}/board.c | 0 {lib_m68k => lib/m68k}/bootm.c | 0 {lib_m68k => lib/m68k}/cache.c | 0 {lib_m68k => lib/m68k}/config.mk | 0 {lib_m68k => lib/m68k}/interrupts.c | 0 {lib_m68k => lib/m68k}/time.c | 0 {lib_m68k => lib/m68k}/traps.c | 0 {lib_microblaze => lib/microblaze}/Makefile | 0 {lib_microblaze => lib/microblaze}/board.c | 0 {lib_microblaze => lib/microblaze}/bootm.c | 0 {lib_microblaze => lib/microblaze}/cache.c | 0 {lib_microblaze => lib/microblaze}/config.mk | 0 {lib_microblaze => lib/microblaze}/time.c | 0 {lib_mips => lib/mips}/Makefile | 0 {lib_mips => lib/mips}/board.c | 0 {lib_mips => lib/mips}/bootm.c | 0 {lib_mips => lib/mips}/bootm_qemu_mips.c | 0 {lib_mips => lib/mips}/config.mk | 0 {lib_mips => lib/mips}/time.c | 0 {lib_nios => lib/nios}/Makefile | 0 {lib_nios => lib/nios}/board.c | 0 {lib_nios => lib/nios}/bootm.c | 0 {lib_nios => lib/nios}/cache.c | 0 {lib_nios => lib/nios}/config.mk | 0 {lib_nios => lib/nios}/divmod.c | 0 {lib_nios => lib/nios}/math.h | 0 {lib_nios => lib/nios}/mult.c | 0 {lib_nios => lib/nios}/time.c | 0 {lib_nios2 => lib/nios2}/Makefile | 0 {lib_nios2 => lib/nios2}/board.c | 0 {lib_nios2 => lib/nios2}/bootm.c | 0 {lib_nios2 => lib/nios2}/cache.S | 0 {lib_nios2 => lib/nios2}/config.mk | 0 {lib_nios2 => lib/nios2}/divmod.c | 0 {lib_nios2 => lib/nios2}/math.h | 0 {lib_nios2 => lib/nios2}/mult.c | 0 {lib_nios2 => lib/nios2}/time.c | 0 {lib_ppc => lib/ppc}/Makefile | 0 {lib_ppc => lib/ppc}/bat_rw.c | 0 {lib_ppc => lib/ppc}/board.c | 0 {lib_ppc => lib/ppc}/bootm.c | 0 {lib_ppc => lib/ppc}/cache.c | 0 {lib_ppc => lib/ppc}/config.mk | 0 {lib_ppc => lib/ppc}/extable.c | 0 {lib_ppc => lib/ppc}/interrupts.c | 0 {lib_ppc => lib/ppc}/kgdb.c | 0 {lib_ppc => lib/ppc}/ppccache.S | 0 {lib_ppc => lib/ppc}/ppcstring.S | 0 {lib_ppc => lib/ppc}/ticks.S | 0 {lib_ppc => lib/ppc}/time.c | 0 {lib_sh => lib/sh}/Makefile | 0 {lib_sh => lib/sh}/board.c | 0 {lib_sh => lib/sh}/bootm.c | 0 {lib_sh => lib/sh}/config.mk | 0 {lib_sh => lib/sh}/time.c | 0 {lib_sh => lib/sh}/time_sh2.c | 0 {lib_sparc => lib/sparc}/Makefile | 0 {lib_sparc => lib/sparc}/board.c | 0 {lib_sparc => lib/sparc}/bootm.c | 0 {lib_sparc => lib/sparc}/cache.c | 0 {lib_sparc => lib/sparc}/config.mk | 0 {lib_sparc => lib/sparc}/interrupts.c | 0 {lib_sparc => lib/sparc}/time.c | 0 nand_spl/board/freescale/mpc8313erdb/Makefile | 6 +++--- nand_spl/board/sheldon/simpc8313/Makefile | 6 +++--- 263 files changed, 249 insertions(+), 249 deletions(-) rename {lib_arm => lib/arm}/Makefile (100%) rename {lib_arm => lib/arm}/_ashldi3.S (100%) rename {lib_arm => lib/arm}/_ashrdi3.S (100%) rename {lib_arm => lib/arm}/_divsi3.S (100%) rename {lib_arm => lib/arm}/_modsi3.S (100%) rename {lib_arm => lib/arm}/_udivsi3.S (100%) rename {lib_arm => lib/arm}/_umodsi3.S (100%) rename {lib_arm => lib/arm}/board.c (100%) rename {lib_arm => lib/arm}/bootm.c (100%) rename {lib_arm => lib/arm}/cache-cp15.c (100%) rename {lib_arm => lib/arm}/cache.c (100%) rename {lib_arm => lib/arm}/config.mk (100%) rename {lib_arm => lib/arm}/div0.c (100%) rename {lib_arm => lib/arm}/interrupts.c (100%) rename {lib_arm => lib/arm}/reset.c (100%) rename {lib_avr32 => lib/avr32}/Makefile (100%) rename {lib_avr32 => lib/avr32}/board.c (100%) rename {lib_avr32 => lib/avr32}/bootm.c (100%) rename {lib_avr32 => lib/avr32}/config.mk (100%) rename {lib_avr32 => lib/avr32}/interrupts.c (100%) rename {lib_avr32 => lib/avr32}/memset.S (100%) rename {lib_blackfin => lib/blackfin}/.gitignore (100%) rename {lib_blackfin => lib/blackfin}/Makefile (100%) rename {lib_blackfin => lib/blackfin}/board.c (100%) rename {lib_blackfin => lib/blackfin}/boot.c (100%) rename {lib_blackfin => lib/blackfin}/cache.c (100%) rename {lib_blackfin => lib/blackfin}/clocks.c (100%) rename {lib_blackfin => lib/blackfin}/config.mk (98%) rename {lib_blackfin => lib/blackfin}/memcmp.S (100%) rename {lib_blackfin => lib/blackfin}/memcpy.S (100%) rename {lib_blackfin => lib/blackfin}/memmove.S (100%) rename {lib_blackfin => lib/blackfin}/memset.S (100%) rename {lib_blackfin => lib/blackfin}/muldi3.c (100%) rename {lib_blackfin => lib/blackfin}/post.c (100%) rename {lib_blackfin => lib/blackfin}/string.c (100%) rename {lib_blackfin => lib/blackfin}/tests.c (100%) rename {lib_blackfin => lib/blackfin}/u-boot.lds.S (100%) rename {lib_i386 => lib/i386}/Makefile (100%) rename {lib_i386 => lib/i386}/bios.S (100%) rename {lib_i386 => lib/i386}/bios.h (100%) rename {lib_i386 => lib/i386}/bios_pci.S (100%) rename {lib_i386 => lib/i386}/bios_setup.c (100%) rename {lib_i386 => lib/i386}/board.c (100%) rename {lib_i386 => lib/i386}/bootm.c (100%) rename {lib_i386 => lib/i386}/config.mk (100%) rename {lib_i386 => lib/i386}/interrupts.c (100%) rename {lib_i386 => lib/i386}/pcat_interrupts.c (100%) rename {lib_i386 => lib/i386}/pcat_timer.c (100%) rename {lib_i386 => lib/i386}/pci.c (100%) rename {lib_i386 => lib/i386}/pci_type1.c (100%) rename {lib_i386 => lib/i386}/realmode.c (100%) rename {lib_i386 => lib/i386}/realmode_switch.S (100%) rename {lib_i386 => lib/i386}/timer.c (100%) rename {lib_i386 => lib/i386}/video.c (100%) rename {lib_i386 => lib/i386}/video_bios.c (100%) rename {lib_i386 => lib/i386}/zimage.c (100%) rename {lib_m68k => lib/m68k}/Makefile (100%) rename {lib_m68k => lib/m68k}/board.c (100%) rename {lib_m68k => lib/m68k}/bootm.c (100%) rename {lib_m68k => lib/m68k}/cache.c (100%) rename {lib_m68k => lib/m68k}/config.mk (100%) rename {lib_m68k => lib/m68k}/interrupts.c (100%) rename {lib_m68k => lib/m68k}/time.c (100%) rename {lib_m68k => lib/m68k}/traps.c (100%) rename {lib_microblaze => lib/microblaze}/Makefile (100%) rename {lib_microblaze => lib/microblaze}/board.c (100%) rename {lib_microblaze => lib/microblaze}/bootm.c (100%) rename {lib_microblaze => lib/microblaze}/cache.c (100%) rename {lib_microblaze => lib/microblaze}/config.mk (100%) rename {lib_microblaze => lib/microblaze}/time.c (100%) rename {lib_mips => lib/mips}/Makefile (100%) rename {lib_mips => lib/mips}/board.c (100%) rename {lib_mips => lib/mips}/bootm.c (100%) rename {lib_mips => lib/mips}/bootm_qemu_mips.c (100%) rename {lib_mips => lib/mips}/config.mk (100%) rename {lib_mips => lib/mips}/time.c (100%) rename {lib_nios => lib/nios}/Makefile (100%) rename {lib_nios => lib/nios}/board.c (100%) rename {lib_nios => lib/nios}/bootm.c (100%) rename {lib_nios => lib/nios}/cache.c (100%) rename {lib_nios => lib/nios}/config.mk (100%) rename {lib_nios => lib/nios}/divmod.c (100%) rename {lib_nios => lib/nios}/math.h (100%) rename {lib_nios => lib/nios}/mult.c (100%) rename {lib_nios => lib/nios}/time.c (100%) rename {lib_nios2 => lib/nios2}/Makefile (100%) rename {lib_nios2 => lib/nios2}/board.c (100%) rename {lib_nios2 => lib/nios2}/bootm.c (100%) rename {lib_nios2 => lib/nios2}/cache.S (100%) rename {lib_nios2 => lib/nios2}/config.mk (100%) rename {lib_nios2 => lib/nios2}/divmod.c (100%) rename {lib_nios2 => lib/nios2}/math.h (100%) rename {lib_nios2 => lib/nios2}/mult.c (100%) rename {lib_nios2 => lib/nios2}/time.c (100%) rename {lib_ppc => lib/ppc}/Makefile (100%) rename {lib_ppc => lib/ppc}/bat_rw.c (100%) rename {lib_ppc => lib/ppc}/board.c (100%) rename {lib_ppc => lib/ppc}/bootm.c (100%) rename {lib_ppc => lib/ppc}/cache.c (100%) rename {lib_ppc => lib/ppc}/config.mk (100%) rename {lib_ppc => lib/ppc}/extable.c (100%) rename {lib_ppc => lib/ppc}/interrupts.c (100%) rename {lib_ppc => lib/ppc}/kgdb.c (100%) rename {lib_ppc => lib/ppc}/ppccache.S (100%) rename {lib_ppc => lib/ppc}/ppcstring.S (100%) rename {lib_ppc => lib/ppc}/ticks.S (100%) rename {lib_ppc => lib/ppc}/time.c (100%) rename {lib_sh => lib/sh}/Makefile (100%) rename {lib_sh => lib/sh}/board.c (100%) rename {lib_sh => lib/sh}/bootm.c (100%) rename {lib_sh => lib/sh}/config.mk (100%) rename {lib_sh => lib/sh}/time.c (100%) rename {lib_sh => lib/sh}/time_sh2.c (100%) rename {lib_sparc => lib/sparc}/Makefile (100%) rename {lib_sparc => lib/sparc}/board.c (100%) rename {lib_sparc => lib/sparc}/bootm.c (100%) rename {lib_sparc => lib/sparc}/cache.c (100%) rename {lib_sparc => lib/sparc}/config.mk (100%) rename {lib_sparc => lib/sparc}/interrupts.c (100%) rename {lib_sparc => lib/sparc}/time.c (100%)
diff --git a/Makefile b/Makefile index a061499..b0dd4c5 100644 --- a/Makefile +++ b/Makefile @@ -230,3 +230,3 @@ LIBS += cpu/ixp/npe/libnpe.a endif -LIBS += lib_$(ARCH)/lib$(ARCH).a +LIBS += lib/$(ARCH)/lib$(ARCH).a LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \ @@ -411,3 +411,3 @@ TAG_SUBDIRS += lib_generic board/$(BOARDDIR) TAG_SUBDIRS += cpu/$(CPU) -TAG_SUBDIRS += lib_$(ARCH) +TAG_SUBDIRS += lib/$(ARCH) TAG_SUBDIRS += fs/cramfs @@ -3605,3 +3605,3 @@ clean: $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds \ - $(obj)lib_blackfin/u-boot.lds \ + $(obj)lib/blackfin/u-boot.lds \ $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] diff --git a/README b/README index 0e84337..b88dc1c 100644 --- a/README +++ b/README @@ -183,12 +183,12 @@ Directory Hierarchy: - include Header Files -- lib_arm Files generic to ARM architecture -- lib_avr32 Files generic to AVR32 architecture -- lib_blackfin Files generic to Blackfin architecture +- lib/arm Files generic to ARM architecture +- lib/avr32 Files generic to AVR32 architecture +- lib/blackfin Files generic to Blackfin architecture - lib_generic Files generic to all architectures -- lib_i386 Files generic to i386 architecture -- lib_m68k Files generic to m68k architecture -- lib_mips Files generic to MIPS architecture -- lib_nios Files generic to NIOS architecture -- lib_ppc Files generic to PowerPC architecture -- lib_sparc Files generic to SPARC architecture +- lib/i386 Files generic to i386 architecture +- lib/m68k Files generic to m68k architecture +- lib/mips Files generic to MIPS architecture +- lib/nios Files generic to NIOS architecture +- lib/ppc Files generic to PowerPC architecture +- lib/sparc Files generic to SPARC architecture - libfdt Library files to support flattened device trees @@ -1890,5 +1890,5 @@ Legacy uImage format:
- 15 lib_<arch>/bootm.c All preparation done, transferring control to OS + 15 lib/<arch>/bootm.c All preparation done, transferring control to OS
- -30 lib_ppc/board.c Fatal error, hang the system + -30 lib/ppc/board.c Fatal error, hang the system -31 post/post.c POST test failed, detected by post_output_backlog() diff --git a/api_examples/Makefile b/api_examples/Makefile index 2a30bef..23b5e9c 100644 --- a/api_examples/Makefile +++ b/api_examples/Makefile @@ -47,3 +47,3 @@ EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o ifeq ($(ARCH),ppc) -EXT_SOBJ_FILES-$(CONFIG_API) += lib_ppc/ppcstring.o +EXT_SOBJ_FILES-$(CONFIG_API) += lib/ppc/ppcstring.o endif @@ -79,3 +79,3 @@ $(obj)%.o: $(SRCTREE)/lib_generic/%.c # Rule to build architecture-specific library assembly files -$(obj)%.o: $(SRCTREE)/lib_$(ARCH)/%.S +$(obj)%.o: $(SRCTREE)/lib/$(ARCH)/%.S $(CC) -g $(CFLAGS) -c -o $@ $< diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds index c6b1f94..428ad52 100644 --- a/board/LEOX/elpt860/u-boot.lds +++ b/board/LEOX/elpt860/u-boot.lds @@ -68,3 +68,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -73,6 +73,6 @@ SECTIONS lib_generic/string.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/extable.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/extable.o (.text) + lib/ppc/time.o (.text) + lib/ppc/ticks.o (.text)
diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds index faa1c6c..dd5b607 100644 --- a/board/RPXClassic/u-boot.lds +++ b/board/RPXClassic/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds index faa1c6c..dd5b607 100644 --- a/board/RPXlite/u-boot.lds +++ b/board/RPXlite/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds index 7b7b83b..d8e3c0c 100644 --- a/board/RPXlite_dw/u-boot.lds +++ b/board/RPXlite_dw/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds index 17e6fa0..794f0f9 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -64,4 +64,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds index 836775f..a695056 100644 --- a/board/actux1/u-boot.lds +++ b/board/actux1/u-boot.lds @@ -35,3 +35,3 @@ SECTIONS lib_generic/vsprintf.o(.text) - lib_arm/board.o(.text) + lib/arm/board.o(.text) common/dlmalloc.o(.text) diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds index 0752656..4423000 100644 --- a/board/actux2/u-boot.lds +++ b/board/actux2/u-boot.lds @@ -35,3 +35,3 @@ SECTIONS lib_generic/vsprintf.o(.text) - lib_arm/board.o(.text) + lib/arm/board.o(.text) common/dlmalloc.o(.text) diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds index a69e7db..985271d 100644 --- a/board/actux3/u-boot.lds +++ b/board/actux3/u-boot.lds @@ -35,3 +35,3 @@ SECTIONS lib_generic/vsprintf.o (.text) - lib_arm/board.o (.text) + lib/arm/board.o (.text) common/dlmalloc.o (.text) diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds index a4c48d6..e0c25d2 100644 --- a/board/amirix/ap1000/u-boot.lds +++ b/board/amirix/ap1000/u-boot.lds @@ -67,3 +67,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/atum8548/u-boot.lds b/board/atum8548/u-boot.lds index 3067846..1342135 100644 --- a/board/atum8548/u-boot.lds +++ b/board/atum8548/u-boot.lds @@ -70,3 +70,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds index 61650a8..b72e021 100644 --- a/board/c2mon/u-boot.lds +++ b/board/c2mon/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds index 7e716bb..e866689 100644 --- a/board/cobra5272/u-boot.lds +++ b/board/cobra5272/u-boot.lds @@ -58,3 +58,3 @@ SECTIONS cpu/mcf52x2/cpu_init.o (.text) - lib_m68k/traps.o (.text) + lib/m68k/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) diff --git a/board/cray/L1/u-boot.lds b/board/cray/L1/u-boot.lds index 86c8ecb..fe69c93 100644 --- a/board/cray/L1/u-boot.lds +++ b/board/cray/L1/u-boot.lds @@ -73,3 +73,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug index 338392a..f753355 100644 --- a/board/cray/L1/u-boot.lds.debug +++ b/board/cray/L1/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/csb272/u-boot.lds b/board/csb272/u-boot.lds index 0aa6f8f..453cd3b 100644 --- a/board/csb272/u-boot.lds +++ b/board/csb272/u-boot.lds @@ -74,4 +74,4 @@ SECTIONS
- lib_ppc/extable.o (.text) - lib_ppc/board.o (.text) + lib/ppc/extable.o (.text) + lib/ppc/board.o (.text) lib_generic/zlib.o (.text) diff --git a/board/csb472/u-boot.lds b/board/csb472/u-boot.lds index 565e021..21682bb 100644 --- a/board/csb472/u-boot.lds +++ b/board/csb472/u-boot.lds @@ -74,4 +74,4 @@ SECTIONS
- lib_ppc/extable.o (.text) - lib_ppc/board.o (.text) + lib/ppc/extable.o (.text) + lib/ppc/board.o (.text) lib_generic/zlib.o (.text) diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds index b36827d..0468fe2 100644 --- a/board/dave/PPChameleonEVB/u-boot.lds +++ b/board/dave/PPChameleonEVB/u-boot.lds @@ -71,3 +71,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug index 82e8dce..6e168a4 100644 --- a/board/emk/top860/u-boot.lds.debug +++ b/board/emk/top860/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/eric/u-boot.lds b/board/eric/u-boot.lds index e62896f..2ab92e7 100644 --- a/board/eric/u-boot.lds +++ b/board/eric/u-boot.lds @@ -73,3 +73,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/esd/ocrtc/u-boot.lds b/board/esd/ocrtc/u-boot.lds index 1b50b6d..03c164d 100644 --- a/board/esd/ocrtc/u-boot.lds +++ b/board/esd/ocrtc/u-boot.lds @@ -70,3 +70,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds index e3230b9..e072c5d 100644 --- a/board/esd/tasreg/u-boot.lds +++ b/board/esd/tasreg/u-boot.lds @@ -58,3 +58,3 @@ SECTIONS cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + lib/m68k/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds index 57aabed..704de98 100644 --- a/board/esteem192e/u-boot.lds +++ b/board/esteem192e/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug index 28f8804..334b85a 100644 --- a/board/etx094/u-boot.lds.debug +++ b/board/etx094/u-boot.lds.debug @@ -64,4 +64,4 @@ SECTIONS cpu/mpc8xx/serial.o (.text) - lib_ppc/extable.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/extable.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/string.o (.text) diff --git a/board/exbitgen/u-boot.lds b/board/exbitgen/u-boot.lds index 2798dc8..52d8ddd 100644 --- a/board/exbitgen/u-boot.lds +++ b/board/exbitgen/u-boot.lds @@ -72,3 +72,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug index 67d37ae..515296b 100644 --- a/board/fads/u-boot.lds.debug +++ b/board/fads/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa index 7ae70d4..1105456 100644 --- a/board/freescale/m52277evb/u-boot.spa +++ b/board/freescale/m52277evb/u-boot.spa @@ -59,3 +59,3 @@ SECTIONS cpu/mcf5227x/libmcf5227x.a (.text) - lib_m68k/libm68k.a (.text) + lib/m68k/libm68k.a (.text) lib_generic/libgeneric.a (.text) diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16 index c134884..da9b61a 100644 --- a/board/freescale/m5235evb/u-boot.16 +++ b/board/freescale/m5235evb/u-boot.16 @@ -59,4 +59,4 @@ SECTIONS cpu/mcf523x/cpu_init.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + lib/m68k/traps.o (.text) + lib/m68k/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32 index 53c337d..99cdd78 100644 --- a/board/freescale/m5235evb/u-boot.32 +++ b/board/freescale/m5235evb/u-boot.32 @@ -62,3 +62,3 @@ SECTIONS cpu/mcf523x/speed.o (.text) - lib_m68k/libm68k.a (.text) + lib/m68k/libm68k.a (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds index e3230b9..e072c5d 100644 --- a/board/freescale/m5249evb/u-boot.lds +++ b/board/freescale/m5249evb/u-boot.lds @@ -58,3 +58,3 @@ SECTIONS cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + lib/m68k/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds index 6cb5ee0..f5f334d 100644 --- a/board/freescale/m5253demo/u-boot.lds +++ b/board/freescale/m5253demo/u-boot.lds @@ -58,3 +58,3 @@ SECTIONS cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + lib/m68k/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds index 132fccf..814d5c2 100644 --- a/board/freescale/m5253evbe/u-boot.lds +++ b/board/freescale/m5253evbe/u-boot.lds @@ -58,3 +58,3 @@ SECTIONS cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + lib/m68k/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds index 00c1f2a..2d1bf3a 100644 --- a/board/freescale/m5271evb/u-boot.lds +++ b/board/freescale/m5271evb/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + lib/m68k/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds index 9d20b22..bde5d86 100644 --- a/board/freescale/m5272c3/u-boot.lds +++ b/board/freescale/m5272c3/u-boot.lds @@ -58,3 +58,3 @@ SECTIONS cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + lib/m68k/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds index c79d06c..52ca4f8 100644 --- a/board/freescale/m53017evb/u-boot.lds +++ b/board/freescale/m53017evb/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS cpu/mcf532x/libmcf532x.a (.text) - lib_m68k/libm68k.a (.text) + lib/m68k/libm68k.a (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds index af31098..5c9720e 100644 --- a/board/freescale/m5329evb/u-boot.lds +++ b/board/freescale/m5329evb/u-boot.lds @@ -58,4 +58,4 @@ SECTIONS cpu/mcf532x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + lib/m68k/traps.o (.text) + lib/m68k/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds index dff74b6..30fb272 100644 --- a/board/freescale/m5373evb/u-boot.lds +++ b/board/freescale/m5373evb/u-boot.lds @@ -58,4 +58,4 @@ SECTIONS cpu/mcf532x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + lib/m68k/traps.o (.text) + lib/m68k/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa index 08e184c..d568688 100644 --- a/board/freescale/m54451evb/u-boot.spa +++ b/board/freescale/m54451evb/u-boot.spa @@ -58,4 +58,4 @@ SECTIONS cpu/mcf5445x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + lib/m68k/traps.o (.text) + lib/m68k/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm index e9eac67..92880d9 100644 --- a/board/freescale/m54451evb/u-boot.stm +++ b/board/freescale/m54451evb/u-boot.stm @@ -63,3 +63,3 @@ SECTIONS cpu/mcf5445x/speed.o (.text) - lib_m68k/board.o (.text) + lib/m68k/board.o (.text) common/serial.o (.text) diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm index 08e184c..d568688 100644 --- a/board/freescale/m54455evb/u-boot.atm +++ b/board/freescale/m54455evb/u-boot.atm @@ -58,4 +58,4 @@ SECTIONS cpu/mcf5445x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + lib/m68k/traps.o (.text) + lib/m68k/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int index 4d504a2..58419c0 100644 --- a/board/freescale/m54455evb/u-boot.int +++ b/board/freescale/m54455evb/u-boot.int @@ -58,4 +58,4 @@ SECTIONS cpu/mcf5445x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + lib/m68k/traps.o (.text) + lib/m68k/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m547xevb/u-boot.lds b/board/freescale/m547xevb/u-boot.lds index a3014bd..3251b0a 100644 --- a/board/freescale/m547xevb/u-boot.lds +++ b/board/freescale/m547xevb/u-boot.lds @@ -58,4 +58,4 @@ SECTIONS cpu/mcf547x_8x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + lib/m68k/traps.o (.text) + lib/m68k/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/m548xevb/u-boot.lds b/board/freescale/m548xevb/u-boot.lds index a3014bd..3251b0a 100644 --- a/board/freescale/m548xevb/u-boot.lds +++ b/board/freescale/m548xevb/u-boot.lds @@ -58,4 +58,4 @@ SECTIONS cpu/mcf547x_8x/start.o (.text) - lib_m68k/traps.o (.text) - lib_m68k/interrupts.o (.text) + lib/m68k/traps.o (.text) + lib/m68k/interrupts.o (.text) common/dlmalloc.o (.text) diff --git a/board/freescale/mpc7448hpc2/tsi108_init.c b/board/freescale/mpc7448hpc2/tsi108_init.c index 74bb564..f06890a 100644 --- a/board/freescale/mpc7448hpc2/tsi108_init.c +++ b/board/freescale/mpc7448hpc2/tsi108_init.c @@ -325,3 +325,3 @@ int board_early_init_r (void) * where NVRAM resides is not visible during board_init_f - * (lib_ppc/board.c) + * (lib/ppc/board.c) * Alternatively, we could use the I2C EEPROM at start-up to configure diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds index 5cc88ae..c4e47c9 100644 --- a/board/freescale/mpc8610hpcd/u-boot.lds +++ b/board/freescale/mpc8610hpcd/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds index e188722..ae944d0 100644 --- a/board/freescale/mpc8641hpcn/u-boot.lds +++ b/board/freescale/mpc8641hpcn/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds index 3182aa6..9482d60 100644 --- a/board/freescale/mx31ads/u-boot.lds +++ b/board/freescale/mx31ads/u-boot.lds @@ -41,3 +41,3 @@ SECTIONS board/freescale/mx31ads/libmx31ads.a (.text) - lib_arm/libarm.a (.text) + lib/arm/libarm.a (.text) net/libnet.a (.text) diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds index ee0b719..d7f70b7 100644 --- a/board/genietv/u-boot.lds +++ b/board/genietv/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug index 61fdfe5..d3bfb36 100644 --- a/board/genietv/u-boot.lds.debug +++ b/board/genietv/u-boot.lds.debug @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds index 02216fb..eadcaf0 100644 --- a/board/hermes/u-boot.lds +++ b/board/hermes/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) - lib_ppc/cache.o (.text) + lib/ppc/time.o (.text) + lib/ppc/ticks.o (.text) + lib/ppc/cache.o (.text) lib_generic/crc32.o (.text) diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug index 78456e6..a132c0e 100644 --- a/board/hermes/u-boot.lds.debug +++ b/board/hermes/u-boot.lds.debug @@ -58,6 +58,6 @@ SECTIONS cpu/mpc8xx/start.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + lib/ppc/time.o (.text) + lib/ppc/ticks.o (.text) . = env_offset; diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds index 03fefec..73c5e74 100644 --- a/board/hymod/u-boot.lds +++ b/board/hymod/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds index 9a28cfd..71cf813 100644 --- a/board/icu862/u-boot.lds +++ b/board/icu862/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug index dbd1f9d..23e5c46 100644 --- a/board/icu862/u-boot.lds.debug +++ b/board/icu862/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds index 00c1f2a..2d1bf3a 100644 --- a/board/idmr/u-boot.lds +++ b/board/idmr/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS cpu/mcf52x2/start.o (.text) - lib_m68k/traps.o (.text) + lib/m68k/traps.o (.text) cpu/mcf52x2/interrupts.o (.text) diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds index b47ae8e..82dcdcd 100644 --- a/board/ip860/u-boot.lds +++ b/board/ip860/u-boot.lds @@ -59,6 +59,6 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + lib/ppc/time.o (.text) + lib/ppc/ticks.o (.text) /** diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug index e8a47f7..d9cc71d 100644 --- a/board/ip860/u-boot.lds.debug +++ b/board/ip860/u-boot.lds.debug @@ -58,6 +58,6 @@ SECTIONS cpu/mpc8xx/start.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) - lib_ppc/ticks.o (.text) + lib/ppc/time.o (.text) + lib/ppc/ticks.o (.text) /** diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug index 4d49f1b..eac3d78 100644 --- a/board/ivm/u-boot.lds.debug +++ b/board/ivm/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/jse/jse.c b/board/jse/jse.c index 6a6b9dd..1fde72a 100644 --- a/board/jse/jse.c +++ b/board/jse/jse.c @@ -28,3 +28,3 @@ * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by lib/ppc/board.c:board_init_f by virtue * of being in the init_sequence array. @@ -87,3 +87,3 @@ int board_pre_init (void) /* - * This function is also called by lib_ppc/board.c:board_init_f (it is + * This function is also called by lib/ppc/board.c:board_init_f (it is * also in the init_sequence array) but later. Many more things are @@ -151,3 +151,3 @@ int checkboard (void) /* - * This function is called by lib_ppc/board.c:board_init_r. At this + * This function is called by lib/ppc/board.c:board_init_r. At this * point, basic setup is done, U-Boot has been moved into SDRAM and diff --git a/board/jse/sdram.c b/board/jse/sdram.c index a1f526d..b3b9dff 100644 --- a/board/jse/sdram.c +++ b/board/jse/sdram.c @@ -29,3 +29,3 @@ * that we have installed. This function is called by board_init_f - * in lib_ppc/board.c to initialize the memory and return what I + * in lib/ppc/board.c to initialize the memory and return what I * found. diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds index 5af36c9..0b2fc20 100644 --- a/board/keymile/km8xx/u-boot.lds +++ b/board/keymile/km8xx/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -64,4 +64,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds index f2b6650..575e676 100644 --- a/board/kup/kup4k/u-boot.lds +++ b/board/kup/kup4k/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds index f2b6650..575e676 100644 --- a/board/kup/kup4x/u-boot.lds +++ b/board/kup/kup4x/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds index b9fa2d6..7e1b6ee 100644 --- a/board/lantec/u-boot.lds +++ b/board/lantec/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug index bd9d76c..c035d63 100644 --- a/board/lwmon/u-boot.lds.debug +++ b/board/lwmon/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug index 67d37ae..515296b 100644 --- a/board/mbx8xx/u-boot.lds.debug +++ b/board/mbx8xx/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds index a6b6748..e81d4aa 100644 --- a/board/ml2/u-boot.lds +++ b/board/ml2/u-boot.lds @@ -67,3 +67,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug index 338392a..f753355 100644 --- a/board/ml2/u-boot.lds.debug +++ b/board/ml2/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds index 44144e2..7644b90 100644 --- a/board/mousse/u-boot.lds +++ b/board/mousse/u-boot.lds @@ -55,4 +55,4 @@ SECTIONS cpu/mpc824x/start.o (.text) - lib_ppc/board.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/board.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom index 27d10b6..9111252 100644 --- a/board/mousse/u-boot.lds.rom +++ b/board/mousse/u-boot.lds.rom @@ -56,3 +56,3 @@ SECTIONS common/board.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/mpc8540eval/u-boot.lds b/board/mpc8540eval/u-boot.lds index 0747913..cb6ff82 100644 --- a/board/mpc8540eval/u-boot.lds +++ b/board/mpc8540eval/u-boot.lds @@ -65,3 +65,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/mpl/mip405/u-boot.lds b/board/mpl/mip405/u-boot.lds index d71a299..592c030 100644 --- a/board/mpl/mip405/u-boot.lds +++ b/board/mpl/mip405/u-boot.lds @@ -77,3 +77,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/mpl/pip405/u-boot.lds b/board/mpl/pip405/u-boot.lds index f6f88a7..38184ad 100644 --- a/board/mpl/pip405/u-boot.lds +++ b/board/mpl/pip405/u-boot.lds @@ -72,3 +72,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug index 338392a..f753355 100644 --- a/board/mpl/pip405/u-boot.lds.debug +++ b/board/mpl/pip405/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds index 68fe165..fc6b123 100644 --- a/board/netphone/u-boot.lds +++ b/board/netphone/u-boot.lds @@ -57,3 +57,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -61,4 +61,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c index aa8a097..0d333b0 100644 --- a/board/netstal/hcu4/hcu4.c +++ b/board/netstal/hcu4/hcu4.c @@ -36,3 +36,3 @@ DECLARE_GLOBAL_DATA_PTR; * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by lib/ppc/board.c:board_init_f by virtue * of being in the init_sequence array. diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt index f649876..1288131 100644 --- a/board/netstal/hcu5/README.txt +++ b/board/netstal/hcu5/README.txt @@ -111,3 +111,3 @@ _start: call cpu_init_f - board_init_f: (lib_ppc\board.c) + board_init_f: (lib/ppc\board.c) init_sequence defines a list of function to be called @@ -143,3 +143,3 @@ From now on our copy is in RAM and we will run from there, ------------------------------------------------------- - board_init_r: (lib_ppc\board.c) + board_init_r: (lib/ppc\board.c) setup bd function pointers @@ -164,3 +164,3 @@ board/netstal/hcu5/* cpu/ppc4xx/* -lib_ppc/* +lib/ppc/* include/ppc440.h diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c index 6f4ec29..4e37c33 100644 --- a/board/netstal/hcu5/hcu5.c +++ b/board/netstal/hcu5/hcu5.c @@ -49,3 +49,3 @@ extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by lib/ppc/board.c:board_init_f by virtue * of being in the init_sequence array. diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c index 66ed95f..3ae8445 100644 --- a/board/netstal/mcu25/mcu25.c +++ b/board/netstal/mcu25/mcu25.c @@ -41,3 +41,3 @@ DECLARE_GLOBAL_DATA_PTR; * This function is run very early, out of flash, and before devices are - * initialized. It is called by lib_ppc/board.c:board_init_f by virtue + * initialized. It is called by lib/ppc/board.c:board_init_f by virtue * of being in the init_sequence array. diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds index 14201ac..2e060ba 100644 --- a/board/netta/u-boot.lds +++ b/board/netta/u-boot.lds @@ -57,3 +57,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -61,4 +61,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds index 14201ac..2e060ba 100644 --- a/board/netta2/u-boot.lds +++ b/board/netta2/u-boot.lds @@ -57,3 +57,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -61,4 +61,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds index 8c48f1f..3af9e85 100644 --- a/board/netvia/u-boot.lds +++ b/board/netvia/u-boot.lds @@ -57,3 +57,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -61,4 +61,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/pm854/u-boot.lds b/board/pm854/u-boot.lds index 45aaadc..11e7785 100644 --- a/board/pm854/u-boot.lds +++ b/board/pm854/u-boot.lds @@ -73,3 +73,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/pm856/u-boot.lds b/board/pm856/u-boot.lds index 1dce2ab..19fa083 100644 --- a/board/pm856/u-boot.lds +++ b/board/pm856/u-boot.lds @@ -73,3 +73,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds index faa1c6c..dd5b607 100644 --- a/board/quantum/u-boot.lds +++ b/board/quantum/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds index 552f15d..bfdfffa 100644 --- a/board/rbc823/u-boot.lds +++ b/board/rbc823/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds index faa1c6c..dd5b607 100644 --- a/board/rmu/u-boot.lds +++ b/board/rmu/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/sandburst/karef/u-boot.lds b/board/sandburst/karef/u-boot.lds index f509100..f157d17 100644 --- a/board/sandburst/karef/u-boot.lds +++ b/board/sandburst/karef/u-boot.lds @@ -79,3 +79,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug index d00e252..97b3a80 100644 --- a/board/sandburst/karef/u-boot.lds.debug +++ b/board/sandburst/karef/u-boot.lds.debug @@ -69,3 +69,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/sandburst/metrobox/u-boot.lds b/board/sandburst/metrobox/u-boot.lds index f1bc4a0..7bd3ca4 100644 --- a/board/sandburst/metrobox/u-boot.lds +++ b/board/sandburst/metrobox/u-boot.lds @@ -79,3 +79,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug index a3350f2..0d2674d 100644 --- a/board/sandburst/metrobox/u-boot.lds.debug +++ b/board/sandburst/metrobox/u-boot.lds.debug @@ -69,3 +69,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/sbc405/u-boot.lds b/board/sbc405/u-boot.lds index d9410fa..36d128b 100644 --- a/board/sbc405/u-boot.lds +++ b/board/sbc405/u-boot.lds @@ -71,3 +71,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/sbc8548/u-boot.lds b/board/sbc8548/u-boot.lds index a54a001..8cd87a6 100644 --- a/board/sbc8548/u-boot.lds +++ b/board/sbc8548/u-boot.lds @@ -72,3 +72,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/sbc8560/u-boot.lds b/board/sbc8560/u-boot.lds index 8c12ba4..41e2b6f 100644 --- a/board/sbc8560/u-boot.lds +++ b/board/sbc8560/u-boot.lds @@ -78,3 +78,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds index f156d4f..2a5baa7 100644 --- a/board/sbc8641d/u-boot.lds +++ b/board/sbc8641d/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds index 75174e1..9e8213c 100644 --- a/board/sc3/u-boot.lds +++ b/board/sc3/u-boot.lds @@ -72,3 +72,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds index 61650a8..b72e021 100644 --- a/board/siemens/CCM/u-boot.lds +++ b/board/siemens/CCM/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds index 12a53ba..646a156 100644 --- a/board/siemens/IAD210/u-boot.lds +++ b/board/siemens/IAD210/u-boot.lds @@ -59,5 +59,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) cpu/mpc8xx/interrupts.o (.text) - lib_ppc/time.o (.text) + lib/ppc/time.o (.text) . = env_offset; diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug index bd9d76c..c035d63 100644 --- a/board/siemens/pcu_e/u-boot.lds.debug +++ b/board/siemens/pcu_e/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds index 7de0de8..d9e329d 100644 --- a/board/snmc/qs850/u-boot.lds +++ b/board/snmc/qs850/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -64,4 +64,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds index 7de0de8..d9e329d 100644 --- a/board/snmc/qs860t/u-boot.lds +++ b/board/snmc/qs860t/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -64,4 +64,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/socrates/u-boot.lds b/board/socrates/u-boot.lds index 9241b5c..8f33d44 100644 --- a/board/socrates/u-boot.lds +++ b/board/socrates/u-boot.lds @@ -76,3 +76,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds index 4e221bc..caf1f08 100644 --- a/board/spc1920/u-boot.lds +++ b/board/spc1920/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -64,4 +64,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug index 67d37ae..515296b 100644 --- a/board/spd8xx/u-boot.lds.debug +++ b/board/spd8xx/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/stxgp3/u-boot.lds b/board/stxgp3/u-boot.lds index 182e940..6ff1629 100644 --- a/board/stxgp3/u-boot.lds +++ b/board/stxgp3/u-boot.lds @@ -80,3 +80,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c index 73dddf3..cff5367 100644 --- a/board/stxssa/stxssa.c +++ b/board/stxssa/stxssa.c @@ -261,3 +261,3 @@ board_early_init_f(void) /* Why is the phy reset done _after_ the ethernet - * initialization in lib_ppc/board.c? + * initialization in lib/ppc/board.c? * Do it here so it's done before the TSECs are used. diff --git a/board/stxssa/u-boot.lds b/board/stxssa/u-boot.lds index 750ddb3..3e25716 100644 --- a/board/stxssa/u-boot.lds +++ b/board/stxssa/u-boot.lds @@ -80,3 +80,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/stxxtc/u-boot.lds b/board/stxxtc/u-boot.lds index 14201ac..2e060ba 100644 --- a/board/stxxtc/u-boot.lds +++ b/board/stxxtc/u-boot.lds @@ -57,3 +57,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -61,4 +61,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds index 11a819a..145541a 100644 --- a/board/svm_sc8xx/u-boot.lds +++ b/board/svm_sc8xx/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -64,4 +64,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/tqc/tqm85xx/u-boot.lds b/board/tqc/tqm85xx/u-boot.lds index 91c8952..666abf5 100644 --- a/board/tqc/tqm85xx/u-boot.lds +++ b/board/tqc/tqm85xx/u-boot.lds @@ -73,3 +73,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds index 19c1541..e63f593 100644 --- a/board/tqc/tqm8xx/u-boot.lds +++ b/board/tqc/tqm8xx/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -64,3 +64,3 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) + lib/ppc/cache.o (.text)
diff --git a/board/trab/Makefile b/board/trab/Makefile index 30e5fbb..9233f49 100644 --- a/board/trab/Makefile +++ b/board/trab/Makefile @@ -53,4 +53,4 @@ $(obj)trab_fkt.srec: $(OBJS_FKT) $(LIB) -L$(obj)../../lib_generic -lgeneric \ - $(obj)../../lib_arm/div0.o \ - $(obj)../../lib_arm/_*.o + $(obj)../../lib/arm/div0.o \ + $(obj)../../lib/arm/_*.o $(OBJCOPY) -O srec $(<:.o=) $@ diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds index d8bcfa4..2e0e721 100644 --- a/board/trab/u-boot.lds +++ b/board/trab/u-boot.lds @@ -35,3 +35,3 @@ SECTIONS cpu/arm920t/start.o (.text) - lib_arm/_umodsi3.o (.text) + lib/arm/_umodsi3.o (.text) lib_generic/zlib.o (.text) diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds index 1450d37..3ab0eb0 100644 --- a/board/uc100/u-boot.lds +++ b/board/uc100/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -64,4 +64,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds index d24289c..b9407b6 100644 --- a/board/v37/u-boot.lds +++ b/board/v37/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) @@ -64,4 +64,4 @@ SECTIONS lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug index d2089de..403c29a 100644 --- a/board/w7o/u-boot.lds.debug +++ b/board/w7o/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds index 61650a8..b72e021 100644 --- a/board/westel/amx860/u-boot.lds +++ b/board/westel/amx860/u-boot.lds @@ -59,3 +59,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug index dbd1f9d..23e5c46 100644 --- a/board/westel/amx860/u-boot.lds.debug +++ b/board/westel/amx860/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds index b71a7d6..b65a68d 100644 --- a/board/xes/xpedite5170/u-boot.lds +++ b/board/xes/xpedite5170/u-boot.lds @@ -60,3 +60,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/xilinx/ml300/u-boot.lds b/board/xilinx/ml300/u-boot.lds index fa60e6b..d77cd49 100644 --- a/board/xilinx/ml300/u-boot.lds +++ b/board/xilinx/ml300/u-boot.lds @@ -69,3 +69,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/xilinx/ml300/u-boot.lds.debug b/board/xilinx/ml300/u-boot.lds.debug index 338392a..f753355 100644 --- a/board/xilinx/ml300/u-boot.lds.debug +++ b/board/xilinx/ml300/u-boot.lds.debug @@ -61,3 +61,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
diff --git a/board/xpedite1k/u-boot.lds b/board/xpedite1k/u-boot.lds index c8f9646..19814df 100644 --- a/board/xpedite1k/u-boot.lds +++ b/board/xpedite1k/u-boot.lds @@ -77,3 +77,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/board/xpedite1k/u-boot.lds.debug b/board/xpedite1k/u-boot.lds.debug index 5824cd9..f7ddf62 100644 --- a/board/xpedite1k/u-boot.lds.debug +++ b/board/xpedite1k/u-boot.lds.debug @@ -67,3 +67,3 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) diff --git a/config.mk b/config.mk index 02700f3..9934f29 100644 --- a/config.mk +++ b/config.mk @@ -85,3 +85,3 @@ sinclude $(OBJTREE)/include/autoconf.mk ifdef ARCH -sinclude $(TOPDIR)/lib_$(ARCH)/config.mk # include architecture dependend rules +sinclude $(TOPDIR)/lib/$(ARCH)/config.mk # include architecture dependend rules endif diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds index 9563690..cd37491 100644 --- a/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/cpu/mpc5xxx/u-boot-customlayout.lds @@ -60,4 +60,4 @@ SECTIONS lib_generic/crc32.o (.text) - lib_ppc/cache.o (.text) - lib_ppc/time.o (.text) + lib/ppc/cache.o (.text) + lib/ppc/time.o (.text)
diff --git a/doc/README.LED b/doc/README.LED index 94e552a..db3e8b0 100644 --- a/doc/README.LED +++ b/doc/README.LED @@ -71,3 +71,3 @@ blue_LED_off
-These are weakly defined in lib_arm/board.c to noops. Where applicable, define +These are weakly defined in lib/arm/board.c to noops. Where applicable, define these functions in the board specific source. diff --git a/doc/README.alaska8220 b/doc/README.alaska8220 index 0bd68d9..8573f98 100644 --- a/doc/README.alaska8220 +++ b/doc/README.alaska8220 @@ -24,3 +24,3 @@ Changed files:
-- lib_ppc/board.c added CONFIG_MPC8220 support +- lib/ppc/board.c added CONFIG_MPC8220 support
diff --git a/doc/README.m52277evb b/doc/README.m52277evb index bec77b4..819db40 100644 --- a/doc/README.m52277evb +++ b/doc/README.m52277evb @@ -55,8 +55,8 @@ Changed files:
-- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- lib/m68k/board.c board init function +- lib/m68k/cache.c +- lib/m68k/interrupts Coldfire common interrupt functions +- lib/m68k/m68k_linux.c +- lib/m68k/time.c Timer functions (Dma timer and PIT) +- lib/m68k/traps.c Exception init code
diff --git a/doc/README.m53017evb b/doc/README.m53017evb index 60cfa95..02d91a1 100644 --- a/doc/README.m53017evb +++ b/doc/README.m53017evb @@ -53,8 +53,8 @@ Changed files:
-- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- lib/m68k/board.c board init function +- lib/m68k/cache.c +- lib/m68k/interrupts Coldfire common interrupt functions +- lib/m68k/m68k_linux.c +- lib/m68k/time.c Timer functions (Dma timer and PIT) +- lib/m68k/traps.c Exception init code
diff --git a/doc/README.m5373evb b/doc/README.m5373evb index 0bd1101..ab48b7d 100644 --- a/doc/README.m5373evb +++ b/doc/README.m5373evb @@ -52,8 +52,8 @@ Changed files:
-- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- lib/m68k/board.c board init function +- lib/m68k/cache.c +- lib/m68k/interrupts Coldfire common interrupt functions +- lib/m68k/m68k_linux.c +- lib/m68k/time.c Timer functions (Dma timer and PIT) +- lib/m68k/traps.c Exception init code
diff --git a/doc/README.m54455evb b/doc/README.m54455evb index b769ff9..fdff6ff 100644 --- a/doc/README.m54455evb +++ b/doc/README.m54455evb @@ -54,8 +54,8 @@ Changed files:
-- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/time.c Timer functions (Dma timer and PIT) -- lib_m68k/traps.c Exception init code +- lib/m68k/board.c board init function +- lib/m68k/cache.c +- lib/m68k/interrupts Coldfire common interrupt functions +- lib/m68k/m68k_linux.c +- lib/m68k/time.c Timer functions (Dma timer and PIT) +- lib/m68k/traps.c Exception init code
diff --git a/doc/README.m5475evb b/doc/README.m5475evb index 936c018..bc76f85 100644 --- a/doc/README.m5475evb +++ b/doc/README.m5475evb @@ -60,7 +60,7 @@ Changed files:
-- lib_m68k/board.c board init function -- lib_m68k/cache.c -- lib_m68k/interrupts Coldfire common interrupt functions -- lib_m68k/m68k_linux.c -- lib_m68k/traps.c Exception init code +- lib/m68k/board.c board init function +- lib/m68k/cache.c +- lib/m68k/interrupts Coldfire common interrupt functions +- lib/m68k/m68k_linux.c +- lib/m68k/traps.c Exception init code
diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx index 07be863..4392beb 100644 --- a/doc/README.mpc5xx +++ b/doc/README.mpc5xx @@ -36,5 +36,5 @@ u-boot-0.2.0/include/asm-ppc/u-boot.h u-boot-0.2.0/include/asm-ppc/5xx_immap.h -u-boot-0.2.0/lib_ppc/board.c -u-boot-0.2.0/lib_ppc/cache.c -u-boot-0.2.0/lib_ppc/time.c +u-boot-0.2.0/lib/ppc/board.c +u-boot-0.2.0/lib/ppc/cache.c +u-boot-0.2.0/lib/ppc/time.c u-boot-0.2.0/Makefile diff --git a/doc/README.nios b/doc/README.nios index 7f34938..a92f72b 100644 --- a/doc/README.nios +++ b/doc/README.nios @@ -246,3 +246,3 @@ cover most of the individual functions to get you started. (gdb) directory cpu/nios - (gdb) directory lib_nios + (gdb) directory lib/nios (gdb) directory board/altera/dk1c20 diff --git a/doc/TODO-i386 b/doc/TODO-i386 index 84113f8..9769578 100644 --- a/doc/TODO-i386 +++ b/doc/TODO-i386 @@ -10,3 +10,3 @@ i386 port missing features: linux boot...) -* missing functions in lib_i386 and cpu/i386 +* missing functions in lib/i386 and cpu/i386 * speaker beep interface diff --git a/include/asm-i386/interrupt.h b/include/asm-i386/interrupt.h index 7f408cb..ae7540f 100644 --- a/include/asm-i386/interrupt.h +++ b/include/asm-i386/interrupt.h @@ -32,3 +32,3 @@ void set_vector(u8 intnum, void *routine);
-/* lib_i386/interupts.c */ +/* lib/i386/interupts.c */ void disable_irq(int irq); diff --git a/include/asm-i386/u-boot-i386.h b/include/asm-i386/u-boot-i386.h index 3921e01..b9c6d25 100644 --- a/include/asm-i386/u-boot-i386.h +++ b/include/asm-i386/u-boot-i386.h @@ -51,3 +51,3 @@ int register_timer_isr (timer_fnc_t *isr_func);
-/* Architecture specific - can be in cpu/i386/, lib_i386/, or $(BOARD)/ */ +/* Architecture specific - can be in cpu/i386/, lib/i386/, or $(BOARD)/ */ int timer_init(void); @@ -67,3 +67,3 @@ u32 isa_map_rom(u32 bus_addr, int size);
-/* lib_i386/... */ +/* lib/i386/... */ int video_bios_init(void); diff --git a/include/common.h b/include/common.h index 6284b8a..703775e 100644 --- a/include/common.h +++ b/include/common.h @@ -222,3 +222,3 @@ void reset_cmd_timeout(void);
-/* lib_$(ARCH)/board.c */ +/* lib/$(ARCH)/board.c */ void board_init_f (ulong) __attribute__ ((noreturn)); @@ -590,3 +590,3 @@ ulong video_setmem (ulong);
-/* lib_$(ARCH)/cache.c */ +/* lib/$(ARCH)/cache.c */ void flush_cache (unsigned long, unsigned long); @@ -596,3 +596,3 @@ void invalidate_dcache_range(unsigned long start, unsigned long stop);
-/* lib_$(ARCH)/ticks.S */ +/* lib/$(ARCH)/ticks.S */ unsigned long long get_ticks(void); @@ -600,3 +600,3 @@ void wait_ticks (unsigned long);
-/* lib_$(ARCH)/time.c */ +/* lib/$(ARCH)/time.c */ void udelay (unsigned long); diff --git a/include/configs/B2.h b/include/configs/B2.h index e5439f3..5c2c8c9 100644 --- a/include/configs/B2.h +++ b/include/configs/B2.h @@ -209,3 +209,3 @@ /* - Linux TAGs (see lib_arm/armlinux.c) + Linux TAGs (see lib/arm/armlinux.c) */ diff --git a/lib_arm/Makefile b/lib/arm/Makefile similarity index 100% rename from lib_arm/Makefile rename to lib/arm/Makefile diff --git a/lib_arm/_ashldi3.S b/lib/arm/_ashldi3.S similarity index 100% rename from lib_arm/_ashldi3.S rename to lib/arm/_ashldi3.S diff --git a/lib_arm/_ashrdi3.S b/lib/arm/_ashrdi3.S similarity index 100% rename from lib_arm/_ashrdi3.S rename to lib/arm/_ashrdi3.S diff --git a/lib_arm/_divsi3.S b/lib/arm/_divsi3.S similarity index 100% rename from lib_arm/_divsi3.S rename to lib/arm/_divsi3.S diff --git a/lib_arm/_modsi3.S b/lib/arm/_modsi3.S similarity index 100% rename from lib_arm/_modsi3.S rename to lib/arm/_modsi3.S diff --git a/lib_arm/_udivsi3.S b/lib/arm/_udivsi3.S similarity index 100% rename from lib_arm/_udivsi3.S rename to lib/arm/_udivsi3.S diff --git a/lib_arm/_umodsi3.S b/lib/arm/_umodsi3.S similarity index 100% rename from lib_arm/_umodsi3.S rename to lib/arm/_umodsi3.S diff --git a/lib_arm/board.c b/lib/arm/board.c similarity index 100% rename from lib_arm/board.c rename to lib/arm/board.c diff --git a/lib_arm/bootm.c b/lib/arm/bootm.c similarity index 100% rename from lib_arm/bootm.c rename to lib/arm/bootm.c diff --git a/lib_arm/cache-cp15.c b/lib/arm/cache-cp15.c similarity index 100% rename from lib_arm/cache-cp15.c rename to lib/arm/cache-cp15.c diff --git a/lib_arm/cache.c b/lib/arm/cache.c similarity index 100% rename from lib_arm/cache.c rename to lib/arm/cache.c diff --git a/lib_arm/config.mk b/lib/arm/config.mk similarity index 100% rename from lib_arm/config.mk rename to lib/arm/config.mk diff --git a/lib_arm/div0.c b/lib/arm/div0.c similarity index 100% rename from lib_arm/div0.c rename to lib/arm/div0.c diff --git a/lib_arm/interrupts.c b/lib/arm/interrupts.c similarity index 100% rename from lib_arm/interrupts.c rename to lib/arm/interrupts.c diff --git a/lib_arm/reset.c b/lib/arm/reset.c similarity index 100% rename from lib_arm/reset.c rename to lib/arm/reset.c diff --git a/lib_avr32/Makefile b/lib/avr32/Makefile similarity index 100% rename from lib_avr32/Makefile rename to lib/avr32/Makefile diff --git a/lib_avr32/board.c b/lib/avr32/board.c similarity index 100% rename from lib_avr32/board.c rename to lib/avr32/board.c diff --git a/lib_avr32/bootm.c b/lib/avr32/bootm.c similarity index 100% rename from lib_avr32/bootm.c rename to lib/avr32/bootm.c diff --git a/lib_avr32/config.mk b/lib/avr32/config.mk similarity index 100% rename from lib_avr32/config.mk rename to lib/avr32/config.mk diff --git a/lib_avr32/interrupts.c b/lib/avr32/interrupts.c similarity index 100% rename from lib_avr32/interrupts.c rename to lib/avr32/interrupts.c diff --git a/lib_avr32/memset.S b/lib/avr32/memset.S similarity index 100% rename from lib_avr32/memset.S rename to lib/avr32/memset.S diff --git a/lib_blackfin/.gitignore b/lib/blackfin/.gitignore similarity index 100% rename from lib_blackfin/.gitignore rename to lib/blackfin/.gitignore diff --git a/lib_blackfin/Makefile b/lib/blackfin/Makefile similarity index 100% rename from lib_blackfin/Makefile rename to lib/blackfin/Makefile diff --git a/lib_blackfin/board.c b/lib/blackfin/board.c similarity index 100% rename from lib_blackfin/board.c rename to lib/blackfin/board.c diff --git a/lib_blackfin/boot.c b/lib/blackfin/boot.c similarity index 100% rename from lib_blackfin/boot.c rename to lib/blackfin/boot.c diff --git a/lib_blackfin/cache.c b/lib/blackfin/cache.c similarity index 100% rename from lib_blackfin/cache.c rename to lib/blackfin/cache.c diff --git a/lib_blackfin/clocks.c b/lib/blackfin/clocks.c similarity index 100% rename from lib_blackfin/clocks.c rename to lib/blackfin/clocks.c diff --git a/lib_blackfin/config.mk b/lib/blackfin/config.mk similarity index 98% rename from lib_blackfin/config.mk rename to lib/blackfin/config.mk index 821f082..0d56a3f 100644 --- a/lib_blackfin/config.mk +++ b/lib/blackfin/config.mk @@ -62,3 +62,3 @@ LDR_FLAGS += $(LDR_FLAGS-y) ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),) -LDSCRIPT = $(obj)lib_$(ARCH)/u-boot.lds +LDSCRIPT = $(obj)lib/$(ARCH)/u-boot.lds endif diff --git a/lib_blackfin/memcmp.S b/lib/blackfin/memcmp.S similarity index 100% rename from lib_blackfin/memcmp.S rename to lib/blackfin/memcmp.S diff --git a/lib_blackfin/memcpy.S b/lib/blackfin/memcpy.S similarity index 100% rename from lib_blackfin/memcpy.S rename to lib/blackfin/memcpy.S diff --git a/lib_blackfin/memmove.S b/lib/blackfin/memmove.S similarity index 100% rename from lib_blackfin/memmove.S rename to lib/blackfin/memmove.S diff --git a/lib_blackfin/memset.S b/lib/blackfin/memset.S similarity index 100% rename from lib_blackfin/memset.S rename to lib/blackfin/memset.S diff --git a/lib_blackfin/muldi3.c b/lib/blackfin/muldi3.c similarity index 100% rename from lib_blackfin/muldi3.c rename to lib/blackfin/muldi3.c diff --git a/lib_blackfin/post.c b/lib/blackfin/post.c similarity index 100% rename from lib_blackfin/post.c rename to lib/blackfin/post.c diff --git a/lib_blackfin/string.c b/lib/blackfin/string.c similarity index 100% rename from lib_blackfin/string.c rename to lib/blackfin/string.c diff --git a/lib_blackfin/tests.c b/lib/blackfin/tests.c similarity index 100% rename from lib_blackfin/tests.c rename to lib/blackfin/tests.c diff --git a/lib_blackfin/u-boot.lds.S b/lib/blackfin/u-boot.lds.S similarity index 100% rename from lib_blackfin/u-boot.lds.S rename to lib/blackfin/u-boot.lds.S diff --git a/lib_i386/Makefile b/lib/i386/Makefile similarity index 100% rename from lib_i386/Makefile rename to lib/i386/Makefile diff --git a/lib_i386/bios.S b/lib/i386/bios.S similarity index 100% rename from lib_i386/bios.S rename to lib/i386/bios.S diff --git a/lib_i386/bios.h b/lib/i386/bios.h similarity index 100% rename from lib_i386/bios.h rename to lib/i386/bios.h diff --git a/lib_i386/bios_pci.S b/lib/i386/bios_pci.S similarity index 100% rename from lib_i386/bios_pci.S rename to lib/i386/bios_pci.S diff --git a/lib_i386/bios_setup.c b/lib/i386/bios_setup.c similarity index 100% rename from lib_i386/bios_setup.c rename to lib/i386/bios_setup.c diff --git a/lib_i386/board.c b/lib/i386/board.c similarity index 100% rename from lib_i386/board.c rename to lib/i386/board.c diff --git a/lib_i386/bootm.c b/lib/i386/bootm.c similarity index 100% rename from lib_i386/bootm.c rename to lib/i386/bootm.c diff --git a/lib_i386/config.mk b/lib/i386/config.mk similarity index 100% rename from lib_i386/config.mk rename to lib/i386/config.mk diff --git a/lib_i386/interrupts.c b/lib/i386/interrupts.c similarity index 100% rename from lib_i386/interrupts.c rename to lib/i386/interrupts.c diff --git a/lib_i386/pcat_interrupts.c b/lib/i386/pcat_interrupts.c similarity index 100% rename from lib_i386/pcat_interrupts.c rename to lib/i386/pcat_interrupts.c diff --git a/lib_i386/pcat_timer.c b/lib/i386/pcat_timer.c similarity index 100% rename from lib_i386/pcat_timer.c rename to lib/i386/pcat_timer.c diff --git a/lib_i386/pci.c b/lib/i386/pci.c similarity index 100% rename from lib_i386/pci.c rename to lib/i386/pci.c diff --git a/lib_i386/pci_type1.c b/lib/i386/pci_type1.c similarity index 100% rename from lib_i386/pci_type1.c rename to lib/i386/pci_type1.c diff --git a/lib_i386/realmode.c b/lib/i386/realmode.c similarity index 100% rename from lib_i386/realmode.c rename to lib/i386/realmode.c diff --git a/lib_i386/realmode_switch.S b/lib/i386/realmode_switch.S similarity index 100% rename from lib_i386/realmode_switch.S rename to lib/i386/realmode_switch.S diff --git a/lib_i386/timer.c b/lib/i386/timer.c similarity index 100% rename from lib_i386/timer.c rename to lib/i386/timer.c diff --git a/lib_i386/video.c b/lib/i386/video.c similarity index 100% rename from lib_i386/video.c rename to lib/i386/video.c diff --git a/lib_i386/video_bios.c b/lib/i386/video_bios.c similarity index 100% rename from lib_i386/video_bios.c rename to lib/i386/video_bios.c diff --git a/lib_i386/zimage.c b/lib/i386/zimage.c similarity index 100% rename from lib_i386/zimage.c rename to lib/i386/zimage.c diff --git a/lib_m68k/Makefile b/lib/m68k/Makefile similarity index 100% rename from lib_m68k/Makefile rename to lib/m68k/Makefile diff --git a/lib_m68k/board.c b/lib/m68k/board.c similarity index 100% rename from lib_m68k/board.c rename to lib/m68k/board.c diff --git a/lib_m68k/bootm.c b/lib/m68k/bootm.c similarity index 100% rename from lib_m68k/bootm.c rename to lib/m68k/bootm.c diff --git a/lib_m68k/cache.c b/lib/m68k/cache.c similarity index 100% rename from lib_m68k/cache.c rename to lib/m68k/cache.c diff --git a/lib_m68k/config.mk b/lib/m68k/config.mk similarity index 100% rename from lib_m68k/config.mk rename to lib/m68k/config.mk diff --git a/lib_m68k/interrupts.c b/lib/m68k/interrupts.c similarity index 100% rename from lib_m68k/interrupts.c rename to lib/m68k/interrupts.c diff --git a/lib_m68k/time.c b/lib/m68k/time.c similarity index 100% rename from lib_m68k/time.c rename to lib/m68k/time.c diff --git a/lib_m68k/traps.c b/lib/m68k/traps.c similarity index 100% rename from lib_m68k/traps.c rename to lib/m68k/traps.c diff --git a/lib_microblaze/Makefile b/lib/microblaze/Makefile similarity index 100% rename from lib_microblaze/Makefile rename to lib/microblaze/Makefile diff --git a/lib_microblaze/board.c b/lib/microblaze/board.c similarity index 100% rename from lib_microblaze/board.c rename to lib/microblaze/board.c diff --git a/lib_microblaze/bootm.c b/lib/microblaze/bootm.c similarity index 100% rename from lib_microblaze/bootm.c rename to lib/microblaze/bootm.c diff --git a/lib_microblaze/cache.c b/lib/microblaze/cache.c similarity index 100% rename from lib_microblaze/cache.c rename to lib/microblaze/cache.c diff --git a/lib_microblaze/config.mk b/lib/microblaze/config.mk similarity index 100% rename from lib_microblaze/config.mk rename to lib/microblaze/config.mk diff --git a/lib_microblaze/time.c b/lib/microblaze/time.c similarity index 100% rename from lib_microblaze/time.c rename to lib/microblaze/time.c diff --git a/lib_mips/Makefile b/lib/mips/Makefile similarity index 100% rename from lib_mips/Makefile rename to lib/mips/Makefile diff --git a/lib_mips/board.c b/lib/mips/board.c similarity index 100% rename from lib_mips/board.c rename to lib/mips/board.c diff --git a/lib_mips/bootm.c b/lib/mips/bootm.c similarity index 100% rename from lib_mips/bootm.c rename to lib/mips/bootm.c diff --git a/lib_mips/bootm_qemu_mips.c b/lib/mips/bootm_qemu_mips.c similarity index 100% rename from lib_mips/bootm_qemu_mips.c rename to lib/mips/bootm_qemu_mips.c diff --git a/lib_mips/config.mk b/lib/mips/config.mk similarity index 100% rename from lib_mips/config.mk rename to lib/mips/config.mk diff --git a/lib_mips/time.c b/lib/mips/time.c similarity index 100% rename from lib_mips/time.c rename to lib/mips/time.c diff --git a/lib_nios/Makefile b/lib/nios/Makefile similarity index 100% rename from lib_nios/Makefile rename to lib/nios/Makefile diff --git a/lib_nios/board.c b/lib/nios/board.c similarity index 100% rename from lib_nios/board.c rename to lib/nios/board.c diff --git a/lib_nios/bootm.c b/lib/nios/bootm.c similarity index 100% rename from lib_nios/bootm.c rename to lib/nios/bootm.c diff --git a/lib_nios/cache.c b/lib/nios/cache.c similarity index 100% rename from lib_nios/cache.c rename to lib/nios/cache.c diff --git a/lib_nios/config.mk b/lib/nios/config.mk similarity index 100% rename from lib_nios/config.mk rename to lib/nios/config.mk diff --git a/lib_nios/divmod.c b/lib/nios/divmod.c similarity index 100% rename from lib_nios/divmod.c rename to lib/nios/divmod.c diff --git a/lib_nios/math.h b/lib/nios/math.h similarity index 100% rename from lib_nios/math.h rename to lib/nios/math.h diff --git a/lib_nios/mult.c b/lib/nios/mult.c similarity index 100% rename from lib_nios/mult.c rename to lib/nios/mult.c diff --git a/lib_nios/time.c b/lib/nios/time.c similarity index 100% rename from lib_nios/time.c rename to lib/nios/time.c diff --git a/lib_nios2/Makefile b/lib/nios2/Makefile similarity index 100% rename from lib_nios2/Makefile rename to lib/nios2/Makefile diff --git a/lib_nios2/board.c b/lib/nios2/board.c similarity index 100% rename from lib_nios2/board.c rename to lib/nios2/board.c diff --git a/lib_nios2/bootm.c b/lib/nios2/bootm.c similarity index 100% rename from lib_nios2/bootm.c rename to lib/nios2/bootm.c diff --git a/lib_nios2/cache.S b/lib/nios2/cache.S similarity index 100% rename from lib_nios2/cache.S rename to lib/nios2/cache.S diff --git a/lib_nios2/config.mk b/lib/nios2/config.mk similarity index 100% rename from lib_nios2/config.mk rename to lib/nios2/config.mk diff --git a/lib_nios2/divmod.c b/lib/nios2/divmod.c similarity index 100% rename from lib_nios2/divmod.c rename to lib/nios2/divmod.c diff --git a/lib_nios2/math.h b/lib/nios2/math.h similarity index 100% rename from lib_nios2/math.h rename to lib/nios2/math.h diff --git a/lib_nios2/mult.c b/lib/nios2/mult.c similarity index 100% rename from lib_nios2/mult.c rename to lib/nios2/mult.c diff --git a/lib_nios2/time.c b/lib/nios2/time.c similarity index 100% rename from lib_nios2/time.c rename to lib/nios2/time.c diff --git a/lib_ppc/Makefile b/lib/ppc/Makefile similarity index 100% rename from lib_ppc/Makefile rename to lib/ppc/Makefile diff --git a/lib_ppc/bat_rw.c b/lib/ppc/bat_rw.c similarity index 100% rename from lib_ppc/bat_rw.c rename to lib/ppc/bat_rw.c diff --git a/lib_ppc/board.c b/lib/ppc/board.c similarity index 100% rename from lib_ppc/board.c rename to lib/ppc/board.c diff --git a/lib_ppc/bootm.c b/lib/ppc/bootm.c similarity index 100% rename from lib_ppc/bootm.c rename to lib/ppc/bootm.c diff --git a/lib_ppc/cache.c b/lib/ppc/cache.c similarity index 100% rename from lib_ppc/cache.c rename to lib/ppc/cache.c diff --git a/lib_ppc/config.mk b/lib/ppc/config.mk similarity index 100% rename from lib_ppc/config.mk rename to lib/ppc/config.mk diff --git a/lib_ppc/extable.c b/lib/ppc/extable.c similarity index 100% rename from lib_ppc/extable.c rename to lib/ppc/extable.c diff --git a/lib_ppc/interrupts.c b/lib/ppc/interrupts.c similarity index 100% rename from lib_ppc/interrupts.c rename to lib/ppc/interrupts.c diff --git a/lib_ppc/kgdb.c b/lib/ppc/kgdb.c similarity index 100% rename from lib_ppc/kgdb.c rename to lib/ppc/kgdb.c diff --git a/lib_ppc/ppccache.S b/lib/ppc/ppccache.S similarity index 100% rename from lib_ppc/ppccache.S rename to lib/ppc/ppccache.S diff --git a/lib_ppc/ppcstring.S b/lib/ppc/ppcstring.S similarity index 100% rename from lib_ppc/ppcstring.S rename to lib/ppc/ppcstring.S diff --git a/lib_ppc/ticks.S b/lib/ppc/ticks.S similarity index 100% rename from lib_ppc/ticks.S rename to lib/ppc/ticks.S diff --git a/lib_ppc/time.c b/lib/ppc/time.c similarity index 100% rename from lib_ppc/time.c rename to lib/ppc/time.c diff --git a/lib_sh/Makefile b/lib/sh/Makefile similarity index 100% rename from lib_sh/Makefile rename to lib/sh/Makefile diff --git a/lib_sh/board.c b/lib/sh/board.c similarity index 100% rename from lib_sh/board.c rename to lib/sh/board.c diff --git a/lib_sh/bootm.c b/lib/sh/bootm.c similarity index 100% rename from lib_sh/bootm.c rename to lib/sh/bootm.c diff --git a/lib_sh/config.mk b/lib/sh/config.mk similarity index 100% rename from lib_sh/config.mk rename to lib/sh/config.mk diff --git a/lib_sh/time.c b/lib/sh/time.c similarity index 100% rename from lib_sh/time.c rename to lib/sh/time.c diff --git a/lib_sh/time_sh2.c b/lib/sh/time_sh2.c similarity index 100% rename from lib_sh/time_sh2.c rename to lib/sh/time_sh2.c diff --git a/lib_sparc/Makefile b/lib/sparc/Makefile similarity index 100% rename from lib_sparc/Makefile rename to lib/sparc/Makefile diff --git a/lib_sparc/board.c b/lib/sparc/board.c similarity index 100% rename from lib_sparc/board.c rename to lib/sparc/board.c diff --git a/lib_sparc/bootm.c b/lib/sparc/bootm.c similarity index 100% rename from lib_sparc/bootm.c rename to lib/sparc/bootm.c diff --git a/lib_sparc/cache.c b/lib/sparc/cache.c similarity index 100% rename from lib_sparc/cache.c rename to lib/sparc/cache.c diff --git a/lib_sparc/config.mk b/lib/sparc/config.mk similarity index 100% rename from lib_sparc/config.mk rename to lib/sparc/config.mk diff --git a/lib_sparc/interrupts.c b/lib/sparc/interrupts.c similarity index 100% rename from lib_sparc/interrupts.c rename to lib/sparc/interrupts.c diff --git a/lib_sparc/time.c b/lib/sparc/time.c similarity index 100% rename from lib_sparc/time.c rename to lib/sparc/time.c diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile index 1a8f6ff..4dd83fd 100644 --- a/nand_spl/board/freescale/mpc8313erdb/Makefile +++ b/nand_spl/board/freescale/mpc8313erdb/Makefile @@ -83,9 +83,9 @@ $(obj)nand_init.c: $(obj)cache.c: - ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c + ln -sf $(SRCTREE)/lib/ppc/cache.c $(obj)cache.c
$(obj)time.c: - ln -sf $(SRCTREE)/lib_ppc/time.c $(obj)time.c + ln -sf $(SRCTREE)/lib/ppc/time.c $(obj)time.c
$(obj)ticks.S: - ln -sf $(SRCTREE)/lib_ppc/ticks.S $(obj)ticks.S + ln -sf $(SRCTREE)/lib/ppc/ticks.S $(obj)ticks.S
diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile index 20199c7..7898040 100644 --- a/nand_spl/board/sheldon/simpc8313/Makefile +++ b/nand_spl/board/sheldon/simpc8313/Makefile @@ -89,3 +89,3 @@ $(obj)cache.c: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/cache.c $@ + ln -s $(SRCTREE)/lib/ppc/cache.c $@
@@ -93,3 +93,3 @@ $(obj)time.c: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/time.c $@ + ln -s $(SRCTREE)/lib/ppc/time.c $@
@@ -97,3 +97,3 @@ $(obj)ticks.S: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/ticks.S $@ + ln -s $(SRCTREE)/lib/ppc/ticks.S $@
Dear Peter Tyser,
In message 1247241800-29059-3-git-send-email-ptyser@xes-inc.com you wrote:
Signed-off-by: Peter Tyser ptyser@xes-inc.com
Could you please rebase this patch, and the other two in this series: [PATCH v2 3/6] Move lib_generic to lib/generic [PATCH v2 4/6] Move libfdt to lib/libfdt
against current "next" branch?
Thanks in advance.
Best regards,
Wolfgang Denk
On Sun, 2009-11-22 at 21:54 +0100, Wolfgang Denk wrote:
Dear Peter Tyser,
In message 1247241800-29059-3-git-send-email-ptyser@xes-inc.com you wrote:
Signed-off-by: Peter Tyser ptyser@xes-inc.com
Could you please rebase this patch, and the other two in this series: [PATCH v2 3/6] Move lib_generic to lib/generic [PATCH v2 4/6] Move libfdt to lib/libfdt
against current "next" branch?
Sure. There was some discussion that was spawned when this patch was originally sent and it sounded like the consensus was to add new arch/$ARCH directories instead of creating new lib/$ARCH directories. My personal preference would be to take it a step further and organize like:
/arch/$ARCH/ /lib/<sources currently in lib_$ARCH/> /include/asm/<headers currently in incluce/asm-$ARCH/> /cpu/<appropriate cpu directories in cpu/> /config.mk (old lib_$ARCH/config.mk)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
This layout would more closely match the Linux layout and is cleaner overall in my opinion. What do others think of this idea?
Here's the original discussion for reference: http://www.mail-archive.com/u-boot@lists.denx.de/msg17593.html
Best, Peter
Dear Peter Tyser,
In message 1258943983.9357.20.camel@ptyser-laptop you wrote:
My personal preference would be to take it a step further and organize like:
/arch/$ARCH/ /lib/<sources currently in lib_$ARCH/> /include/asm/<headers currently in incluce/asm-$ARCH/> /cpu/<appropriate cpu directories in cpu/> /config.mk (old lib_$ARCH/config.mk)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
This layout would more closely match the Linux layout and is cleaner overall in my opinion. What do others think of this idea?
I generally agree with the idea, with the exception of /include/asm/<headers> - I really hate this change in the Linux kernel, and still fail to see any advantages of this. Except for that, such a change would be OK with me.
Best regards,
Wolfgang Denk
Wolfgang Denk wrote:
Dear Peter Tyser,
In message 1258943983.9357.20.camel@ptyser-laptop you wrote:
My personal preference would be to take it a step further and organize like:
/arch/$ARCH/ /lib/<sources currently in lib_$ARCH/> /include/asm/<headers currently in incluce/asm-$ARCH/> /cpu/<appropriate cpu directories in cpu/> /config.mk (old lib_$ARCH/config.mk)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
This layout would more closely match the Linux layout and is cleaner overall in my opinion. What do others think of this idea?
I generally agree with the idea, with the exception of /include/asm/<headers> - I really hate this change in the Linux kernel, and still fail to see any advantages of this.
I really like only having one subtree to grep for arch stuff, and it would avoid presenting files that are in git, under a path that git doesn't know about.
Plus, the symlink is one less thing that the makefiles would need to keep in sync when arch changes.
-Scott
On Mon, 2009-12-07 at 15:42 -0600, Scott Wood wrote:
Wolfgang Denk wrote:
Dear Peter Tyser,
In message 1258943983.9357.20.camel@ptyser-laptop you wrote:
My personal preference would be to take it a step further and organize like:
/arch/$ARCH/ /lib/<sources currently in lib_$ARCH/> /include/asm/<headers currently in incluce/asm-$ARCH/> /cpu/<appropriate cpu directories in cpu/> /config.mk (old lib_$ARCH/config.mk)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
This layout would more closely match the Linux layout and is cleaner overall in my opinion. What do others think of this idea?
I generally agree with the idea, with the exception of /include/asm/<headers> - I really hate this change in the Linux kernel, and still fail to see any advantages of this.
I really like only having one subtree to grep for arch stuff, and it would avoid presenting files that are in git, under a path that git doesn't know about.
Plus, the symlink is one less thing that the makefiles would need to keep in sync when arch changes.
I agree with Scott, especially the point about grepping for arch stuff in one directory. It also seems like a generally logical separation of arch-specific code/headers.
What is the downside of splitting out the headers to arch/ directories? Or the advantage of keeping them in include/asm-<arch>?
Best, Peter
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 8 ++++---- README | 2 +- api_examples/Makefile | 10 +++++----- api_examples/libgenwrap.c | 2 +- board/BuS/EB+MCF-EV123/u-boot.lds | 8 ++++---- board/LEOX/elpt860/u-boot.lds | 8 ++++---- board/LEOX/elpt860/u-boot.lds.debug | 4 ++-- board/RPXClassic/u-boot.lds | 6 +++--- board/RPXClassic/u-boot.lds.debug | 4 ++-- board/RPXlite/u-boot.lds | 6 +++--- board/RPXlite/u-boot.lds.debug | 4 ++-- board/RPXlite_dw/u-boot.lds | 6 +++--- board/RPXlite_dw/u-boot.lds.debug | 4 ++-- board/RRvision/u-boot.lds | 6 +++--- board/actux1/u-boot.lds | 4 ++-- board/actux2/u-boot.lds | 4 ++-- board/actux3/u-boot.lds | 4 ++-- board/amirix/ap1000/u-boot.lds | 4 ++-- board/atum8548/u-boot.lds | 4 ++-- board/bf518f-ezbrd/config.mk | 2 +- board/bf526-ezbrd/config.mk | 2 +- board/bf527-ezkit/config.mk | 2 +- board/bf533-ezkit/config.mk | 2 +- board/bf533-stamp/config.mk | 2 +- board/bf537-stamp/config.mk | 2 +- board/bf538f-ezkit/config.mk | 2 +- board/bf548-ezkit/config.mk | 2 +- board/bf561-ezkit/config.mk | 2 +- board/c2mon/u-boot.lds | 6 +++--- board/c2mon/u-boot.lds.debug | 4 ++-- board/cm-bf527/config.mk | 2 +- board/cm-bf533/config.mk | 2 +- board/cm-bf537e/config.mk | 2 +- board/cm-bf548/config.mk | 2 +- board/cm-bf561/config.mk | 2 +- board/cobra5272/u-boot.lds | 2 +- board/cogent/u-boot.lds.debug | 4 ++-- board/cray/L1/u-boot.lds | 4 ++-- board/cray/L1/u-boot.lds.debug | 4 ++-- board/csb272/u-boot.lds | 4 ++-- board/csb472/u-boot.lds | 4 ++-- board/dave/PPChameleonEVB/u-boot.lds | 4 ++-- board/eltec/mhpc/u-boot.lds.debug | 4 ++-- board/emk/top860/u-boot.lds.debug | 4 ++-- board/eric/u-boot.lds | 4 ++-- board/esd/ocrtc/u-boot.lds | 4 ++-- board/esd/tasreg/u-boot.lds | 2 +- board/esteem192e/u-boot.lds | 6 +++--- board/etx094/u-boot.lds | 4 ++-- board/etx094/u-boot.lds.debug | 4 ++-- board/exbitgen/u-boot.lds | 4 ++-- board/fads/u-boot.lds.debug | 4 ++-- board/flagadm/u-boot.lds.debug | 4 ++-- board/freescale/m52277evb/u-boot.spa | 2 +- board/freescale/m5235evb/u-boot.16 | 2 +- board/freescale/m5235evb/u-boot.32 | 2 +- board/freescale/m5249evb/u-boot.lds | 2 +- board/freescale/m5253demo/u-boot.lds | 2 +- board/freescale/m5253evbe/u-boot.lds | 2 +- board/freescale/m5271evb/u-boot.lds | 2 +- board/freescale/m5272c3/u-boot.lds | 2 +- board/freescale/m5275evb/u-boot.lds | 4 ++-- board/freescale/m5282evb/u-boot.lds | 6 +++--- board/freescale/m53017evb/u-boot.lds | 2 +- board/freescale/m5329evb/u-boot.lds | 2 +- board/freescale/m5373evb/u-boot.lds | 2 +- board/freescale/m54451evb/u-boot.spa | 2 +- board/freescale/m54451evb/u-boot.stm | 2 +- board/freescale/m54455evb/u-boot.atm | 2 +- board/freescale/m54455evb/u-boot.int | 2 +- board/freescale/mpc8610hpcd/u-boot.lds | 4 ++-- board/freescale/mpc8641hpcn/u-boot.lds | 4 ++-- board/genietv/u-boot.lds | 6 +++--- board/genietv/u-boot.lds.debug | 6 +++--- board/hermes/u-boot.lds | 2 +- board/hymod/u-boot.lds | 6 +++--- board/hymod/u-boot.lds.debug | 4 ++-- board/icu862/u-boot.lds | 6 +++--- board/icu862/u-boot.lds.debug | 4 ++-- board/idmr/u-boot.lds | 2 +- board/ivm/u-boot.lds.debug | 4 ++-- board/keymile/km8xx/u-boot.lds | 6 +++--- board/kup/kup4k/u-boot.lds | 6 +++--- board/kup/kup4k/u-boot.lds.debug | 4 ++-- board/kup/kup4x/u-boot.lds | 6 +++--- board/kup/kup4x/u-boot.lds.debug | 4 ++-- board/lantec/u-boot.lds | 6 +++--- board/lantec/u-boot.lds.debug | 4 ++-- board/lwmon/u-boot.lds.debug | 4 ++-- board/mbx8xx/u-boot.lds.debug | 4 ++-- board/ml2/u-boot.lds | 4 ++-- board/ml2/u-boot.lds.debug | 4 ++-- board/mousse/u-boot.lds | 6 +++--- board/mousse/u-boot.lds.rom | 6 +++--- board/mpc8540eval/u-boot.lds | 4 ++-- board/mpl/mip405/u-boot.lds | 4 ++-- board/mpl/pip405/u-boot.lds | 4 ++-- board/mpl/pip405/u-boot.lds.debug | 4 ++-- board/netphone/u-boot.lds | 6 +++--- board/netphone/u-boot.lds.debug | 4 ++-- board/netstar/Makefile | 4 ++-- board/netta/u-boot.lds | 6 +++--- board/netta/u-boot.lds.debug | 4 ++-- board/netta2/u-boot.lds | 6 +++--- board/netta2/u-boot.lds.debug | 4 ++-- board/netvia/u-boot.lds | 6 +++--- board/netvia/u-boot.lds.debug | 4 ++-- board/nx823/u-boot.lds.debug | 4 ++-- board/pcs440ep/u-boot.lds | 2 +- board/pm854/u-boot.lds | 4 ++-- board/pm856/u-boot.lds | 4 ++-- board/purple/u-boot.lds | 2 +- board/quantum/u-boot.lds | 6 +++--- board/quantum/u-boot.lds.debug | 4 ++-- board/rbc823/u-boot.lds | 6 +++--- board/rmu/u-boot.lds | 6 +++--- board/rmu/u-boot.lds.debug | 4 ++-- board/sandburst/karef/u-boot.lds | 4 ++-- board/sandburst/karef/u-boot.lds.debug | 4 ++-- board/sandburst/metrobox/u-boot.lds | 4 ++-- board/sandburst/metrobox/u-boot.lds.debug | 4 ++-- board/sbc405/u-boot.lds | 4 ++-- board/sbc8548/u-boot.lds | 4 ++-- board/sbc8560/u-boot.lds | 4 ++-- board/sbc8641d/u-boot.lds | 4 ++-- board/sc3/u-boot.lds | 4 ++-- board/siemens/CCM/u-boot.lds | 6 +++--- board/siemens/CCM/u-boot.lds.debug | 4 ++-- board/siemens/pcu_e/u-boot.lds.debug | 4 ++-- board/snmc/qs850/u-boot.lds | 6 +++--- board/snmc/qs860t/u-boot.lds | 6 +++--- board/socrates/u-boot.lds | 4 ++-- board/spc1920/u-boot.lds | 6 +++--- board/spd8xx/u-boot.lds.debug | 4 ++-- board/stxgp3/u-boot.lds | 4 ++-- board/stxssa/u-boot.lds | 4 ++-- board/stxxtc/u-boot.lds | 6 +++--- board/stxxtc/u-boot.lds.debug | 4 ++-- board/svm_sc8xx/u-boot.lds | 6 +++--- board/svm_sc8xx/u-boot.lds.debug | 4 ++-- board/tcm-bf537/config.mk | 2 +- board/tqc/tqm85xx/u-boot.lds | 4 ++-- board/tqc/tqm8xx/u-boot.lds | 6 +++--- board/tqc/tqm8xx/u-boot.lds.debug | 4 ++-- board/trab/Makefile | 2 +- board/trab/u-boot.lds | 6 +++--- board/uc100/u-boot.lds | 6 +++--- board/uc100/u-boot.lds.debug | 4 ++-- board/v37/u-boot.lds | 6 +++--- board/voiceblue/Makefile | 2 +- board/w7o/u-boot.lds.debug | 4 ++-- board/westel/amx860/u-boot.lds | 6 +++--- board/westel/amx860/u-boot.lds.debug | 4 ++-- board/xes/xpedite5170/u-boot.lds | 4 ++-- board/xilinx/ml300/u-boot.lds | 4 ++-- board/xilinx/ml300/u-boot.lds.debug | 4 ++-- board/xpedite1k/u-boot.lds | 4 ++-- board/xpedite1k/u-boot.lds.debug | 4 ++-- cpu/mpc5xxx/u-boot-customlayout.lds | 2 +- include/common.h | 6 +++--- include/configs/bf533-stamp.h | 2 +- include/configs/bf537-pnav.h | 2 +- include/configs/bf537-stamp.h | 2 +- include/configs/bf538f-ezkit.h | 2 +- include/configs/bf561-ezkit.h | 4 ++-- include/configs/cm-bf537e.h | 2 +- include/configs/ibf-dsp561.h | 4 ++-- include/configs/tcm-bf537.h | 2 +- include/lzma/LzmaDecode.h | 2 +- include/lzma/LzmaTools.h | 2 +- include/lzma/LzmaTypes.h | 2 +- {lib_generic => lib/generic}/Makefile | 0 {lib_generic => lib/generic}/addr_map.c | 0 {lib_generic => lib/generic}/bzlib.c | 0 {lib_generic => lib/generic}/bzlib_crctable.c | 0 {lib_generic => lib/generic}/bzlib_decompress.c | 0 {lib_generic => lib/generic}/bzlib_huffman.c | 0 {lib_generic => lib/generic}/bzlib_private.h | 0 {lib_generic => lib/generic}/bzlib_randtable.c | 0 {lib_generic => lib/generic}/crc16.c | 0 {lib_generic => lib/generic}/crc32.c | 0 {lib_generic => lib/generic}/ctype.c | 0 {lib_generic => lib/generic}/display_options.c | 0 {lib_generic => lib/generic}/div64.c | 0 {lib_generic => lib/generic}/gunzip.c | 0 {lib_generic => lib/generic}/ldiv.c | 0 {lib_generic => lib/generic}/lmb.c | 0 {lib_generic => lib/generic}/lzma/LGPL.txt | 0 {lib_generic => lib/generic}/lzma/LzmaDecode.c | 0 {lib_generic => lib/generic}/lzma/LzmaDecode.h | 0 {lib_generic => lib/generic}/lzma/LzmaTools.c | 0 {lib_generic => lib/generic}/lzma/LzmaTools.h | 0 {lib_generic => lib/generic}/lzma/LzmaTypes.h | 0 {lib_generic => lib/generic}/lzma/Makefile | 0 {lib_generic => lib/generic}/lzma/README.txt | 0 {lib_generic => lib/generic}/lzma/history.txt | 0 .../generic}/lzma/import_lzmasdk.sh | 0 {lib_generic => lib/generic}/lzma/lzma.txt | 0 {lib_generic => lib/generic}/lzo/Makefile | 0 .../generic}/lzo/lzo1x_decompress.c | 0 {lib_generic => lib/generic}/lzo/lzodefs.h | 0 {lib_generic => lib/generic}/md5.c | 0 {lib_generic => lib/generic}/rbtree.c | 0 {lib_generic => lib/generic}/sha1.c | 0 {lib_generic => lib/generic}/sha256.c | 0 {lib_generic => lib/generic}/string.c | 0 {lib_generic => lib/generic}/strmhz.c | 0 {lib_generic => lib/generic}/vsprintf.c | 0 {lib_generic => lib/generic}/zlib.c | 0 tools/Makefile | 8 ++++---- tools/env/Makefile | 2 +- tools/imls/Makefile | 8 ++++---- 212 files changed, 346 insertions(+), 346 deletions(-) rename {lib_generic => lib/generic}/Makefile (100%) rename {lib_generic => lib/generic}/addr_map.c (100%) rename {lib_generic => lib/generic}/bzlib.c (100%) rename {lib_generic => lib/generic}/bzlib_crctable.c (100%) rename {lib_generic => lib/generic}/bzlib_decompress.c (100%) rename {lib_generic => lib/generic}/bzlib_huffman.c (100%) rename {lib_generic => lib/generic}/bzlib_private.h (100%) rename {lib_generic => lib/generic}/bzlib_randtable.c (100%) rename {lib_generic => lib/generic}/crc16.c (100%) rename {lib_generic => lib/generic}/crc32.c (100%) rename {lib_generic => lib/generic}/ctype.c (100%) rename {lib_generic => lib/generic}/display_options.c (100%) rename {lib_generic => lib/generic}/div64.c (100%) rename {lib_generic => lib/generic}/gunzip.c (100%) rename {lib_generic => lib/generic}/ldiv.c (100%) rename {lib_generic => lib/generic}/lmb.c (100%) rename {lib_generic => lib/generic}/lzma/LGPL.txt (100%) rename {lib_generic => lib/generic}/lzma/LzmaDecode.c (100%) rename {lib_generic => lib/generic}/lzma/LzmaDecode.h (100%) rename {lib_generic => lib/generic}/lzma/LzmaTools.c (100%) rename {lib_generic => lib/generic}/lzma/LzmaTools.h (100%) rename {lib_generic => lib/generic}/lzma/LzmaTypes.h (100%) rename {lib_generic => lib/generic}/lzma/Makefile (100%) rename {lib_generic => lib/generic}/lzma/README.txt (100%) rename {lib_generic => lib/generic}/lzma/history.txt (100%) rename {lib_generic => lib/generic}/lzma/import_lzmasdk.sh (100%) rename {lib_generic => lib/generic}/lzma/lzma.txt (100%) rename {lib_generic => lib/generic}/lzo/Makefile (100%) rename {lib_generic => lib/generic}/lzo/lzo1x_decompress.c (100%) rename {lib_generic => lib/generic}/lzo/lzodefs.h (100%) rename {lib_generic => lib/generic}/md5.c (100%) rename {lib_generic => lib/generic}/rbtree.c (100%) rename {lib_generic => lib/generic}/sha1.c (100%) rename {lib_generic => lib/generic}/sha256.c (100%) rename {lib_generic => lib/generic}/string.c (100%) rename {lib_generic => lib/generic}/strmhz.c (100%) rename {lib_generic => lib/generic}/vsprintf.c (100%) rename {lib_generic => lib/generic}/zlib.c (100%)
diff --git a/Makefile b/Makefile index b0dd4c5..d52b586 100644 --- a/Makefile +++ b/Makefile @@ -218,5 +218,5 @@ OBJS := $(addprefix $(obj),$(OBJS))
-LIBS = lib_generic/libgeneric.a -LIBS += lib_generic/lzma/liblzma.a -LIBS += lib_generic/lzo/liblzo.a +LIBS = lib/generic/libgeneric.a +LIBS += lib/generic/lzma/liblzma.a +LIBS += lib/generic/lzo/liblzo.a LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ @@ -409,3 +409,3 @@ depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk TAG_SUBDIRS += include -TAG_SUBDIRS += lib_generic board/$(BOARDDIR) +TAG_SUBDIRS += lib/generic board/$(BOARDDIR) TAG_SUBDIRS += cpu/$(CPU) diff --git a/README b/README index b88dc1c..33a872f 100644 --- a/README +++ b/README @@ -186,3 +186,3 @@ Directory Hierarchy: - lib/blackfin Files generic to Blackfin architecture -- lib_generic Files generic to all architectures +- lib/generic Files generic to all architectures - lib/i386 Files generic to i386 architecture diff --git a/api_examples/Makefile b/api_examples/Makefile index 23b5e9c..db9f6ea 100644 --- a/api_examples/Makefile +++ b/api_examples/Makefile @@ -42,6 +42,6 @@ COBJ_FILES-$(CONFIG_API) += libgenwrap.o # Source files which exist outside the api_examples directory -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/crc32.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/ctype.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o -EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/vsprintf.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/generic/crc32.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/generic/ctype.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/generic/string.o +EXT_COBJ_FILES-$(CONFIG_API) += lib/generic/vsprintf.o ifeq ($(ARCH),ppc) @@ -75,3 +75,3 @@ $(OUTPUT): $(OBJS) # Rule to build generic library C files -$(obj)%.o: $(SRCTREE)/lib_generic/%.c +$(obj)%.o: $(SRCTREE)/lib/generic/%.c $(CC) -g $(CFLAGS) -c -o $@ $< diff --git a/api_examples/libgenwrap.c b/api_examples/libgenwrap.c index 2b62bad..1616f9f 100644 --- a/api_examples/libgenwrap.c +++ b/api_examples/libgenwrap.c @@ -25,3 +25,3 @@ * This is is a set of wrappers/stubs that allow to use certain routines from - * U-Boot's lib_generic in the standalone app. This way way we can re-use + * U-Boot's lib/generic in the standalone app. This way way we can re-use * existing code e.g. operations on strings and similar. diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds index 3450793..a9e8879 100644 --- a/board/BuS/EB+MCF-EV123/u-boot.lds +++ b/board/BuS/EB+MCF-EV123/u-boot.lds @@ -59,6 +59,6 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/string.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/string.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds index 428ad52..6c6fc96 100644 --- a/board/LEOX/elpt860/u-boot.lds +++ b/board/LEOX/elpt860/u-boot.lds @@ -69,6 +69,6 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) - lib_generic/string.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) + lib/generic/string.o (.text) lib/ppc/cache.o (.text) diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug index 434c9b7..0cbfe2a 100644 --- a/board/LEOX/elpt860/u-boot.lds.debug +++ b/board/LEOX/elpt860/u-boot.lds.debug @@ -68,4 +68,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds index dd5b607..d2ec27c 100644 --- a/board/RPXClassic/u-boot.lds +++ b/board/RPXClassic/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) /* XXX ? diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug index ea85389..33813dc 100644 --- a/board/RPXClassic/u-boot.lds.debug +++ b/board/RPXClassic/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds index dd5b607..d2ec27c 100644 --- a/board/RPXlite/u-boot.lds +++ b/board/RPXlite/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) /* XXX ? diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug index ea85389..33813dc 100644 --- a/board/RPXlite/u-boot.lds.debug +++ b/board/RPXlite/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds index d8e3c0c..0ae6d26 100644 --- a/board/RPXlite_dw/u-boot.lds +++ b/board/RPXlite_dw/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) /* XXX ? diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug index 0f6ae69..ede7598 100644 --- a/board/RPXlite_dw/u-boot.lds.debug +++ b/board/RPXlite_dw/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds index 794f0f9..b382bdd 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -61,5 +61,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds index a695056..9047815 100644 --- a/board/actux1/u-boot.lds +++ b/board/actux1/u-boot.lds @@ -33,4 +33,4 @@ SECTIONS cpu/ixp/start.o(.text) - lib_generic/string.o(.text) - lib_generic/vsprintf.o(.text) + lib/generic/string.o(.text) + lib/generic/vsprintf.o(.text) lib/arm/board.o(.text) diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds index 4423000..d8d2fa1 100644 --- a/board/actux2/u-boot.lds +++ b/board/actux2/u-boot.lds @@ -33,4 +33,4 @@ SECTIONS cpu/ixp/start.o(.text) - lib_generic/string.o(.text) - lib_generic/vsprintf.o(.text) + lib/generic/string.o(.text) + lib/generic/vsprintf.o(.text) lib/arm/board.o(.text) diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds index 985271d..a46cc46 100644 --- a/board/actux3/u-boot.lds +++ b/board/actux3/u-boot.lds @@ -33,4 +33,4 @@ SECTIONS cpu/ixp/start.o (.text) - lib_generic/string.o (.text) - lib_generic/vsprintf.o (.text) + lib/generic/string.o (.text) + lib/generic/vsprintf.o (.text) lib/arm/board.o (.text) diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds index e0c25d2..5c164a8 100644 --- a/board/amirix/ap1000/u-boot.lds +++ b/board/amirix/ap1000/u-boot.lds @@ -66,5 +66,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/atum8548/u-boot.lds b/board/atum8548/u-boot.lds index 1342135..f21e087 100644 --- a/board/atum8548/u-boot.lds +++ b/board/atum8548/u-boot.lds @@ -69,5 +69,5 @@ SECTIONS cpu/mpc85xx/speed.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/bf518f-ezbrd/config.mk b/board/bf518f-ezbrd/config.mk index f85bef5..a6416ed 100644 --- a/board/bf518f-ezbrd/config.mk +++ b/board/bf518f-ezbrd/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/bf526-ezbrd/config.mk b/board/bf526-ezbrd/config.mk index f85bef5..a6416ed 100644 --- a/board/bf526-ezbrd/config.mk +++ b/board/bf526-ezbrd/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/bf527-ezkit/config.mk b/board/bf527-ezkit/config.mk index f85bef5..a6416ed 100644 --- a/board/bf527-ezkit/config.mk +++ b/board/bf527-ezkit/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/bf533-ezkit/config.mk b/board/bf533-ezkit/config.mk index 3c0b46f..bf87ab9 100644 --- a/board/bf533-ezkit/config.mk +++ b/board/bf533-ezkit/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/bf533-stamp/config.mk b/board/bf533-stamp/config.mk index 3c0b46f..bf87ab9 100644 --- a/board/bf533-stamp/config.mk +++ b/board/bf533-stamp/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/bf537-stamp/config.mk b/board/bf537-stamp/config.mk index bc14257..79ad79d 100644 --- a/board/bf537-stamp/config.mk +++ b/board/bf537-stamp/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/bf538f-ezkit/config.mk b/board/bf538f-ezkit/config.mk index 3c0b46f..bf87ab9 100644 --- a/board/bf538f-ezkit/config.mk +++ b/board/bf538f-ezkit/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/bf548-ezkit/config.mk b/board/bf548-ezkit/config.mk index 42ff946..0be9a22 100644 --- a/board/bf548-ezkit/config.mk +++ b/board/bf548-ezkit/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/bf561-ezkit/config.mk b/board/bf561-ezkit/config.mk index cfad21a..3f318f7 100644 --- a/board/bf561-ezkit/config.mk +++ b/board/bf561-ezkit/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds index b72e021..27ce175 100644 --- a/board/c2mon/u-boot.lds +++ b/board/c2mon/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug index dbec986..28d541f 100644 --- a/board/c2mon/u-boot.lds.debug +++ b/board/c2mon/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/cm-bf527/config.mk b/board/cm-bf527/config.mk index f85bef5..a6416ed 100644 --- a/board/cm-bf527/config.mk +++ b/board/cm-bf527/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/cm-bf533/config.mk b/board/cm-bf533/config.mk index 3c0b46f..bf87ab9 100644 --- a/board/cm-bf533/config.mk +++ b/board/cm-bf533/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/cm-bf537e/config.mk b/board/cm-bf537e/config.mk index 3c0b46f..bf87ab9 100644 --- a/board/cm-bf537e/config.mk +++ b/board/cm-bf537e/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/cm-bf548/config.mk b/board/cm-bf548/config.mk index 0c95b39..783ae5f 100644 --- a/board/cm-bf548/config.mk +++ b/board/cm-bf548/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/cm-bf561/config.mk b/board/cm-bf561/config.mk index cfad21a..3f318f7 100644 --- a/board/cm-bf561/config.mk +++ b/board/cm-bf561/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds index e866689..b70530d 100644 --- a/board/cobra5272/u-boot.lds +++ b/board/cobra5272/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug index ea85389..33813dc 100644 --- a/board/cogent/u-boot.lds.debug +++ b/board/cogent/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/cray/L1/u-boot.lds b/board/cray/L1/u-boot.lds index fe69c93..60261b9 100644 --- a/board/cray/L1/u-boot.lds +++ b/board/cray/L1/u-boot.lds @@ -72,5 +72,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug index f753355..f15011f 100644 --- a/board/cray/L1/u-boot.lds.debug +++ b/board/cray/L1/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/csb272/u-boot.lds b/board/csb272/u-boot.lds index 453cd3b..567bc46 100644 --- a/board/csb272/u-boot.lds +++ b/board/csb272/u-boot.lds @@ -72,3 +72,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text)
@@ -76,3 +76,3 @@ SECTIONS lib/ppc/board.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) /* . = env_offset;*/ diff --git a/board/csb472/u-boot.lds b/board/csb472/u-boot.lds index 21682bb..79f77aa 100644 --- a/board/csb472/u-boot.lds +++ b/board/csb472/u-boot.lds @@ -72,3 +72,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text)
@@ -76,3 +76,3 @@ SECTIONS lib/ppc/board.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) /* . = env_offset;*/ diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds index 0468fe2..c8c8819 100644 --- a/board/dave/PPChameleonEVB/u-boot.lds +++ b/board/dave/PPChameleonEVB/u-boot.lds @@ -70,5 +70,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug index dbec986..28d541f 100644 --- a/board/eltec/mhpc/u-boot.lds.debug +++ b/board/eltec/mhpc/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug index 6e168a4..c9e9080 100644 --- a/board/emk/top860/u-boot.lds.debug +++ b/board/emk/top860/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/eric/u-boot.lds b/board/eric/u-boot.lds index 2ab92e7..382fa66 100644 --- a/board/eric/u-boot.lds +++ b/board/eric/u-boot.lds @@ -72,5 +72,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/esd/ocrtc/u-boot.lds b/board/esd/ocrtc/u-boot.lds index 03c164d..d170a25 100644 --- a/board/esd/ocrtc/u-boot.lds +++ b/board/esd/ocrtc/u-boot.lds @@ -69,5 +69,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds index e072c5d..2f99597 100644 --- a/board/esd/tasreg/u-boot.lds +++ b/board/esd/tasreg/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds index 704de98..b6c1fb9 100644 --- a/board/esteem192e/u-boot.lds +++ b/board/esteem192e/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds index eb3d487..2fbe163 100644 --- a/board/etx094/u-boot.lds +++ b/board/etx094/u-boot.lds @@ -64,4 +64,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug index 334b85a..f763062 100644 --- a/board/etx094/u-boot.lds.debug +++ b/board/etx094/u-boot.lds.debug @@ -66,4 +66,4 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/string.o (.text) - lib_generic/crc32.o (.text) + lib/generic/string.o (.text) + lib/generic/crc32.o (.text) common/dlmalloc.o (.text) diff --git a/board/exbitgen/u-boot.lds b/board/exbitgen/u-boot.lds index 52d8ddd..5ced498 100644 --- a/board/exbitgen/u-boot.lds +++ b/board/exbitgen/u-boot.lds @@ -71,5 +71,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug index 515296b..87238ec 100644 --- a/board/fads/u-boot.lds.debug +++ b/board/fads/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug index dbec986..28d541f 100644 --- a/board/flagadm/u-boot.lds.debug +++ b/board/flagadm/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa index 1105456..930497e 100644 --- a/board/freescale/m52277evb/u-boot.spa +++ b/board/freescale/m52277evb/u-boot.spa @@ -60,3 +60,3 @@ SECTIONS lib/m68k/libm68k.a (.text) - lib_generic/libgeneric.a (.text) + lib/generic/libgeneric.a (.text) common/cmd_mem.o (.text) diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16 index da9b61a..ae05375 100644 --- a/board/freescale/m5235evb/u-boot.16 +++ b/board/freescale/m5235evb/u-boot.16 @@ -62,3 +62,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32 index 99cdd78..43a6b44 100644 --- a/board/freescale/m5235evb/u-boot.32 +++ b/board/freescale/m5235evb/u-boot.32 @@ -70,3 +70,3 @@ SECTIONS common/main.o (.text) - lib_generic/libgeneric.a (.text) + lib/generic/libgeneric.a (.text)
diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds index e072c5d..2f99597 100644 --- a/board/freescale/m5249evb/u-boot.lds +++ b/board/freescale/m5249evb/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds index f5f334d..55a8dd9 100644 --- a/board/freescale/m5253demo/u-boot.lds +++ b/board/freescale/m5253demo/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds index 814d5c2..532d246 100644 --- a/board/freescale/m5253evbe/u-boot.lds +++ b/board/freescale/m5253evbe/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds index 2d1bf3a..06058fa 100644 --- a/board/freescale/m5271evb/u-boot.lds +++ b/board/freescale/m5271evb/u-boot.lds @@ -62,3 +62,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds index bde5d86..b74d611 100644 --- a/board/freescale/m5272c3/u-boot.lds +++ b/board/freescale/m5272c3/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m5275evb/u-boot.lds b/board/freescale/m5275evb/u-boot.lds index daf8724..c3b3a87 100644 --- a/board/freescale/m5275evb/u-boot.lds +++ b/board/freescale/m5275evb/u-boot.lds @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/string.o (.text) - lib_generic/zlib.o (.text) + lib/generic/string.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds index f46e025..c000a7e 100644 --- a/board/freescale/m5282evb/u-boot.lds +++ b/board/freescale/m5282evb/u-boot.lds @@ -59,5 +59,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/string.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/string.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds index 52ca4f8..e057018 100644 --- a/board/freescale/m53017evb/u-boot.lds +++ b/board/freescale/m53017evb/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds index 5c9720e..371b5cb 100644 --- a/board/freescale/m5329evb/u-boot.lds +++ b/board/freescale/m5329evb/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds index 30fb272..5b671f7 100644 --- a/board/freescale/m5373evb/u-boot.lds +++ b/board/freescale/m5373evb/u-boot.lds @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa index d568688..40d452c 100644 --- a/board/freescale/m54451evb/u-boot.spa +++ b/board/freescale/m54451evb/u-boot.spa @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm index 92880d9..2347065 100644 --- a/board/freescale/m54451evb/u-boot.stm +++ b/board/freescale/m54451evb/u-boot.stm @@ -66,3 +66,3 @@ SECTIONS common/console.o (.text) - lib_generic/display_options.o (.text) + lib/generic/display_options.o (.text) board/freescale/m54455evb/m54455evb.o (.text) diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm index d568688..40d452c 100644 --- a/board/freescale/m54455evb/u-boot.atm +++ b/board/freescale/m54455evb/u-boot.atm @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int index 58419c0..73c87bc 100644 --- a/board/freescale/m54455evb/u-boot.int +++ b/board/freescale/m54455evb/u-boot.int @@ -61,3 +61,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds index c4e47c9..30fefd8 100644 --- a/board/freescale/mpc8610hpcd/u-boot.lds +++ b/board/freescale/mpc8610hpcd/u-boot.lds @@ -59,5 +59,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds index ae944d0..f59af5c 100644 --- a/board/freescale/mpc8641hpcn/u-boot.lds +++ b/board/freescale/mpc8641hpcn/u-boot.lds @@ -59,5 +59,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) drivers/bios_emulator/atibios.o (.text) diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds index d7f70b7..fd80ace 100644 --- a/board/genietv/u-boot.lds +++ b/board/genietv/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug index d3bfb36..ff91c93 100644 --- a/board/genietv/u-boot.lds.debug +++ b/board/genietv/u-boot.lds.debug @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds index eadcaf0..d59230d 100644 --- a/board/hermes/u-boot.lds +++ b/board/hermes/u-boot.lds @@ -63,3 +63,3 @@ SECTIONS lib/ppc/cache.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) . = env_offset; diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds index 73c5e74..4cf9556 100644 --- a/board/hymod/u-boot.lds +++ b/board/hymod/u-boot.lds @@ -61,5 +61,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug index ea85389..33813dc 100644 --- a/board/hymod/u-boot.lds.debug +++ b/board/hymod/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds index 71cf813..91349b5 100644 --- a/board/icu862/u-boot.lds +++ b/board/icu862/u-boot.lds @@ -62,5 +62,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug index 23e5c46..b8e9478 100644 --- a/board/icu862/u-boot.lds.debug +++ b/board/icu862/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds index 2d1bf3a..06058fa 100644 --- a/board/idmr/u-boot.lds +++ b/board/idmr/u-boot.lds @@ -62,3 +62,3 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug index eac3d78..75970a9 100644 --- a/board/ivm/u-boot.lds.debug +++ b/board/ivm/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds index 0b2fc20..5fa5ee2 100644 --- a/board/keymile/km8xx/u-boot.lds +++ b/board/keymile/km8xx/u-boot.lds @@ -61,5 +61,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds index 575e676..9f35779 100644 --- a/board/kup/kup4k/u-boot.lds +++ b/board/kup/kup4k/u-boot.lds @@ -62,5 +62,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug index 0f6ae69..ede7598 100644 --- a/board/kup/kup4k/u-boot.lds.debug +++ b/board/kup/kup4k/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds index 575e676..9f35779 100644 --- a/board/kup/kup4x/u-boot.lds +++ b/board/kup/kup4x/u-boot.lds @@ -62,5 +62,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug index 0f6ae69..ede7598 100644 --- a/board/kup/kup4x/u-boot.lds.debug +++ b/board/kup/kup4x/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds index 7e1b6ee..9e2a34b 100644 --- a/board/lantec/u-boot.lds +++ b/board/lantec/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug index d5e2c1d..dba3fcf 100644 --- a/board/lantec/u-boot.lds.debug +++ b/board/lantec/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug index c035d63..fd7ef72 100644 --- a/board/lwmon/u-boot.lds.debug +++ b/board/lwmon/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug index 515296b..87238ec 100644 --- a/board/mbx8xx/u-boot.lds.debug +++ b/board/mbx8xx/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds index e81d4aa..7801c1c 100644 --- a/board/ml2/u-boot.lds +++ b/board/ml2/u-boot.lds @@ -66,5 +66,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug index f753355..f15011f 100644 --- a/board/ml2/u-boot.lds.debug +++ b/board/ml2/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds index 7644b90..698f241 100644 --- a/board/mousse/u-boot.lds +++ b/board/mousse/u-boot.lds @@ -57,5 +57,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom index 9111252..952ae26 100644 --- a/board/mousse/u-boot.lds.rom +++ b/board/mousse/u-boot.lds.rom @@ -57,5 +57,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/mpc8540eval/u-boot.lds b/board/mpc8540eval/u-boot.lds index cb6ff82..1bdf29b 100644 --- a/board/mpc8540eval/u-boot.lds +++ b/board/mpc8540eval/u-boot.lds @@ -64,5 +64,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/mpl/mip405/u-boot.lds b/board/mpl/mip405/u-boot.lds index 592c030..0d63e2b 100644 --- a/board/mpl/mip405/u-boot.lds +++ b/board/mpl/mip405/u-boot.lds @@ -76,5 +76,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/mpl/pip405/u-boot.lds b/board/mpl/pip405/u-boot.lds index 38184ad..2cf6916 100644 --- a/board/mpl/pip405/u-boot.lds +++ b/board/mpl/pip405/u-boot.lds @@ -71,5 +71,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug index f753355..f15011f 100644 --- a/board/mpl/pip405/u-boot.lds.debug +++ b/board/mpl/pip405/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds index fc6b123..b4cc3ff 100644 --- a/board/netphone/u-boot.lds +++ b/board/netphone/u-boot.lds @@ -58,5 +58,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug index d47c408..8eaa915 100644 --- a/board/netphone/u-boot.lds.debug +++ b/board/netphone/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/netstar/Makefile b/board/netstar/Makefile index 91bac38..9646498 100644 --- a/board/netstar/Makefile +++ b/board/netstar/Makefile @@ -56,3 +56,3 @@ $(obj)eeprom.srec: $(obj)eeprom.o $(obj)eeprom_start.o -L$(obj)../../examples -lstubs \ - -L$(obj)../../lib_generic -lgeneric \ + -L$(obj)../../lib/generic -lgeneric \ -L$(gcclibdir) -lgcc @@ -77,3 +77,3 @@ $(obj)crcit.o: crcit.c
-$(obj)crc32.o: $(SRCTREE)/lib_generic/crc32.c +$(obj)crc32.o: $(SRCTREE)/lib/generic/crc32.c $(HOSTCC) $(HOST_CFLAGS) -DUSE_HOSTCC -o $@ -c $< diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds index 2e060ba..12db4c3 100644 --- a/board/netta/u-boot.lds +++ b/board/netta/u-boot.lds @@ -58,5 +58,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug index d47c408..8eaa915 100644 --- a/board/netta/u-boot.lds.debug +++ b/board/netta/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds index 2e060ba..12db4c3 100644 --- a/board/netta2/u-boot.lds +++ b/board/netta2/u-boot.lds @@ -58,5 +58,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug index d47c408..8eaa915 100644 --- a/board/netta2/u-boot.lds.debug +++ b/board/netta2/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds index 3af9e85..3d4f77d 100644 --- a/board/netvia/u-boot.lds +++ b/board/netvia/u-boot.lds @@ -58,5 +58,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug index 9210c43..60629b3 100644 --- a/board/netvia/u-boot.lds.debug +++ b/board/netvia/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug index dbec986..28d541f 100644 --- a/board/nx823/u-boot.lds.debug +++ b/board/nx823/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/pcs440ep/u-boot.lds b/board/pcs440ep/u-boot.lds index a4c537e..d050b4d 100644 --- a/board/pcs440ep/u-boot.lds +++ b/board/pcs440ep/u-boot.lds @@ -66,3 +66,3 @@ SECTIONS board/pcs440ep/init.o (.text) - lib_generic/sha1.o (.text) + lib/generic/sha1.o (.text)
diff --git a/board/pm854/u-boot.lds b/board/pm854/u-boot.lds index 11e7785..0869d3f 100644 --- a/board/pm854/u-boot.lds +++ b/board/pm854/u-boot.lds @@ -72,5 +72,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/pm856/u-boot.lds b/board/pm856/u-boot.lds index 19fa083..4815b3b 100644 --- a/board/pm856/u-boot.lds +++ b/board/pm856/u-boot.lds @@ -72,5 +72,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/purple/u-boot.lds b/board/purple/u-boot.lds index 04a641a..9dc0ce8 100644 --- a/board/purple/u-boot.lds +++ b/board/purple/u-boot.lds @@ -42,3 +42,3 @@ SECTIONS common/cmd_boot.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) . = DEFINED(env_offset) ? env_offset : .; diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds index dd5b607..d2ec27c 100644 --- a/board/quantum/u-boot.lds +++ b/board/quantum/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) /* XXX ? diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug index 016048d..a52c06f 100644 --- a/board/quantum/u-boot.lds.debug +++ b/board/quantum/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds index bfdfffa..1b0567a 100644 --- a/board/rbc823/u-boot.lds +++ b/board/rbc823/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds index dd5b607..d2ec27c 100644 --- a/board/rmu/u-boot.lds +++ b/board/rmu/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) /* XXX ? diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug index 016048d..a52c06f 100644 --- a/board/rmu/u-boot.lds.debug +++ b/board/rmu/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/sandburst/karef/u-boot.lds b/board/sandburst/karef/u-boot.lds index f157d17..264db8f 100644 --- a/board/sandburst/karef/u-boot.lds +++ b/board/sandburst/karef/u-boot.lds @@ -78,5 +78,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug index 97b3a80..653a7f4 100644 --- a/board/sandburst/karef/u-boot.lds.debug +++ b/board/sandburst/karef/u-boot.lds.debug @@ -68,5 +68,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/sandburst/metrobox/u-boot.lds b/board/sandburst/metrobox/u-boot.lds index 7bd3ca4..134d697 100644 --- a/board/sandburst/metrobox/u-boot.lds +++ b/board/sandburst/metrobox/u-boot.lds @@ -78,5 +78,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug index 0d2674d..88fcfce 100644 --- a/board/sandburst/metrobox/u-boot.lds.debug +++ b/board/sandburst/metrobox/u-boot.lds.debug @@ -68,5 +68,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/sbc405/u-boot.lds b/board/sbc405/u-boot.lds index 36d128b..7407290 100644 --- a/board/sbc405/u-boot.lds +++ b/board/sbc405/u-boot.lds @@ -70,5 +70,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/sbc8548/u-boot.lds b/board/sbc8548/u-boot.lds index 8cd87a6..79bf39f 100644 --- a/board/sbc8548/u-boot.lds +++ b/board/sbc8548/u-boot.lds @@ -71,5 +71,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/sbc8560/u-boot.lds b/board/sbc8560/u-boot.lds index 41e2b6f..a13970c 100644 --- a/board/sbc8560/u-boot.lds +++ b/board/sbc8560/u-boot.lds @@ -77,5 +77,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds index 2a5baa7..c593ae3 100644 --- a/board/sbc8641d/u-boot.lds +++ b/board/sbc8641d/u-boot.lds @@ -59,5 +59,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds index 9e8213c..db7ad16 100644 --- a/board/sc3/u-boot.lds +++ b/board/sc3/u-boot.lds @@ -71,5 +71,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds index b72e021..27ce175 100644 --- a/board/siemens/CCM/u-boot.lds +++ b/board/siemens/CCM/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug index 88dbd38..e6bf91c 100644 --- a/board/siemens/CCM/u-boot.lds.debug +++ b/board/siemens/CCM/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) /* diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug index c035d63..fd7ef72 100644 --- a/board/siemens/pcu_e/u-boot.lds.debug +++ b/board/siemens/pcu_e/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds index d9e329d..4676cc0 100644 --- a/board/snmc/qs850/u-boot.lds +++ b/board/snmc/qs850/u-boot.lds @@ -61,5 +61,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds index d9e329d..4676cc0 100644 --- a/board/snmc/qs860t/u-boot.lds +++ b/board/snmc/qs860t/u-boot.lds @@ -61,5 +61,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/socrates/u-boot.lds b/board/socrates/u-boot.lds index 8f33d44..b0aada8 100644 --- a/board/socrates/u-boot.lds +++ b/board/socrates/u-boot.lds @@ -75,5 +75,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds index caf1f08..5550c34 100644 --- a/board/spc1920/u-boot.lds +++ b/board/spc1920/u-boot.lds @@ -61,5 +61,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug index 515296b..87238ec 100644 --- a/board/spd8xx/u-boot.lds.debug +++ b/board/spd8xx/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/stxgp3/u-boot.lds b/board/stxgp3/u-boot.lds index 6ff1629..ce162a2 100644 --- a/board/stxgp3/u-boot.lds +++ b/board/stxgp3/u-boot.lds @@ -79,5 +79,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/stxssa/u-boot.lds b/board/stxssa/u-boot.lds index 3e25716..e7dff91 100644 --- a/board/stxssa/u-boot.lds +++ b/board/stxssa/u-boot.lds @@ -79,5 +79,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/stxxtc/u-boot.lds b/board/stxxtc/u-boot.lds index 2e060ba..12db4c3 100644 --- a/board/stxxtc/u-boot.lds +++ b/board/stxxtc/u-boot.lds @@ -58,5 +58,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/stxxtc/u-boot.lds.debug b/board/stxxtc/u-boot.lds.debug index d47c408..8eaa915 100644 --- a/board/stxxtc/u-boot.lds.debug +++ b/board/stxxtc/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds index 145541a..660b234 100644 --- a/board/svm_sc8xx/u-boot.lds +++ b/board/svm_sc8xx/u-boot.lds @@ -61,5 +61,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug index 016048d..a52c06f 100644 --- a/board/svm_sc8xx/u-boot.lds.debug +++ b/board/svm_sc8xx/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/tcm-bf537/config.mk b/board/tcm-bf537/config.mk index 3c0b46f..bf87ab9 100644 --- a/board/tcm-bf537/config.mk +++ b/board/tcm-bf537/config.mk @@ -28,3 +28,3 @@
-CFLAGS_lib_generic += -O2 +CFLAGS_generic += -O2 CFLAGS_lzma += -O2 diff --git a/board/tqc/tqm85xx/u-boot.lds b/board/tqc/tqm85xx/u-boot.lds index 666abf5..7961cb9 100644 --- a/board/tqc/tqm85xx/u-boot.lds +++ b/board/tqc/tqm85xx/u-boot.lds @@ -72,5 +72,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds index e63f593..f9e2a1f 100644 --- a/board/tqc/tqm8xx/u-boot.lds +++ b/board/tqc/tqm8xx/u-boot.lds @@ -61,5 +61,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug index ea85389..33813dc 100644 --- a/board/tqc/tqm8xx/u-boot.lds.debug +++ b/board/tqc/tqm8xx/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/trab/Makefile b/board/trab/Makefile index 9233f49..4897a09 100644 --- a/board/trab/Makefile +++ b/board/trab/Makefile @@ -52,3 +52,3 @@ $(obj)trab_fkt.srec: $(OBJS_FKT) $(LIB) -L$(obj)../../examples -lstubs \ - -L$(obj)../../lib_generic -lgeneric \ + -L$(obj)../../lib/generic -lgeneric \ $(obj)../../lib/arm/div0.o \ diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds index 2e0e721..5768f82 100644 --- a/board/trab/u-boot.lds +++ b/board/trab/u-boot.lds @@ -36,5 +36,5 @@ SECTIONS lib/arm/_umodsi3.o (.text) - lib_generic/zlib.o (.text) - lib_generic/crc32.o (.text) - lib_generic/string.o (.text) + lib/generic/zlib.o (.text) + lib/generic/crc32.o (.text) + lib/generic/string.o (.text)
diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds index 3ab0eb0..ddc6320 100644 --- a/board/uc100/u-boot.lds +++ b/board/uc100/u-boot.lds @@ -61,5 +61,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/uc100/u-boot.lds.debug b/board/uc100/u-boot.lds.debug index 5750657..b511542 100644 --- a/board/uc100/u-boot.lds.debug +++ b/board/uc100/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text)
diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds index b9407b6..1ef4811 100644 --- a/board/v37/u-boot.lds +++ b/board/v37/u-boot.lds @@ -61,5 +61,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text) lib/ppc/cache.o (.text) diff --git a/board/voiceblue/Makefile b/board/voiceblue/Makefile index e7c1cbb..e579093 100644 --- a/board/voiceblue/Makefile +++ b/board/voiceblue/Makefile @@ -50,3 +50,3 @@ $(obj)eeprom.srec: $(obj)eeprom.o $(obj)eeprom_start.o -L$(obj)../../examples -lstubs \ - -L$(obj)../../lib_generic -lgeneric \ + -L$(obj)../../lib/generic -lgeneric \ -L$(gcclibdir) -lgcc diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug index 403c29a..57ea485 100644 --- a/board/w7o/u-boot.lds.debug +++ b/board/w7o/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds index b72e021..27ce175 100644 --- a/board/westel/amx860/u-boot.lds +++ b/board/westel/amx860/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS lib/ppc/ppcstring.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) - lib_generic/zlib.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug index 23e5c46..b8e9478 100644 --- a/board/westel/amx860/u-boot.lds.debug +++ b/board/westel/amx860/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds index b65a68d..aa3ecdf 100644 --- a/board/xes/xpedite5170/u-boot.lds +++ b/board/xes/xpedite5170/u-boot.lds @@ -59,5 +59,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) *(.text) diff --git a/board/xilinx/ml300/u-boot.lds b/board/xilinx/ml300/u-boot.lds index d77cd49..771d088 100644 --- a/board/xilinx/ml300/u-boot.lds +++ b/board/xilinx/ml300/u-boot.lds @@ -68,5 +68,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text) */ diff --git a/board/xilinx/ml300/u-boot.lds.debug b/board/xilinx/ml300/u-boot.lds.debug index f753355..f15011f 100644 --- a/board/xilinx/ml300/u-boot.lds.debug +++ b/board/xilinx/ml300/u-boot.lds.debug @@ -59,4 +59,4 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/vsprintf.o (.text) - lib_generic/crc32.o (.text) + lib/generic/vsprintf.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) diff --git a/board/xpedite1k/u-boot.lds b/board/xpedite1k/u-boot.lds index 19814df..c852186 100644 --- a/board/xpedite1k/u-boot.lds +++ b/board/xpedite1k/u-boot.lds @@ -76,5 +76,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/board/xpedite1k/u-boot.lds.debug b/board/xpedite1k/u-boot.lds.debug index f7ddf62..48c506f 100644 --- a/board/xpedite1k/u-boot.lds.debug +++ b/board/xpedite1k/u-boot.lds.debug @@ -66,5 +66,5 @@ SECTIONS common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/extable.o (.text) - lib_generic/zlib.o (.text) + lib/generic/zlib.o (.text)
diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds index cd37491..67dcc6b 100644 --- a/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/cpu/mpc5xxx/u-boot-customlayout.lds @@ -59,3 +59,3 @@ SECTIONS cpu/mpc5xxx/traps.o (.text) - lib_generic/crc32.o (.text) + lib/generic/crc32.o (.text) lib/ppc/cache.o (.text) diff --git a/include/common.h b/include/common.h index 703775e..a301d36 100644 --- a/include/common.h +++ b/include/common.h @@ -606,3 +606,3 @@ int init_timebase (void);
-/* lib_generic/vsprintf.c */ +/* lib/generic/vsprintf.c */ ulong simple_strtoul(const char *cp,char **endp,unsigned int base); @@ -618,6 +618,6 @@ int vsprintf(char *buf, const char *fmt, va_list args);
-/* lib_generic/strmhz.c */ +/* lib/generic/strmhz.c */ char * strmhz(char *buf, long hz);
-/* lib_generic/crc32.c */ +/* lib/generic/crc32.c */ uint32_t crc32 (uint32_t, const unsigned char *, uint); diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index c03561c..df37a1a 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -130,3 +130,3 @@ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/generic/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index 0f908ef..9b70013 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -118,3 +118,3 @@ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/generic/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 0a86e83..85e1c6b 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -128,3 +128,3 @@ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/generic/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index 535687f..0c97233 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -124,3 +124,3 @@ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/generic/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h index 4779a97..d516180 100644 --- a/include/configs/bf561-ezkit.h +++ b/include/configs/bf561-ezkit.h @@ -101,4 +101,4 @@ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ - lib_generic/zlib.o (.text .text.*); \ + lib/generic/crc32.o (.text .text.*); \ + lib/generic/zlib.o (.text .text.*); \ board/bf561-ezkit/bf561-ezkit.o (.text .text.*); \ diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 021b631..66b4ec9 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -107,3 +107,3 @@ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/generic/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h index 066859f..568407d 100644 --- a/include/configs/ibf-dsp561.h +++ b/include/configs/ibf-dsp561.h @@ -90,4 +90,4 @@ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ - lib_generic/zlib.o (.text .text.*); \ + lib/generic/crc32.o (.text .text.*); \ + lib/generic/zlib.o (.text .text.*); \ board/ibf-dsp561/ibf-dsp561.o (.text .text.*); \ diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index 9794e1b..59ebb8d 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -108,3 +108,3 @@ common/dlmalloc.o (.text .text.*); \ - lib_generic/crc32.o (.text .text.*); \ + lib/generic/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \ diff --git a/include/lzma/LzmaDecode.h b/include/lzma/LzmaDecode.h index 8fdb2c0..188265c 100644 --- a/include/lzma/LzmaDecode.h +++ b/include/lzma/LzmaDecode.h @@ -28,3 +28,3 @@
-#include "../../lib_generic/lzma/LzmaDecode.h" +#include "../../lib/generic/lzma/LzmaDecode.h"
diff --git a/include/lzma/LzmaTools.h b/include/lzma/LzmaTools.h index 7c5eea1..5133774 100644 --- a/include/lzma/LzmaTools.h +++ b/include/lzma/LzmaTools.h @@ -28,3 +28,3 @@
-#include "../../lib_generic/lzma/LzmaTools.h" +#include "../../lib/generic/lzma/LzmaTools.h"
diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h index 02daa59..855b34b 100644 --- a/include/lzma/LzmaTypes.h +++ b/include/lzma/LzmaTypes.h @@ -28,3 +28,3 @@
-#include "../../lib_generic/lzma/LzmaTypes.h" +#include "../../lib/generic/lzma/LzmaTypes.h"
diff --git a/lib_generic/Makefile b/lib/generic/Makefile similarity index 100% rename from lib_generic/Makefile rename to lib/generic/Makefile diff --git a/lib_generic/addr_map.c b/lib/generic/addr_map.c similarity index 100% rename from lib_generic/addr_map.c rename to lib/generic/addr_map.c diff --git a/lib_generic/bzlib.c b/lib/generic/bzlib.c similarity index 100% rename from lib_generic/bzlib.c rename to lib/generic/bzlib.c diff --git a/lib_generic/bzlib_crctable.c b/lib/generic/bzlib_crctable.c similarity index 100% rename from lib_generic/bzlib_crctable.c rename to lib/generic/bzlib_crctable.c diff --git a/lib_generic/bzlib_decompress.c b/lib/generic/bzlib_decompress.c similarity index 100% rename from lib_generic/bzlib_decompress.c rename to lib/generic/bzlib_decompress.c diff --git a/lib_generic/bzlib_huffman.c b/lib/generic/bzlib_huffman.c similarity index 100% rename from lib_generic/bzlib_huffman.c rename to lib/generic/bzlib_huffman.c diff --git a/lib_generic/bzlib_private.h b/lib/generic/bzlib_private.h similarity index 100% rename from lib_generic/bzlib_private.h rename to lib/generic/bzlib_private.h diff --git a/lib_generic/bzlib_randtable.c b/lib/generic/bzlib_randtable.c similarity index 100% rename from lib_generic/bzlib_randtable.c rename to lib/generic/bzlib_randtable.c diff --git a/lib_generic/crc16.c b/lib/generic/crc16.c similarity index 100% rename from lib_generic/crc16.c rename to lib/generic/crc16.c diff --git a/lib_generic/crc32.c b/lib/generic/crc32.c similarity index 100% rename from lib_generic/crc32.c rename to lib/generic/crc32.c diff --git a/lib_generic/ctype.c b/lib/generic/ctype.c similarity index 100% rename from lib_generic/ctype.c rename to lib/generic/ctype.c diff --git a/lib_generic/display_options.c b/lib/generic/display_options.c similarity index 100% rename from lib_generic/display_options.c rename to lib/generic/display_options.c diff --git a/lib_generic/div64.c b/lib/generic/div64.c similarity index 100% rename from lib_generic/div64.c rename to lib/generic/div64.c diff --git a/lib_generic/gunzip.c b/lib/generic/gunzip.c similarity index 100% rename from lib_generic/gunzip.c rename to lib/generic/gunzip.c diff --git a/lib_generic/ldiv.c b/lib/generic/ldiv.c similarity index 100% rename from lib_generic/ldiv.c rename to lib/generic/ldiv.c diff --git a/lib_generic/lmb.c b/lib/generic/lmb.c similarity index 100% rename from lib_generic/lmb.c rename to lib/generic/lmb.c diff --git a/lib_generic/lzma/LGPL.txt b/lib/generic/lzma/LGPL.txt similarity index 100% rename from lib_generic/lzma/LGPL.txt rename to lib/generic/lzma/LGPL.txt diff --git a/lib_generic/lzma/LzmaDecode.c b/lib/generic/lzma/LzmaDecode.c similarity index 100% rename from lib_generic/lzma/LzmaDecode.c rename to lib/generic/lzma/LzmaDecode.c diff --git a/lib_generic/lzma/LzmaDecode.h b/lib/generic/lzma/LzmaDecode.h similarity index 100% rename from lib_generic/lzma/LzmaDecode.h rename to lib/generic/lzma/LzmaDecode.h diff --git a/lib_generic/lzma/LzmaTools.c b/lib/generic/lzma/LzmaTools.c similarity index 100% rename from lib_generic/lzma/LzmaTools.c rename to lib/generic/lzma/LzmaTools.c diff --git a/lib_generic/lzma/LzmaTools.h b/lib/generic/lzma/LzmaTools.h similarity index 100% rename from lib_generic/lzma/LzmaTools.h rename to lib/generic/lzma/LzmaTools.h diff --git a/lib_generic/lzma/LzmaTypes.h b/lib/generic/lzma/LzmaTypes.h similarity index 100% rename from lib_generic/lzma/LzmaTypes.h rename to lib/generic/lzma/LzmaTypes.h diff --git a/lib_generic/lzma/Makefile b/lib/generic/lzma/Makefile similarity index 100% rename from lib_generic/lzma/Makefile rename to lib/generic/lzma/Makefile diff --git a/lib_generic/lzma/README.txt b/lib/generic/lzma/README.txt similarity index 100% rename from lib_generic/lzma/README.txt rename to lib/generic/lzma/README.txt diff --git a/lib_generic/lzma/history.txt b/lib/generic/lzma/history.txt similarity index 100% rename from lib_generic/lzma/history.txt rename to lib/generic/lzma/history.txt diff --git a/lib_generic/lzma/import_lzmasdk.sh b/lib/generic/lzma/import_lzmasdk.sh similarity index 100% rename from lib_generic/lzma/import_lzmasdk.sh rename to lib/generic/lzma/import_lzmasdk.sh diff --git a/lib_generic/lzma/lzma.txt b/lib/generic/lzma/lzma.txt similarity index 100% rename from lib_generic/lzma/lzma.txt rename to lib/generic/lzma/lzma.txt diff --git a/lib_generic/lzo/Makefile b/lib/generic/lzo/Makefile similarity index 100% rename from lib_generic/lzo/Makefile rename to lib/generic/lzo/Makefile diff --git a/lib_generic/lzo/lzo1x_decompress.c b/lib/generic/lzo/lzo1x_decompress.c similarity index 100% rename from lib_generic/lzo/lzo1x_decompress.c rename to lib/generic/lzo/lzo1x_decompress.c diff --git a/lib_generic/lzo/lzodefs.h b/lib/generic/lzo/lzodefs.h similarity index 100% rename from lib_generic/lzo/lzodefs.h rename to lib/generic/lzo/lzodefs.h diff --git a/lib_generic/md5.c b/lib/generic/md5.c similarity index 100% rename from lib_generic/md5.c rename to lib/generic/md5.c diff --git a/lib_generic/rbtree.c b/lib/generic/rbtree.c similarity index 100% rename from lib_generic/rbtree.c rename to lib/generic/rbtree.c diff --git a/lib_generic/sha1.c b/lib/generic/sha1.c similarity index 100% rename from lib_generic/sha1.c rename to lib/generic/sha1.c diff --git a/lib_generic/sha256.c b/lib/generic/sha256.c similarity index 100% rename from lib_generic/sha256.c rename to lib/generic/sha256.c diff --git a/lib_generic/string.c b/lib/generic/string.c similarity index 100% rename from lib_generic/string.c rename to lib/generic/string.c diff --git a/lib_generic/strmhz.c b/lib/generic/strmhz.c similarity index 100% rename from lib_generic/strmhz.c rename to lib/generic/strmhz.c diff --git a/lib_generic/vsprintf.c b/lib/generic/vsprintf.c similarity index 100% rename from lib_generic/vsprintf.c rename to lib/generic/vsprintf.c diff --git a/lib_generic/zlib.c b/lib/generic/zlib.c similarity index 100% rename from lib_generic/zlib.c rename to lib/generic/zlib.c diff --git a/tools/Makefile b/tools/Makefile index 43c284c..c9af71f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -83,5 +83,5 @@ BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX) EXT_OBJ_FILES-y += common/env_embedded.o -EXT_OBJ_FILES-y += lib_generic/crc32.o -EXT_OBJ_FILES-y += lib_generic/md5.o -EXT_OBJ_FILES-y += lib_generic/sha1.o +EXT_OBJ_FILES-y += lib/generic/crc32.o +EXT_OBJ_FILES-y += lib/generic/md5.o +EXT_OBJ_FILES-y += lib/generic/sha1.o EXT_OBJ_FILES-y += common/image.o @@ -211,3 +211,3 @@ $(obj)%.o: $(SRCTREE)/common/%.c
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c +$(obj)%.o: $(SRCTREE)/lib/generic/%.c $(CC) -g $(CFLAGS) -c -o $@ $< diff --git a/tools/env/Makefile b/tools/env/Makefile index 9629ee5..da6bef6 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -43,3 +43,3 @@ clean: $(obj)crc32.c: - ln -s $(src)../../lib_generic/crc32.c $(obj)crc32.c + ln -s $(src)../../lib/generic/crc32.c $(obj)crc32.c
diff --git a/tools/imls/Makefile b/tools/imls/Makefile index 04ab31a..fa48501 100644 --- a/tools/imls/Makefile +++ b/tools/imls/Makefile @@ -27,5 +27,5 @@ BIN_FILES-y += imls # Source files which exist outside the tools/imls directory -EXT_OBJ_FILES-y += lib_generic/crc32.o -EXT_OBJ_FILES-y += lib_generic/md5.o -EXT_OBJ_FILES-y += lib_generic/sha1.o +EXT_OBJ_FILES-y += lib/generic/crc32.o +EXT_OBJ_FILES-y += lib/generic/md5.o +EXT_OBJ_FILES-y += lib/generic/sha1.o EXT_OBJ_FILES-y += common/image.o @@ -89,3 +89,3 @@ $(obj)%.o: $(SRCTREE)/common/%.c
-$(obj)%.o: $(SRCTREE)/lib_generic/%.c +$(obj)%.o: $(SRCTREE)/lib/generic/%.c $(CC) -g $(CFLAGS) -c -o $@ $<
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 2 +- {libfdt => lib/libfdt}/Makefile | 0 {libfdt => lib/libfdt}/README | 0 {libfdt => lib/libfdt}/fdt.c | 0 {libfdt => lib/libfdt}/fdt_ro.c | 0 {libfdt => lib/libfdt}/fdt_rw.c | 0 {libfdt => lib/libfdt}/fdt_strerror.c | 0 {libfdt => lib/libfdt}/fdt_sw.c | 0 {libfdt => lib/libfdt}/fdt_wip.c | 0 {libfdt => lib/libfdt}/libfdt_internal.h | 0 tools/Makefile | 4 ++-- tools/imls/Makefile | 6 +++--- 12 files changed, 6 insertions(+), 6 deletions(-) rename {libfdt => lib/libfdt}/Makefile (100%) rename {libfdt => lib/libfdt}/README (100%) rename {libfdt => lib/libfdt}/fdt.c (100%) rename {libfdt => lib/libfdt}/fdt_ro.c (100%) rename {libfdt => lib/libfdt}/fdt_rw.c (100%) rename {libfdt => lib/libfdt}/fdt_strerror.c (100%) rename {libfdt => lib/libfdt}/fdt_sw.c (100%) rename {libfdt => lib/libfdt}/fdt_wip.c (100%) rename {libfdt => lib/libfdt}/libfdt_internal.h (100%)
diff --git a/Makefile b/Makefile index d52b586..ee3b6bf 100644 --- a/Makefile +++ b/Makefile @@ -279,3 +279,3 @@ LIBS += drivers/watchdog/libwatchdog.a LIBS += common/libcommon.a -LIBS += libfdt/libfdt.a +LIBS += lib/libfdt/libfdt.a LIBS += api/libapi.a diff --git a/libfdt/Makefile b/lib/libfdt/Makefile similarity index 100% rename from libfdt/Makefile rename to lib/libfdt/Makefile diff --git a/libfdt/README b/lib/libfdt/README similarity index 100% rename from libfdt/README rename to lib/libfdt/README diff --git a/libfdt/fdt.c b/lib/libfdt/fdt.c similarity index 100% rename from libfdt/fdt.c rename to lib/libfdt/fdt.c diff --git a/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c similarity index 100% rename from libfdt/fdt_ro.c rename to lib/libfdt/fdt_ro.c diff --git a/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c similarity index 100% rename from libfdt/fdt_rw.c rename to lib/libfdt/fdt_rw.c diff --git a/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c similarity index 100% rename from libfdt/fdt_strerror.c rename to lib/libfdt/fdt_strerror.c diff --git a/libfdt/fdt_sw.c b/lib/libfdt/fdt_sw.c similarity index 100% rename from libfdt/fdt_sw.c rename to lib/libfdt/fdt_sw.c diff --git a/libfdt/fdt_wip.c b/lib/libfdt/fdt_wip.c similarity index 100% rename from libfdt/fdt_wip.c rename to lib/libfdt/fdt_wip.c diff --git a/libfdt/libfdt_internal.h b/lib/libfdt/libfdt_internal.h similarity index 100% rename from libfdt/libfdt_internal.h rename to lib/libfdt/libfdt_internal.h diff --git a/tools/Makefile b/tools/Makefile index c9af71f..7c03fc5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -131,3 +131,3 @@ SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c)) SRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c)) -SRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) +SRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y))) @@ -142,3 +142,3 @@ CPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include \ - -I $(SRCTREE)/libfdt \ + -I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/tools \ diff --git a/tools/imls/Makefile b/tools/imls/Makefile index fa48501..1ec037c 100644 --- a/tools/imls/Makefile +++ b/tools/imls/Makefile @@ -45,3 +45,3 @@ SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c)) SRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c)) -SRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) +SRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c)) BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y))) @@ -56,3 +56,3 @@ CPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include \ - -I $(SRCTREE)/libfdt \ + -I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/tools \ @@ -92,3 +92,3 @@ $(obj)%.o: $(SRCTREE)/lib/generic/%.c
-$(obj)%.o: $(SRCTREE)/libfdt/%.c +$(obj)%.o: $(SRCTREE)/lib/libfdt/%.c $(CC) -g $(FIT_CFLAGS) -c -o $@ $<
The current files in examples are all standalone application examples, so put them in their own subdirectory for organizational purposes
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 16 ++++++++++------ examples/{ => standalone}/.gitignore | 0 examples/{ => standalone}/82559_eeprom.c | 0 examples/{ => standalone}/Makefile | 0 examples/{ => standalone}/README.smc91111_eeprom | 0 examples/{ => standalone}/eepro100_eeprom.c | 0 examples/{ => standalone}/hello_world.c | 0 examples/{ => standalone}/interrupt.c | 0 examples/{ => standalone}/mem_to_mem_idma2intr.c | 0 examples/{ => standalone}/mips.lds | 0 examples/{ => standalone}/nios.lds | 0 examples/{ => standalone}/nios2.lds | 0 examples/{ => standalone}/ppc_longjmp.S | 0 examples/{ => standalone}/ppc_setjmp.S | 0 examples/{ => standalone}/sched.c | 0 examples/{ => standalone}/smc91111_eeprom.c | 0 examples/{ => standalone}/smc911x_eeprom.c | 0 examples/{ => standalone}/sparc.lds | 0 examples/{ => standalone}/stubs.c | 0 examples/{ => standalone}/test_burst.c | 0 examples/{ => standalone}/test_burst.h | 0 examples/{ => standalone}/test_burst_lib.S | 0 examples/{ => standalone}/timer.c | 0 examples/{ => standalone}/x86-testapp.c | 0 24 files changed, 10 insertions(+), 6 deletions(-) rename examples/{ => standalone}/.gitignore (100%) rename examples/{ => standalone}/82559_eeprom.c (100%) rename examples/{ => standalone}/Makefile (100%) rename examples/{ => standalone}/README.smc91111_eeprom (100%) rename examples/{ => standalone}/eepro100_eeprom.c (100%) rename examples/{ => standalone}/hello_world.c (100%) rename examples/{ => standalone}/interrupt.c (100%) rename examples/{ => standalone}/mem_to_mem_idma2intr.c (100%) rename examples/{ => standalone}/mips.lds (100%) rename examples/{ => standalone}/nios.lds (100%) rename examples/{ => standalone}/nios2.lds (100%) rename examples/{ => standalone}/ppc_longjmp.S (100%) rename examples/{ => standalone}/ppc_setjmp.S (100%) rename examples/{ => standalone}/sched.c (100%) rename examples/{ => standalone}/smc91111_eeprom.c (100%) rename examples/{ => standalone}/smc911x_eeprom.c (100%) rename examples/{ => standalone}/sparc.lds (100%) rename examples/{ => standalone}/stubs.c (100%) rename examples/{ => standalone}/test_burst.c (100%) rename examples/{ => standalone}/test_burst.h (100%) rename examples/{ => standalone}/test_burst_lib.S (100%) rename examples/{ => standalone}/timer.c (100%) rename examples/{ => standalone}/x86-testapp.c (100%)
diff --git a/Makefile b/Makefile index ee3b6bf..c143d66 100644 --- a/Makefile +++ b/Makefile @@ -142,3 +142,3 @@ endif SUBDIRS = tools \ - examples \ + examples/standalone \ api_examples @@ -3589,7 +3589,11 @@ grsim_leon2_config : unconfig clean: - @rm -f $(obj)examples/82559_eeprom $(obj)examples/eepro100_eeprom \ - $(obj)examples/hello_world $(obj)examples/interrupt \ - $(obj)examples/mem_to_mem_idma2intr \ - $(obj)examples/sched $(obj)examples/smc91111_eeprom \ - $(obj)examples/test_burst $(obj)examples/timer + @rm -f $(obj)examples/standalone/82559_eeprom \ + $(obj)examples/standalone/eepro100_eeprom \ + $(obj)examples/standalone/hello_world \ + $(obj)examples/standalone/interrupt \ + $(obj)examples/standalone/mem_to_mem_idma2intr \ + $(obj)examples/standalone/sched \ + $(obj)examples/standalone/smc91111_eeprom \ + $(obj)examples/standalone/test_burst \ + $(obj)examples/standalone/timer @rm -f $(obj)tools/bmp_logo $(obj)tools/easylogo/easylogo \ diff --git a/examples/.gitignore b/examples/standalone/.gitignore similarity index 100% rename from examples/.gitignore rename to examples/standalone/.gitignore diff --git a/examples/82559_eeprom.c b/examples/standalone/82559_eeprom.c similarity index 100% rename from examples/82559_eeprom.c rename to examples/standalone/82559_eeprom.c diff --git a/examples/Makefile b/examples/standalone/Makefile similarity index 100% rename from examples/Makefile rename to examples/standalone/Makefile diff --git a/examples/README.smc91111_eeprom b/examples/standalone/README.smc91111_eeprom similarity index 100% rename from examples/README.smc91111_eeprom rename to examples/standalone/README.smc91111_eeprom diff --git a/examples/eepro100_eeprom.c b/examples/standalone/eepro100_eeprom.c similarity index 100% rename from examples/eepro100_eeprom.c rename to examples/standalone/eepro100_eeprom.c diff --git a/examples/hello_world.c b/examples/standalone/hello_world.c similarity index 100% rename from examples/hello_world.c rename to examples/standalone/hello_world.c diff --git a/examples/interrupt.c b/examples/standalone/interrupt.c similarity index 100% rename from examples/interrupt.c rename to examples/standalone/interrupt.c diff --git a/examples/mem_to_mem_idma2intr.c b/examples/standalone/mem_to_mem_idma2intr.c similarity index 100% rename from examples/mem_to_mem_idma2intr.c rename to examples/standalone/mem_to_mem_idma2intr.c diff --git a/examples/mips.lds b/examples/standalone/mips.lds similarity index 100% rename from examples/mips.lds rename to examples/standalone/mips.lds diff --git a/examples/nios.lds b/examples/standalone/nios.lds similarity index 100% rename from examples/nios.lds rename to examples/standalone/nios.lds diff --git a/examples/nios2.lds b/examples/standalone/nios2.lds similarity index 100% rename from examples/nios2.lds rename to examples/standalone/nios2.lds diff --git a/examples/ppc_longjmp.S b/examples/standalone/ppc_longjmp.S similarity index 100% rename from examples/ppc_longjmp.S rename to examples/standalone/ppc_longjmp.S diff --git a/examples/ppc_setjmp.S b/examples/standalone/ppc_setjmp.S similarity index 100% rename from examples/ppc_setjmp.S rename to examples/standalone/ppc_setjmp.S diff --git a/examples/sched.c b/examples/standalone/sched.c similarity index 100% rename from examples/sched.c rename to examples/standalone/sched.c diff --git a/examples/smc91111_eeprom.c b/examples/standalone/smc91111_eeprom.c similarity index 100% rename from examples/smc91111_eeprom.c rename to examples/standalone/smc91111_eeprom.c diff --git a/examples/smc911x_eeprom.c b/examples/standalone/smc911x_eeprom.c similarity index 100% rename from examples/smc911x_eeprom.c rename to examples/standalone/smc911x_eeprom.c diff --git a/examples/sparc.lds b/examples/standalone/sparc.lds similarity index 100% rename from examples/sparc.lds rename to examples/standalone/sparc.lds diff --git a/examples/stubs.c b/examples/standalone/stubs.c similarity index 100% rename from examples/stubs.c rename to examples/standalone/stubs.c diff --git a/examples/test_burst.c b/examples/standalone/test_burst.c similarity index 100% rename from examples/test_burst.c rename to examples/standalone/test_burst.c diff --git a/examples/test_burst.h b/examples/standalone/test_burst.h similarity index 100% rename from examples/test_burst.h rename to examples/standalone/test_burst.h diff --git a/examples/test_burst_lib.S b/examples/standalone/test_burst_lib.S similarity index 100% rename from examples/test_burst_lib.S rename to examples/standalone/test_burst_lib.S diff --git a/examples/timer.c b/examples/standalone/timer.c similarity index 100% rename from examples/timer.c rename to examples/standalone/timer.c diff --git a/examples/x86-testapp.c b/examples/standalone/x86-testapp.c similarity index 100% rename from examples/x86-testapp.c rename to examples/standalone/x86-testapp.c
On Friday 10 July 2009 12:03:19 Peter Tyser wrote:
The current files in examples are all standalone application examples, so put them in their own subdirectory for organizational purposes
semi-related to your change, i wonder if it's appropriate to continue keeping applications that arent really examples here. the eeprom helpers are designed to get real work done, not really to show off the standalone api. -mike
Dear Peter Tyser,
In message 1247241800-29059-6-git-send-email-ptyser@xes-inc.com you wrote:
The current files in examples are all standalone application examples, so put them in their own subdirectory for organizational purposes
Signed-off-by: Peter Tyser ptyser@xes-inc.com
Makefile | 16 ++++++++++------ examples/{ => standalone}/.gitignore | 0 examples/{ => standalone}/82559_eeprom.c | 0 examples/{ => standalone}/Makefile | 0 examples/{ => standalone}/README.smc91111_eeprom | 0 examples/{ => standalone}/eepro100_eeprom.c | 0 examples/{ => standalone}/hello_world.c | 0 examples/{ => standalone}/interrupt.c | 0 examples/{ => standalone}/mem_to_mem_idma2intr.c | 0 examples/{ => standalone}/mips.lds | 0 examples/{ => standalone}/nios.lds | 0 examples/{ => standalone}/nios2.lds | 0 examples/{ => standalone}/ppc_longjmp.S | 0 examples/{ => standalone}/ppc_setjmp.S | 0 examples/{ => standalone}/sched.c | 0 examples/{ => standalone}/smc91111_eeprom.c | 0 examples/{ => standalone}/smc911x_eeprom.c | 0 examples/{ => standalone}/sparc.lds | 0 examples/{ => standalone}/stubs.c | 0 examples/{ => standalone}/test_burst.c | 0 examples/{ => standalone}/test_burst.h | 0 examples/{ => standalone}/test_burst_lib.S | 0 examples/{ => standalone}/timer.c | 0 examples/{ => standalone}/x86-testapp.c | 0 24 files changed, 10 insertions(+), 6 deletions(-) rename examples/{ => standalone}/.gitignore (100%) rename examples/{ => standalone}/82559_eeprom.c (100%) rename examples/{ => standalone}/Makefile (100%) rename examples/{ => standalone}/README.smc91111_eeprom (100%) rename examples/{ => standalone}/eepro100_eeprom.c (100%) rename examples/{ => standalone}/hello_world.c (100%) rename examples/{ => standalone}/interrupt.c (100%) rename examples/{ => standalone}/mem_to_mem_idma2intr.c (100%) rename examples/{ => standalone}/mips.lds (100%) rename examples/{ => standalone}/nios.lds (100%) rename examples/{ => standalone}/nios2.lds (100%) rename examples/{ => standalone}/ppc_longjmp.S (100%) rename examples/{ => standalone}/ppc_setjmp.S (100%) rename examples/{ => standalone}/sched.c (100%) rename examples/{ => standalone}/smc91111_eeprom.c (100%) rename examples/{ => standalone}/smc911x_eeprom.c (100%) rename examples/{ => standalone}/sparc.lds (100%) rename examples/{ => standalone}/stubs.c (100%) rename examples/{ => standalone}/test_burst.c (100%) rename examples/{ => standalone}/test_burst.h (100%) rename examples/{ => standalone}/test_burst_lib.S (100%) rename examples/{ => standalone}/timer.c (100%) rename examples/{ => standalone}/x86-testapp.c (100%)
Applied, thanks.
Best regards,
Wolfgang Denk
Commit 1bc15386 moved the examples/ to examples/standalone but failed to adapt the Makefiles that need to link against libstubs.a
Signed-off-by: Wolfgang Denk wd@denx.de Cc: Signed-off-by: Peter Tyser ptyser@xes-inc.com --- board/netstar/Makefile | 2 +- board/trab/Makefile | 2 +- board/voiceblue/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/board/netstar/Makefile b/board/netstar/Makefile index 91bac38..cb3f7c9 100644 --- a/board/netstar/Makefile +++ b/board/netstar/Makefile @@ -53,7 +53,7 @@ $(LIB): $(OBJS) $(SOBJS) $(obj)eeprom.srec: $(obj)eeprom.o $(obj)eeprom_start.o cd $(lnk) && $(LD) -T $(LDSCRIPT) -g -Ttext $(LOAD_ADDR) \ -o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \ - -L$(obj)../../examples -lstubs \ + -L$(obj)../../examples/standalone -lstubs \ -L$(obj)../../lib_generic -lgeneric \ -L$(gcclibdir) -lgcc $(OBJCOPY) -O srec $(<:.o=) $@ diff --git a/board/trab/Makefile b/board/trab/Makefile index 30e5fbb..3a92c0d 100644 --- a/board/trab/Makefile +++ b/board/trab/Makefile @@ -49,7 +49,7 @@ $(LIB): $(obj).depend $(OBJS) $(SOBJS)
$(obj)trab_fkt.srec: $(OBJS_FKT) $(LIB) $(LD) -g -Ttext $(LOAD_ADDR) -o $(<:.o=) -e trab_fkt $^ $(LIB) \ - -L$(obj)../../examples -lstubs \ + -L$(obj)../../examples/standalone -lstubs \ -L$(obj)../../lib_generic -lgeneric \ $(obj)../../lib_arm/div0.o \ $(obj)../../lib_arm/_*.o diff --git a/board/voiceblue/Makefile b/board/voiceblue/Makefile index e7c1cbb..7bb92a6 100644 --- a/board/voiceblue/Makefile +++ b/board/voiceblue/Makefile @@ -47,7 +47,7 @@ $(LIB): $(OBJS) $(SOBJS) $(obj)eeprom.srec: $(obj)eeprom.o $(obj)eeprom_start.o cd $(lnk) && $(LD) -T $(LDSCRIPT) -g -Ttext $(LOAD_ADDR) \ -o $(<:.o=) -e eeprom eeprom.o eeprom_start.o \ - -L$(obj)../../examples -lstubs \ + -L$(obj)../../examples/standalone -lstubs \ -L$(obj)../../lib_generic -lgeneric \ -L$(gcclibdir) -lgcc $(OBJCOPY) -O srec $(<:.o=) $@
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 4 ++-- {api_examples => examples/api}/.gitignore | 0 {api_examples => examples/api}/Makefile | 8 ++++---- {api_examples => examples/api}/crt0.S | 0 {api_examples => examples/api}/demo.c | 0 {api_examples => examples/api}/glue.c | 0 {api_examples => examples/api}/glue.h | 0 {api_examples => examples/api}/libgenwrap.c | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename {api_examples => examples/api}/.gitignore (100%) rename {api_examples => examples/api}/Makefile (91%) rename {api_examples => examples/api}/crt0.S (100%) rename {api_examples => examples/api}/demo.c (100%) rename {api_examples => examples/api}/glue.c (100%) rename {api_examples => examples/api}/glue.h (100%) rename {api_examples => examples/api}/libgenwrap.c (100%)
diff --git a/Makefile b/Makefile index c143d66..f43a6cb 100644 --- a/Makefile +++ b/Makefile @@ -143,3 +143,3 @@ SUBDIRS = tools \ examples/standalone \ - api_examples + examples/api
@@ -3598,2 +3598,3 @@ clean: $(obj)examples/standalone/timer + @rm -f $(obj)examples/api/demo $(TIMESTAMP_FILE) $(VERSION_FILE) @rm -f $(obj)tools/bmp_logo $(obj)tools/easylogo/easylogo \ @@ -3614,3 +3615,2 @@ clean: @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl-2k.bin,ipl-4k.bin,ipl.map} - @rm -f $(obj)api_examples/demo $(TIMESTAMP_FILE) $(VERSION_FILE) @find $(OBJTREE) -type f \ diff --git a/api_examples/.gitignore b/examples/api/.gitignore similarity index 100% rename from api_examples/.gitignore rename to examples/api/.gitignore diff --git a/api_examples/Makefile b/examples/api/Makefile similarity index 91% rename from api_examples/Makefile rename to examples/api/Makefile index db9f6ea..ec36782 100644 --- a/api_examples/Makefile +++ b/examples/api/Makefile @@ -35,3 +35,3 @@ OUTPUT = $(OUTPUT-y)
-# Source files located in the api_examples directory +# Source files located in the examples/api directory SOBJ_FILES-$(CONFIG_API) += crt0.o @@ -41,3 +41,3 @@ COBJ_FILES-$(CONFIG_API) += libgenwrap.o
-# Source files which exist outside the api_examples directory +# Source files which exist outside the examples/api directory EXT_COBJ_FILES-$(CONFIG_API) += lib/generic/crc32.o @@ -53,4 +53,4 @@ SRCS += $(addprefix $(SRCTREE)/,$(EXT_COBJ_FILES-y:.o=.c)) SRCS += $(addprefix $(SRCTREE)/,$(EXT_SOBJ_FILES-y:.o=.S)) -SRCS += $(addprefix $(SRCTREE)/api_examples/,$(COBJ_FILES-y:.o=.c)) -SRCS += $(addprefix $(SRCTREE)/api_examples/,$(SOBJ_FILES-y:.o=.S)) +SRCS += $(addprefix $(SRCTREE)/examples/api/,$(COBJ_FILES-y:.o=.c)) +SRCS += $(addprefix $(SRCTREE)/examples/api/,$(SOBJ_FILES-y:.o=.S))
diff --git a/api_examples/crt0.S b/examples/api/crt0.S similarity index 100% rename from api_examples/crt0.S rename to examples/api/crt0.S diff --git a/api_examples/demo.c b/examples/api/demo.c similarity index 100% rename from api_examples/demo.c rename to examples/api/demo.c diff --git a/api_examples/glue.c b/examples/api/glue.c similarity index 100% rename from api_examples/glue.c rename to examples/api/glue.c diff --git a/api_examples/glue.h b/examples/api/glue.h similarity index 100% rename from api_examples/glue.h rename to examples/api/glue.h diff --git a/api_examples/libgenwrap.c b/examples/api/libgenwrap.c similarity index 100% rename from api_examples/libgenwrap.c rename to examples/api/libgenwrap.c
Dear Peter Tyser,
In message 1247241800-29059-7-git-send-email-ptyser@xes-inc.com you wrote:
Signed-off-by: Peter Tyser ptyser@xes-inc.com
Makefile | 4 ++-- {api_examples => examples/api}/.gitignore | 0 {api_examples => examples/api}/Makefile | 8 ++++---- {api_examples => examples/api}/crt0.S | 0 {api_examples => examples/api}/demo.c | 0 {api_examples => examples/api}/glue.c | 0 {api_examples => examples/api}/glue.h | 0 {api_examples => examples/api}/libgenwrap.c | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename {api_examples => examples/api}/.gitignore (100%) rename {api_examples => examples/api}/Makefile (91%) rename {api_examples => examples/api}/crt0.S (100%) rename {api_examples => examples/api}/demo.c (100%) rename {api_examples => examples/api}/glue.c (100%) rename {api_examples => examples/api}/glue.h (100%) rename {api_examples => examples/api}/libgenwrap.c (100%)
This patch doesn't apply (at least not to the current code base):
Applying: Move api_examples to examples/api error: patch failed: api_examples/Makefile:41 error: api_examples/Makefile: patch does not apply fatal: sha1 information is lacking or useless (Makefile). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001.
Please resubmit (eventually in new context).
Best regards,
Wolfgang Denk
Hi,
Peter Tyser wrote:
This series moves api_examples to api/examples and moves all lib* directories into a common lib/ directory. It also moves the <ARCH>_config.mk files into their corresponding lib directory.
Seeing 12 lib_<ARCH> directories and 12 <ARCH>_config.mk files in U-Boot's top level always annoyed me,
Me, too.
Before verifying MIPS builds, I'd like to make sure that why you take lib/$(ARCH)/ alternative, not $(ARCH)/lib/. If there were any discussion on #IRC, is there any chance we could share the summary or decision to follow?
Please note that I agree with such cleanup, of course. I just would like to make sure that lib/$(ARCH)/ is an authorized policy or not. If authorized one, I'm fine.
Thanks in advance,
On Sat, 2009-07-11 at 09:03 +0900, Shinya Kuribayashi wrote:
Hi,
Peter Tyser wrote:
This series moves api_examples to api/examples and moves all lib* directories into a common lib/ directory. It also moves the <ARCH>_config.mk files into their corresponding lib directory.
Seeing 12 lib_<ARCH> directories and 12 <ARCH>_config.mk files in U-Boot's top level always annoyed me,
Me, too.
Before verifying MIPS builds, I'd like to make sure that why you take lib/$(ARCH)/ alternative, not $(ARCH)/lib/. If there were any discussion on #IRC, is there any chance we could share the summary or decision to follow?
There was no discussion, /lib/$(ARCH) just made more sense to me and it was functionally a direct translation from lib_$(ARCH) to lib/$(ARCH).
Using $(ARCH)/lib wouldn't clean up the top-level directory structure much and would open a can of worms that I'm not prepared to deal with at this time. For example, if there was an architecture specific directory, it would seem logical to put cpus of that $(ARCH) type in it too, eg ppc/ lib/ mpc8260 mpc85xx/ mpc86xx/
sh/ lib/ sh2/ sh3/ sh4/
...
My change was just meant to be an incremental improvement, but I could see advantages to using the $(ARCH)/... structure if we wanted to make larger changes. Anyway, I'd be curious to hear other's opinions about other directory layouts.
While we're talking about it, I'd always thought it would be nice to split out all the cmd_* files from common/ into their own command/ directory similar to u-boot-v2.
Please note that I agree with such cleanup, of course. I just would like to make sure that lib/$(ARCH)/ is an authorized policy or not. If authorized one, I'm fine.
I was just scratching an itch, nothing official:)
Best, Peter
Peter Tyser wrote:
Before verifying MIPS builds, I'd like to make sure that why you take lib/$(ARCH)/ alternative, not $(ARCH)/lib/. If there were any discussion on #IRC, is there any chance we could share the summary or decision to follow?
There was no discussion, /lib/$(ARCH) just made more sense to me and it was functionally a direct translation from lib_$(ARCH) to lib/$(ARCH).
Using $(ARCH)/lib wouldn't clean up the top-level directory structure much and would open a can of worms that I'm not prepared to deal with at this time. For example, if there was an architecture specific
Oops, I wanted to say "arch/$(ARCH)/lib/", not $(ARCH)/lib/, sorry.
directory, it would seem logical to put cpus of that $(ARCH) type in it too, eg ppc/ lib/ mpc8260 mpc85xx/ mpc86xx/
sh/ lib/ sh2/ sh3/ sh4/
...
My change was just meant to be an incremental improvement, but I could see advantages to using the $(ARCH)/... structure if we wanted to make larger changes. Anyway, I'd be curious to hear other's opinions about other directory layouts.
While we're talking about it, I'd always thought it would be nice to split out all the cmd_* files from common/ into their own command/ directory similar to u-boot-v2.
Ack. The directory structure in u-boot-v2 looks nice, at least, to me, anyway.
Please note that I agree with such cleanup, of course. I just would like to make sure that lib/$(ARCH)/ is an authorized policy or not. If authorized one, I'm fine.
I was just scratching an itch, nothing official:)
Got it.
Thanks for the kind explanation,
On Friday 10 July 2009 21:20:45 Shinya Kuribayashi wrote:
Peter Tyser wrote:
Before verifying MIPS builds, I'd like to make sure that why you take lib/$(ARCH)/ alternative, not $(ARCH)/lib/. If there were any discussion on #IRC, is there any chance we could share the summary or decision to follow?
There was no discussion, /lib/$(ARCH) just made more sense to me and it was functionally a direct translation from lib_$(ARCH) to lib/$(ARCH).
Using $(ARCH)/lib wouldn't clean up the top-level directory structure much and would open a can of worms that I'm not prepared to deal with at this time. For example, if there was an architecture specific
Oops, I wanted to say "arch/$(ARCH)/lib/", not $(ARCH)/lib/, sorry.
i thought that originally, but i dont care much either way. having arch/$(ARCH)/ would line up with u-boot-v2 and the linux kernel though.
i dont understand needing a lib/ subdir under arch/$(ARCH)/ though.
While we're talking about it, I'd always thought it would be nice to split out all the cmd_* files from common/ into their own command/ directory similar to u-boot-v2.
Ack. The directory structure in u-boot-v2 looks nice, at least, to me, anyway.
makes sense to me too -mike
On 22:42 Fri 10 Jul , Mike Frysinger wrote:
On Friday 10 July 2009 21:20:45 Shinya Kuribayashi wrote:
Peter Tyser wrote:
Before verifying MIPS builds, I'd like to make sure that why you take lib/$(ARCH)/ alternative, not $(ARCH)/lib/. If there were any discussion on #IRC, is there any chance we could share the summary or decision to follow?
There was no discussion, /lib/$(ARCH) just made more sense to me and it was functionally a direct translation from lib_$(ARCH) to lib/$(ARCH).
Using $(ARCH)/lib wouldn't clean up the top-level directory structure much and would open a can of worms that I'm not prepared to deal with at this time. For example, if there was an architecture specific
Oops, I wanted to say "arch/$(ARCH)/lib/", not $(ARCH)/lib/, sorry.
i thought that originally, but i dont care much either way. having arch/$(ARCH)/ would line up with u-boot-v2 and the linux kernel though.
i dont understand needing a lib/ subdir under arch/$(ARCH)/ though.
While we're talking about it, I'd always thought it would be nice to split out all the cmd_* files from common/ into their own command/ directory similar to u-boot-v2.
Ack. The directory structure in u-boot-v2 looks nice, at least, to me, anyway.
I prefer the arch/$(ARCH)/lib so will could also move the cpu stuff there too
for the command dir why not
Best Regards, J.
On Sun, 2009-07-12 at 14:54 +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
On 22:42 Fri 10 Jul , Mike Frysinger wrote:
On Friday 10 July 2009 21:20:45 Shinya Kuribayashi wrote:
Peter Tyser wrote:
Before verifying MIPS builds, I'd like to make sure that why you take lib/$(ARCH)/ alternative, not $(ARCH)/lib/. If there were any discussion on #IRC, is there any chance we could share the summary or decision to follow?
There was no discussion, /lib/$(ARCH) just made more sense to me and it was functionally a direct translation from lib_$(ARCH) to lib/$(ARCH).
Using $(ARCH)/lib wouldn't clean up the top-level directory structure much and would open a can of worms that I'm not prepared to deal with at this time. For example, if there was an architecture specific
Oops, I wanted to say "arch/$(ARCH)/lib/", not $(ARCH)/lib/, sorry.
i thought that originally, but i dont care much either way. having arch/$(ARCH)/ would line up with u-boot-v2 and the linux kernel though.
i dont understand needing a lib/ subdir under arch/$(ARCH)/ though.
While we're talking about it, I'd always thought it would be nice to split out all the cmd_* files from common/ into their own command/ directory similar to u-boot-v2.
Ack. The directory structure in u-boot-v2 looks nice, at least, to me, anyway.
I prefer the arch/$(ARCH)/lib so will could also move the cpu stuff there too
I like the Linux and u-boot-v2 directory layout too the more I think about it too. How about if I resend this series but with the final directory structure looking like:
/arch/$(ARCH)/lib/<source files currently in lib_$(ARCH)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
/examples/ /api/ /standalone/
That will lay the groundwork for moving additional files into /arch/$(ARCH)/ down the road. eg I think it would be nice to move the directories in /cpu/* into their respective /arch/$(ARCH)/ directory, and possibly the /include/asm-$(ARCH) directories in the long run.
What do others think of this?
Best, Peter
On Tuesday 14 July 2009 17:20:43 Peter Tyser wrote:
I prefer the arch/$(ARCH)/lib so will could also move the cpu stuff there too
I like the Linux and u-boot-v2 directory layout too the more I think about it too. How about if I resend this series but with the final directory structure looking like:
/arch/$(ARCH)/lib/<source files currently in lib_$(ARCH)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
/examples/ /api/ /standalone/
That will lay the groundwork for moving additional files into /arch/$(ARCH)/ down the road. eg I think it would be nice to move the directories in /cpu/* into their respective /arch/$(ARCH)/ directory, and possibly the /include/asm-$(ARCH) directories in the long run.
What do others think of this?
I like this idea. So +1 from me.
Best regards, Stefan
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de =====================================================================
Peter Tyser wrote:
On Sun, 2009-07-12 at 14:54 +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
On 22:42 Fri 10 Jul , Mike Frysinger wrote:
On Friday 10 July 2009 21:20:45 Shinya Kuribayashi wrote:
Peter Tyser wrote:
Before verifying MIPS builds, I'd like to make sure that why you take lib/$(ARCH)/ alternative, not $(ARCH)/lib/. If there were any discussion on #IRC, is there any chance we could share the summary or decision to follow?
There was no discussion, /lib/$(ARCH) just made more sense to me and it was functionally a direct translation from lib_$(ARCH) to lib/$(ARCH).
Using $(ARCH)/lib wouldn't clean up the top-level directory structure much and would open a can of worms that I'm not prepared to deal with at this time. For example, if there was an architecture specific
Oops, I wanted to say "arch/$(ARCH)/lib/", not $(ARCH)/lib/, sorry.
i thought that originally, but i dont care much either way. having arch/$(ARCH)/ would line up with u-boot-v2 and the linux kernel though.
i dont understand needing a lib/ subdir under arch/$(ARCH)/ though.
While we're talking about it, I'd always thought it would be nice to split out all the cmd_* files from common/ into their own command/ directory similar to u-boot-v2.
Ack. The directory structure in u-boot-v2 looks nice, at least, to me, anyway.
I prefer the arch/$(ARCH)/lib so will could also move the cpu stuff there too
I like the Linux and u-boot-v2 directory layout too the more I think about it too. How about if I resend this series but with the final directory structure looking like:
/arch/$(ARCH)/lib/<source files currently in lib_$(ARCH)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
/examples/ /api/ /standalone/
That will lay the groundwork for moving additional files into /arch/$(ARCH)/ down the road. eg I think it would be nice to move the directories in /cpu/* into their respective /arch/$(ARCH)/ directory, and possibly the /include/asm-$(ARCH) directories in the long run.
What do others think of this?
There were some discussions we'd better to reflect back on about this topic.
I can't toss the URLs of them at the moment as I'm behind a firewall, but these might help:
Date: Thu, 13 Sep 2007 17:28:47 -0600 From: "Grant Likely" grant.likely@secretlab.ca To: uboot u-boot-users@lists.sourceforge.net, "Jon Loeliger" jdl@jdl.com, "Wolfgang Denk" wd@denx.de Subject: [U-Boot-Users] [RFC] u-boot migration to kconfig
and
Date: Sat, 22 Sep 2007 12:27:38 +0200 From: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com To: u-boot-users@lists.sourceforge.net Subject: [U-Boot-Users] [RFC] u-boot migration to kconfig
On Wed, 2009-07-15 at 12:38 +0900, Shinya Kuribayashi wrote:
Peter Tyser wrote:
On Sun, 2009-07-12 at 14:54 +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
On 22:42 Fri 10 Jul , Mike Frysinger wrote:
On Friday 10 July 2009 21:20:45 Shinya Kuribayashi wrote:
Peter Tyser wrote:
> Before verifying MIPS builds, I'd like to make sure that why you take > lib/$(ARCH)/ alternative, not $(ARCH)/lib/. If there were any > discussion on #IRC, is there any chance we could share the summary or > decision to follow? There was no discussion, /lib/$(ARCH) just made more sense to me and it was functionally a direct translation from lib_$(ARCH) to lib/$(ARCH).
Using $(ARCH)/lib wouldn't clean up the top-level directory structure much and would open a can of worms that I'm not prepared to deal with at this time. For example, if there was an architecture specific
Oops, I wanted to say "arch/$(ARCH)/lib/", not $(ARCH)/lib/, sorry.
i thought that originally, but i dont care much either way. having arch/$(ARCH)/ would line up with u-boot-v2 and the linux kernel though.
i dont understand needing a lib/ subdir under arch/$(ARCH)/ though.
While we're talking about it, I'd always thought it would be nice to split out all the cmd_* files from common/ into their own command/ directory similar to u-boot-v2.
Ack. The directory structure in u-boot-v2 looks nice, at least, to me, anyway.
I prefer the arch/$(ARCH)/lib so will could also move the cpu stuff there too
I like the Linux and u-boot-v2 directory layout too the more I think about it too. How about if I resend this series but with the final directory structure looking like:
/arch/$(ARCH)/lib/<source files currently in lib_$(ARCH)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
/examples/ /api/ /standalone/
That will lay the groundwork for moving additional files into /arch/$(ARCH)/ down the road. eg I think it would be nice to move the directories in /cpu/* into their respective /arch/$(ARCH)/ directory, and possibly the /include/asm-$(ARCH) directories in the long run.
What do others think of this?
There were some discussions we'd better to reflect back on about this topic.
I can't toss the URLs of them at the moment as I'm behind a firewall, but these might help:
Date: Thu, 13 Sep 2007 17:28:47 -0600 From: "Grant Likely" <grant.likely@secretlab.ca> To: uboot <u-boot-users@lists.sourceforge.net>, "Jon Loeliger" <jdl@jdl.com>, "Wolfgang Denk" <wd@denx.de> Subject: [U-Boot-Users] [RFC] u-boot migration to kconfig
Jean-Christophe submitted some patches for consideration earlier this year. No one really bit as far as taking the necessary steps to get the Kbuild system fully functional if my memory is correct. I don't think those patches are going to make it into the upcoming release in any case.
I'd vote to get the directory structure changed as desired (in this release), then integrate the Kconfig-based build system in the next release once the directory layout is stable. Jean-Christophe is the most familiar with the Kbuild system and might have a better idea what its state is, how hard it would be to adapt to a new directory layout, etc. Do you have any input Jean-Christophe?
Best, Peter
On 23:39 Tue 14 Jul , Peter Tyser wrote:
On Wed, 2009-07-15 at 12:38 +0900, Shinya Kuribayashi wrote:
Peter Tyser wrote:
On Sun, 2009-07-12 at 14:54 +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
On 22:42 Fri 10 Jul , Mike Frysinger wrote:
On Friday 10 July 2009 21:20:45 Shinya Kuribayashi wrote:
Peter Tyser wrote: >> Before verifying MIPS builds, I'd like to make sure that why you take >> lib/$(ARCH)/ alternative, not $(ARCH)/lib/. If there were any >> discussion on #IRC, is there any chance we could share the summary or >> decision to follow? > There was no discussion, /lib/$(ARCH) just made more sense to me and it > was functionally a direct translation from lib_$(ARCH) to lib/$(ARCH). > > Using $(ARCH)/lib wouldn't clean up the top-level directory structure > much and would open a can of worms that I'm not prepared to deal with at > this time. For example, if there was an architecture specific Oops, I wanted to say "arch/$(ARCH)/lib/", not $(ARCH)/lib/, sorry.
i thought that originally, but i dont care much either way. having arch/$(ARCH)/ would line up with u-boot-v2 and the linux kernel though.
i dont understand needing a lib/ subdir under arch/$(ARCH)/ though.
> While we're talking about it, I'd always thought it would be nice to > split out all the cmd_* files from common/ into their own command/ > directory similar to u-boot-v2. Ack. The directory structure in u-boot-v2 looks nice, at least, to me, anyway.
I prefer the arch/$(ARCH)/lib so will could also move the cpu stuff there too
I like the Linux and u-boot-v2 directory layout too the more I think about it too. How about if I resend this series but with the final directory structure looking like:
/arch/$(ARCH)/lib/<source files currently in lib_$(ARCH)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
/examples/ /api/ /standalone/
That will lay the groundwork for moving additional files into /arch/$(ARCH)/ down the road. eg I think it would be nice to move the directories in /cpu/* into their respective /arch/$(ARCH)/ directory, and possibly the /include/asm-$(ARCH) directories in the long run.
What do others think of this?
There were some discussions we'd better to reflect back on about this topic.
I can't toss the URLs of them at the moment as I'm behind a firewall, but these might help:
Date: Thu, 13 Sep 2007 17:28:47 -0600 From: "Grant Likely" <grant.likely@secretlab.ca> To: uboot <u-boot-users@lists.sourceforge.net>, "Jon Loeliger" <jdl@jdl.com>, "Wolfgang Denk" <wd@denx.de> Subject: [U-Boot-Users] [RFC] u-boot migration to kconfigJean-Christophe submitted some patches for consideration earlier this year. No one really bit as far as taking the necessary steps to get the Kbuild system fully functional if my memory is correct. I don't think those patches are going to make it into the upcoming release in any case.
I'd vote to get the directory structure changed as desired (in this release), then integrate the Kconfig-based build system in the next release once the directory layout is stable. Jean-Christophe is the most familiar with the Kbuild system and might have a better idea what its state is, how hard it would be to adapt to a new directory layout, etc. Do you have any input Jean-Christophe?
more we will be close to the linux organisation more easier it will be to integrate it and update it the only really important think is to merge to KConfig first.
Please note that the Kconfig is already ready I just not have the time to rebase the patch before tomorow as I've to do my custudian work first
Best Regards, J.
I'd vote to get the directory structure changed as desired (in this release), then integrate the Kconfig-based build system in the next release once the directory layout is stable. Jean-Christophe is the most familiar with the Kbuild system and might have a better idea what its state is, how hard it would be to adapt to a new directory layout, etc. Do you have any input Jean-Christophe?
more we will be close to the linux organisation more easier it will be to integrate it and update it
Your sentence above implies you'd like the directory structure to match Linux's BEFORE adding Kconfig support...
the only really important think is to merge to KConfig first.
But this sentence states you'd prefer to change the directory structure AFTER adding Kconfig support?
I'd still vote for changing the directory structure in this release, then apply the Kconfig changes in the next one. The same Kconfig files you've already made could still be used regardless of directory layout, correct? ie all you'd have to do is change the "source oldpath" to "source newpath" in some Kconfig files and maybe update a Makefile or 2?
In any case, one of us would have to fix up the Kconfig support to work with a new directory layout. In my opinion, if its not hard to update the Kconfigs to work with a new directory layout it would make more sense for you to do it at the same time as adding Kconfig support instead of me making both directory layout and Kconfig changes at the same time.
Anyway, that's my $.02
Peter
On 11:37 Sat 18 Jul , Peter Tyser wrote:
I'd vote to get the directory structure changed as desired (in this release), then integrate the Kconfig-based build system in the next release once the directory layout is stable. Jean-Christophe is the most familiar with the Kbuild system and might have a better idea what its state is, how hard it would be to adapt to a new directory layout, etc. Do you have any input Jean-Christophe?
more we will be close to the linux organisation more easier it will be to integrate it and update it
Your sentence above implies you'd like the directory structure to match Linux's BEFORE adding Kconfig support...
the only really important think is to merge to KConfig first.
But this sentence states you'd prefer to change the directory structure AFTER adding Kconfig support?
I do not care that much for the Kconfig but we need to have it before the Kbuild support which is different
I'd still vote for changing the directory structure in this release, then apply the Kconfig changes in the next one. The same Kconfig files you've already made could still be used regardless of directory layout, correct? ie all you'd have to do is change the "source oldpath" to "source newpath" in some Kconfig files and maybe update a Makefile or 2?
In any case, one of us would have to fix up the Kconfig support to work with a new directory layout. In my opinion, if its not hard to update the Kconfigs to work with a new directory layout it would make more sense for you to do it at the same time as adding Kconfig support instead of me making both directory layout and Kconfig changes at the same time.
that's fine for me
Best Regards, J.
Dear Peter Tyser,
In message 1247935062.9174.14.camel@ptyser-laptop you wrote:
I'd still vote for changing the directory structure in this release,
NAK. Such heavily restructuring changes should be prepared and submitted at (or even before) the begin of the merge window, not at it's very end.
For this release it's too late for such a change.
Best regards,
Wolfgang Denk
On Sat, 2009-07-18 at 20:07 +0200, Wolfgang Denk wrote:
Dear Peter Tyser,
In message 1247935062.9174.14.camel@ptyser-laptop you wrote:
I'd still vote for changing the directory structure in this release,
NAK. Such heavily restructuring changes should be prepared and submitted at (or even before) the begin of the merge window, not at it's very end.
For this release it's too late for such a change.
Any interest in picking up the following patches from this series for the upcoming release: 1/6 Move architecture specific config.mk files into subdirs 5/6 Move examples/ to examples/standalone 6/6 Move api_examples to examples/api
They're pretty straightforward and are 3 less changes to carry around.
Peter
Dear Peter Tyser,
In message 1248033674.15400.9.camel@ptyser-laptop you wrote:
On Sat, 2009-07-18 at 20:07 +0200, Wolfgang Denk wrote:
Dear Peter Tyser,
In message 1247935062.9174.14.camel@ptyser-laptop you wrote:
I'd still vote for changing the directory structure in this release,
NAK. Such heavily restructuring changes should be prepared and submitted at (or even before) the begin of the merge window, not at it's very end.
For this release it's too late for such a change.
Any interest in picking up the following patches from this series for the upcoming release: 1/6 Move architecture specific config.mk files into subdirs 5/6 Move examples/ to examples/standalone 6/6 Move api_examples to examples/api
They're pretty straightforward and are 3 less changes to carry around.
I will look into this patch series ASAP (still fighting with some backlog; just completed June's patches) - it was submitted while the merge window was open, so there is no reason to ignore them without at least carefully checking.
Best regards,
Wolfgang Denk
Dear Peter Tyser,
In message 1248033674.15400.9.camel@ptyser-laptop you wrote:
On Sat, 2009-07-18 at 20:07 +0200, Wolfgang Denk wrote:
Dear Peter Tyser,
In message 1247935062.9174.14.camel@ptyser-laptop you wrote:
I'd still vote for changing the directory structure in this release,
NAK. Such heavily restructuring changes should be prepared and submitted at (or even before) the begin of the merge window, not at it's very end.
For this release it's too late for such a change.
Any interest in picking up the following patches from this series for the upcoming release: 1/6 Move architecture specific config.mk files into subdirs 5/6 Move examples/ to examples/standalone 6/6 Move api_examples to examples/api
They're pretty straightforward and are 3 less changes to carry around.
OK, tried that. It worked for 1/6 and 5/6, but 6/6 failed,probably due to missing/not matching context.
Best regards,
Wolfgang Denk
On Tue, 2009-07-21 at 00:15 +0200, Wolfgang Denk wrote:
Dear Peter Tyser,
In message 1248033674.15400.9.camel@ptyser-laptop you wrote:
On Sat, 2009-07-18 at 20:07 +0200, Wolfgang Denk wrote:
Dear Peter Tyser,
In message 1247935062.9174.14.camel@ptyser-laptop you wrote:
I'd still vote for changing the directory structure in this release,
NAK. Such heavily restructuring changes should be prepared and submitted at (or even before) the begin of the merge window, not at it's very end.
For this release it's too late for such a change.
Any interest in picking up the following patches from this series for the upcoming release: 1/6 Move architecture specific config.mk files into subdirs 5/6 Move examples/ to examples/standalone 6/6 Move api_examples to examples/api
They're pretty straightforward and are 3 less changes to carry around.
OK, tried that. It worked for 1/6 and 5/6, but 6/6 failed,probably due to missing/not matching context.
Thanks for applying them. I'll send 6/6 in a few minutes.
Peter
Hi Peter,
On 2009-07-14, at 17:20, Peter Tyser wrote:
I like the Linux and u-boot-v2 directory layout too the more I think about it too. How about if I resend this series but with the final directory structure looking like:
/arch/$(ARCH)/lib/<source files currently in lib_$(ARCH)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
/examples/ /api/ /standalone/
Not directly answering your question, but rather a minor naming nit: strictly speaking the 'api' subdir contents are also standalone applications... so the above naming scheme is not clear cut, although I don't have much better suggestions :-) The 'standalone' above use the legacy jumptable calls method, so maybe 'jumptable' dirname would work? Other thoughts?
Rafal
Hi Rafal,
I like the Linux and u-boot-v2 directory layout too the more I think about it too. How about if I resend this series but with the final directory structure looking like:
/arch/$(ARCH)/lib/<source files currently in lib_$(ARCH)
/lib/ /<source files currently in lib_generic> /libfdt/ /lzma/ /lzo/
/examples/ /api/ /standalone/
Not directly answering your question, but rather a minor naming nit: strictly speaking the 'api' subdir contents are also standalone applications... so the above naming scheme is not clear cut, although I don't have much better suggestions :-) The 'standalone' above use the legacy jumptable calls method, so maybe 'jumptable' dirname would work? Other thoughts?
I see your point. <nitpick>Its a bit confusing as U-Boot documentation seems to refer to "Standalone applications" alot, and in general that documentation is specifically referring jumptable applications. eg "doc/README.standalone" and "Standalone HOWTO" in README. If you dig you can find the API applications mentioned in api/README - I don't see it referenced much in either the standard location of /doc/* or /README. I guess my only point is that it would be great if the application documentation was consistent between the jumptable and API method, then it would be a a no brainer as far as naming /examples directory layout. As is, documentation implies "standalone application" means jumptable application.</nitpick>
In any case, I'm OK with a different directory layout. /examples/[api| jumptable] is fine, or we could even add an apps subdir, eg: /examples/apps/[api|jumptable]. I'm also fine with leaving it the way I had it initially as all documentation currently implies standalone == jumptable, api = API method.
Let me know if you or others have arguments for 1 convention over another.
Thanks, Peter
Dear Peter Tyser,
In message 1247935976.9174.31.camel@ptyser-laptop you wrote:
I see your point. <nitpick>Its a bit confusing as U-Boot documentation seems to refer to "Standalone applications" alot, and in general that documentation is specifically referring jumptable applications. eg "doc/README.standalone" and "Standalone HOWTO" in README. If you dig you can find the API applications mentioned in api/README - I don't see it referenced much in either the standard location of /doc/* or /README. I guess my only point is that it would be great if the application documentation was consistent between the jumptable and API method, then it would be a a no brainer as far as naming /examples directory layout. As is, documentation implies "standalone application" means jumptable application.</nitpick>
Agreed. So far it seems that the *BSD boot loader folks are the only users of and the only developers interested in the API code.
eg: /examples/apps/[api|jumptable]. I'm also fine with leaving it the way I had it initially as all documentation currently implies standalone == jumptable, api = API method.
Agreed - that should besufficiently clear - at least for now.
Best regards,
Wolfgang Denk
participants (9)
-
Jean-Christophe PLAGNIOL-VILLARD -
Mike Frysinger -
Peter Tyser -
Rafal Jaworowski -
Scott Wood -
Shinya Kuribayashi -
Shinya Kuribayashi -
Stefan Roese -
Wolfgang Denk