Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 4 ++++ README | 4 ++-- 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/amirix/ap1000/u-boot.lds | 2 +- board/atum8548/u-boot.lds | 2 +- board/c2mon/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/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/mpc7448hpc2/tsi108_init.c | 2 +- board/freescale/mpc8610hpcd/u-boot.lds | 2 +- board/freescale/mpc8641hpcn/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/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/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 | 1 + cpu/mpc5xxx/u-boot-customlayout.lds | 4 ++-- doc/README.alaska8220 | 2 +- doc/README.mpc5xx | 6 +++--- {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 nand_spl/board/freescale/mpc8313erdb/Makefile | 6 +++--- nand_spl/board/sheldon/simpc8313/Makefile | 6 +++--- 118 files changed, 165 insertions(+), 160 deletions(-) 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%)
diff --git a/Makefile b/Makefile index a061499..7902a47 100644 --- a/Makefile +++ b/Makefile @@ -229,5 +229,9 @@ ifeq ($(CPU),ixp) LIBS += cpu/ixp/npe/libnpe.a endif +ifeq ($(SRCTREE)/lib/$(ARCH),$(wildcard $(SRCTREE)/lib/$(ARCH))) +LIBS += lib/$(ARCH)/lib$(ARCH).a +else LIBS += lib_$(ARCH)/lib$(ARCH).a +endif LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \ fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a fs/yaffs2/libyaffs2.a \ diff --git a/README b/README index 0e84337..28991c3 100644 --- a/README +++ b/README @@ -190,5 +190,5 @@ Directory Hierarchy: - lib_mips Files generic to MIPS architecture - lib_nios Files generic to NIOS architecture -- lib_ppc Files generic to PowerPC architecture +- lib/ppc Files generic to PowerPC architecture - lib_sparc Files generic to SPARC architecture - libfdt Library files to support flattened device trees @@ -1891,5 +1891,5 @@ Legacy uImage format: 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() -32 post/post.c POST test failed, detected by post_run_single() diff --git a/api_examples/Makefile b/api_examples/Makefile index 2a30bef..23b5e9c 100644 --- a/api_examples/Makefile +++ b/api_examples/Makefile @@ -46,5 +46,5 @@ EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o 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
@@ -78,5 +78,5 @@ $(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 @@ -67,13 +67,13 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + 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_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)
. = env_offset; 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 @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.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 faa1c6c..dd5b607 100644 --- a/board/RPXlite/u-boot.lds +++ b/board/RPXlite/u-boot.lds @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.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 7b7b83b..d8e3c0c 100644 --- a/board/RPXlite_dw/u-boot.lds +++ b/board/RPXlite_dw/u-boot.lds @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.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 17e6fa0..794f0f9 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -59,10 +59,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = env_offset; 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 @@ -66,5 +66,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -69,5 +69,5 @@ SECTIONS cpu/mpc85xx/speed.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) *(.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 @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.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 86c8ecb..fe69c93 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_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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
common/env_embedded.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 @@ -73,6 +73,6 @@ SECTIONS lib_generic/crc32.o (.text)
- 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) /* . = env_offset;*/ 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 @@ -73,6 +73,6 @@ SECTIONS lib_generic/crc32.o (.text)
- 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) /* . = env_offset;*/ 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 @@ -70,5 +70,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
. = env_offset; 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 @@ -72,5 +72,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -69,5 +69,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.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 @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.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 @@ -63,6 +63,6 @@ SECTIONS cpu/mpc8xx/speed.o (.text) 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) lib_generic/crc32.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 @@ -71,5 +71,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
. = env_offset; 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 @@ -324,5 +324,5 @@ int board_early_init_r (void) * This is really a work-around because, the HLP bank 1 * 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 * and enable all HLP banks and not just HLP 0 as is being done for 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 @@ -59,5 +59,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.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 e188722..ae944d0 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_ppc/extable.o (.text) + lib/ppc/extable.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 ee0b719..d7f70b7 100644 --- a/board/genietv/u-boot.lds +++ b/board/genietv/u-boot.lds @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.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 @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.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 @@ -59,7 +59,7 @@ SECTIONS common/dlmalloc.o (.text) 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) . = env_offset; 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 @@ -57,8 +57,8 @@ 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; common/env_embedded.o(.text) 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 @@ -59,5 +59,5 @@ SECTIONS /* common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.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 9a28cfd..71cf813 100644 --- a/board/icu862/u-boot.lds +++ b/board/icu862/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
. = env_offset; 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 @@ -58,8 +58,8 @@ SECTIONS cpu/mpc8xx/start.o (.text) 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) /** . = env_offset; 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 @@ -57,8 +57,8 @@ 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/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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
. = env_offset; 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 @@ -27,5 +27,5 @@ /* * 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. * @@ -86,5 +86,5 @@ 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 * configured, but we are still running from flash. @@ -150,5 +150,5 @@ 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 * PCI has been set up. From here we done late setup. 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 @@ -28,5 +28,5 @@ * this is even after checkboard. It returns the size of the SDRAM * 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 @@ -59,10 +59,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = DEFINED(env_offset) ? env_offset : .; 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 @@ -60,5 +60,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.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 f2b6650..575e676 100644 --- a/board/kup/kup4x/u-boot.lds +++ b/board/kup/kup4x/u-boot.lds @@ -60,5 +60,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.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 b9fa2d6..7e1b6ee 100644 --- a/board/lantec/u-boot.lds +++ b/board/lantec/u-boot.lds @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.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 bd9d76c..c035d63 100644 --- a/board/lwmon/u-boot.lds.debug +++ b/board/lwmon/u-boot.lds.debug @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
. = env_offset; 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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
. = env_offset; 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 @@ -66,5 +66,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
common/env_embedded.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 @@ -54,6 +54,6 @@ 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) lib_generic/crc32.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 @@ -55,5 +55,5 @@ SECTIONS cpu/mpc824x/start.o (.text) common/board.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.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 @@ -64,5 +64,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.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 d71a299..592c030 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_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 @@ -71,5 +71,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
common/env_embedded.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 @@ -56,10 +56,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = DEFINED(env_offset) ? env_offset : .; 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 @@ -35,5 +35,5 @@ 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 @@ -110,5 +110,5 @@ _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 board_early_init_f: (board/netstal/hcu5/hcu5.c) @@ -142,5 +142,5 @@ From now on our copy is in RAM and we will run from there, starting with board_init_r ------------------------------------------------------- - board_init_r: (lib_ppc\board.c) + board_init_r: (lib/ppc\board.c) setup bd function pointers trap_init @@ -163,5 +163,5 @@ include/configs/hcu5.h 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 @@ -48,5 +48,5 @@ 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 @@ -40,5 +40,5 @@ 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 @@ -56,10 +56,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = DEFINED(env_offset) ? env_offset : .; 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 @@ -56,10 +56,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = DEFINED(env_offset) ? env_offset : .; 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 @@ -56,10 +56,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = DEFINED(env_offset) ? env_offset : .; 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 @@ -72,5 +72,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) *(.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 @@ -72,5 +72,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) *(.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 @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.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 552f15d..bfdfffa 100644 --- a/board/rbc823/u-boot.lds +++ b/board/rbc823/u-boot.lds @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.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 @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.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 f509100..f157d17 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_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 @@ -68,5 +68,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -78,5 +78,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -68,5 +68,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -70,5 +70,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -71,5 +71,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) *(.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 @@ -77,5 +77,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) *(.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 @@ -59,5 +59,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) *(.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 @@ -71,5 +71,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.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 @@ -58,7 +58,7 @@ SECTIONS cpu/mpc8xx/start.o (.text) 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; common/env_embedded.o(.text) 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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
. = env_offset; 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 @@ -59,10 +59,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = DEFINED(env_offset) ? env_offset : .; 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 @@ -59,10 +59,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = DEFINED(env_offset) ? env_offset : .; 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 @@ -75,5 +75,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) *(.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 @@ -59,10 +59,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = DEFINED(env_offset) ? env_offset : .; 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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
. = env_offset; 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 @@ -79,5 +79,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) *(.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 @@ -260,5 +260,5 @@ 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 @@ -79,5 +79,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text) lib_generic/zlib.o (.text) *(.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 @@ -56,10 +56,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = DEFINED(env_offset) ? env_offset : .; 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 @@ -59,10 +59,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
. = env_offset; 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 @@ -72,5 +72,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.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 19c1541..e63f593 100644 --- a/board/tqc/tqm8xx/u-boot.lds +++ b/board/tqc/tqm8xx/u-boot.lds @@ -59,9 +59,9 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) lib_generic/zlib.o (.text) - lib_ppc/cache.o (.text) + lib/ppc/cache.o (.text)
. = DEFINED(env_offset) ? env_offset : .; 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 @@ -59,10 +59,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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)
common/env_embedded.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 @@ -59,10 +59,10 @@ SECTIONS cpu/mpc8xx/traps.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) 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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
common/env_embedded.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 @@ -58,5 +58,5 @@ SECTIONS cpu/mpc8xx/start.o (.text) common/dlmalloc.o (.text) - lib_ppc/ppcstring.o (.text) + lib/ppc/ppcstring.o (.text) lib_generic/vsprintf.o (.text) lib_generic/crc32.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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
. = env_offset; 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 @@ -59,5 +59,5 @@ SECTIONS common/dlmalloc.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.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 fa60e6b..d77cd49 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_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 @@ -60,5 +60,5 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) + lib/ppc/extable.o (.text)
common/env_embedded.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 @@ -76,5 +76,5 @@ SECTIONS common/dlmalloc.o (.text) 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 @@ -66,5 +66,5 @@ SECTIONS common/dlmalloc.o (.text) 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..b7418c5 100644 --- a/config.mk +++ b/config.mk @@ -85,4 +85,5 @@ 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 ifdef CPU 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 @@ -59,6 +59,6 @@ SECTIONS cpu/mpc5xxx/traps.o (.text) 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)
. = DEFINED(env_offset) ? env_offset : .; diff --git a/doc/README.alaska8220 b/doc/README.alaska8220 index 0bd68d9..8573f98 100644 --- a/doc/README.alaska8220 +++ b/doc/README.alaska8220 @@ -23,5 +23,5 @@ Changed files: vco_clk, pev_clk, flb_clk, and bExtUart
-- lib_ppc/board.c added CONFIG_MPC8220 support +- lib/ppc/board.c added CONFIG_MPC8220 support
- net/eth.c added FEC support for MPC8220 diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx index 07be863..4392beb 100644 --- a/doc/README.mpc5xx +++ b/doc/README.mpc5xx @@ -35,7 +35,7 @@ u-boot-0.2.0/include/status_led.h 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 u-boot-0.2.0/CREDITS 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/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 @@ -82,11 +82,11 @@ $(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 @@ -88,13 +88,13 @@ $(obj)nand_init.c: $(obj)cache.c: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/cache.c $@ + ln -s $(SRCTREE)/lib/ppc/cache.c $@
$(obj)time.c: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/time.c $@ + ln -s $(SRCTREE)/lib/ppc/time.c $@
$(obj)ticks.S: @rm -f $@ - ln -s $(SRCTREE)/lib_ppc/ticks.S $@ + ln -s $(SRCTREE)/lib/ppc/ticks.S $@
#########################################################################