[U-Boot] [PATCH v2 2/6] Move lib_ directories to lib/

Peter Tyser
2009-07-10T16:03:16Z

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@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 $@

--
1.6.2.1