Move lib_$ARCH directories to arch/$ARCH/lib
authorPeter Tyser <ptyser@xes-inc.com>
Tue, 13 Apr 2010 03:28:04 +0000 (22:28 -0500)
committerWolfgang Denk <wd@denx.de>
Tue, 13 Apr 2010 07:13:03 +0000 (09:13 +0200)
Also move lib_$ARCH/config.mk to arch/$ARCH/config.mk

This change is intended to clean up the top-level directory structure
and more closely mimic Linux's directory organization.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
251 files changed:
Makefile
README
arch/arm/config.mk [moved from lib_arm/config.mk with 94% similarity]
arch/arm/lib/Makefile [moved from lib_arm/Makefile with 100% similarity]
arch/arm/lib/_ashldi3.S [moved from lib_arm/_ashldi3.S with 100% similarity]
arch/arm/lib/_ashrdi3.S [moved from lib_arm/_ashrdi3.S with 100% similarity]
arch/arm/lib/_divsi3.S [moved from lib_arm/_divsi3.S with 100% similarity]
arch/arm/lib/_lshrdi3.S [moved from lib_arm/_lshrdi3.S with 100% similarity]
arch/arm/lib/_modsi3.S [moved from lib_arm/_modsi3.S with 100% similarity]
arch/arm/lib/_udivsi3.S [moved from lib_arm/_udivsi3.S with 100% similarity]
arch/arm/lib/_umodsi3.S [moved from lib_arm/_umodsi3.S with 100% similarity]
arch/arm/lib/board.c [moved from lib_arm/board.c with 100% similarity]
arch/arm/lib/bootm.c [moved from lib_arm/bootm.c with 100% similarity]
arch/arm/lib/cache-cp15.c [moved from lib_arm/cache-cp15.c with 100% similarity]
arch/arm/lib/cache.c [moved from lib_arm/cache.c with 100% similarity]
arch/arm/lib/div0.c [moved from lib_arm/div0.c with 100% similarity]
arch/arm/lib/eabi_compat.c [moved from lib_arm/eabi_compat.c with 100% similarity]
arch/arm/lib/interrupts.c [moved from lib_arm/interrupts.c with 100% similarity]
arch/arm/lib/reset.c [moved from lib_arm/reset.c with 100% similarity]
arch/avr32/config.mk [moved from lib_avr32/config.mk with 100% similarity]
arch/avr32/lib/Makefile [moved from lib_avr32/Makefile with 100% similarity]
arch/avr32/lib/board.c [moved from lib_avr32/board.c with 100% similarity]
arch/avr32/lib/bootm.c [moved from lib_avr32/bootm.c with 100% similarity]
arch/avr32/lib/interrupts.c [moved from lib_avr32/interrupts.c with 100% similarity]
arch/avr32/lib/memset.S [moved from lib_avr32/memset.S with 100% similarity]
arch/blackfin/config.mk [moved from lib_blackfin/config.mk with 97% similarity]
arch/blackfin/lib/.gitignore [moved from lib_blackfin/.gitignore with 100% similarity]
arch/blackfin/lib/Makefile [moved from lib_blackfin/Makefile with 100% similarity]
arch/blackfin/lib/__kgdb.S [moved from lib_blackfin/__kgdb.S with 100% similarity]
arch/blackfin/lib/board.c [moved from lib_blackfin/board.c with 100% similarity]
arch/blackfin/lib/boot.c [moved from lib_blackfin/boot.c with 100% similarity]
arch/blackfin/lib/cache.c [moved from lib_blackfin/cache.c with 100% similarity]
arch/blackfin/lib/clocks.c [moved from lib_blackfin/clocks.c with 100% similarity]
arch/blackfin/lib/cmd_cache_dump.c [moved from lib_blackfin/cmd_cache_dump.c with 100% similarity]
arch/blackfin/lib/ins.S [moved from lib_blackfin/ins.S with 100% similarity]
arch/blackfin/lib/kgdb.c [moved from lib_blackfin/kgdb.c with 100% similarity]
arch/blackfin/lib/kgdb.h [moved from lib_blackfin/kgdb.h with 100% similarity]
arch/blackfin/lib/memcmp.S [moved from lib_blackfin/memcmp.S with 100% similarity]
arch/blackfin/lib/memcpy.S [moved from lib_blackfin/memcpy.S with 100% similarity]
arch/blackfin/lib/memmove.S [moved from lib_blackfin/memmove.S with 100% similarity]
arch/blackfin/lib/memset.S [moved from lib_blackfin/memset.S with 100% similarity]
arch/blackfin/lib/muldi3.c [moved from lib_blackfin/muldi3.c with 100% similarity]
arch/blackfin/lib/outs.S [moved from lib_blackfin/outs.S with 100% similarity]
arch/blackfin/lib/post.c [moved from lib_blackfin/post.c with 100% similarity]
arch/blackfin/lib/string.c [moved from lib_blackfin/string.c with 100% similarity]
arch/blackfin/lib/tests.c [moved from lib_blackfin/tests.c with 100% similarity]
arch/blackfin/lib/u-boot.lds.S [moved from lib_blackfin/u-boot.lds.S with 100% similarity]
arch/i386/config.mk [moved from lib_i386/config.mk with 100% similarity]
arch/i386/lib/Makefile [moved from lib_i386/Makefile with 100% similarity]
arch/i386/lib/bios.S [moved from lib_i386/bios.S with 100% similarity]
arch/i386/lib/bios.h [moved from lib_i386/bios.h with 100% similarity]
arch/i386/lib/bios_pci.S [moved from lib_i386/bios_pci.S with 100% similarity]
arch/i386/lib/bios_setup.c [moved from lib_i386/bios_setup.c with 100% similarity]
arch/i386/lib/board.c [moved from lib_i386/board.c with 100% similarity]
arch/i386/lib/bootm.c [moved from lib_i386/bootm.c with 100% similarity]
arch/i386/lib/interrupts.c [moved from lib_i386/interrupts.c with 100% similarity]
arch/i386/lib/pcat_interrupts.c [moved from lib_i386/pcat_interrupts.c with 100% similarity]
arch/i386/lib/pcat_timer.c [moved from lib_i386/pcat_timer.c with 100% similarity]
arch/i386/lib/pci.c [moved from lib_i386/pci.c with 100% similarity]
arch/i386/lib/pci_type1.c [moved from lib_i386/pci_type1.c with 100% similarity]
arch/i386/lib/realmode.c [moved from lib_i386/realmode.c with 100% similarity]
arch/i386/lib/realmode_switch.S [moved from lib_i386/realmode_switch.S with 100% similarity]
arch/i386/lib/timer.c [moved from lib_i386/timer.c with 100% similarity]
arch/i386/lib/video.c [moved from lib_i386/video.c with 100% similarity]
arch/i386/lib/video_bios.c [moved from lib_i386/video_bios.c with 100% similarity]
arch/i386/lib/zimage.c [moved from lib_i386/zimage.c with 100% similarity]
arch/m68k/config.mk [moved from lib_m68k/config.mk with 100% similarity]
arch/m68k/lib/Makefile [moved from lib_m68k/Makefile with 100% similarity]
arch/m68k/lib/board.c [moved from lib_m68k/board.c with 100% similarity]
arch/m68k/lib/bootm.c [moved from lib_m68k/bootm.c with 100% similarity]
arch/m68k/lib/cache.c [moved from lib_m68k/cache.c with 100% similarity]
arch/m68k/lib/interrupts.c [moved from lib_m68k/interrupts.c with 100% similarity]
arch/m68k/lib/time.c [moved from lib_m68k/time.c with 100% similarity]
arch/m68k/lib/traps.c [moved from lib_m68k/traps.c with 100% similarity]
arch/microblaze/config.mk [moved from lib_microblaze/config.mk with 100% similarity]
arch/microblaze/lib/Makefile [moved from lib_microblaze/Makefile with 100% similarity]
arch/microblaze/lib/board.c [moved from lib_microblaze/board.c with 100% similarity]
arch/microblaze/lib/bootm.c [moved from lib_microblaze/bootm.c with 100% similarity]
arch/microblaze/lib/cache.c [moved from lib_microblaze/cache.c with 100% similarity]
arch/microblaze/lib/time.c [moved from lib_microblaze/time.c with 100% similarity]
arch/mips/config.mk [moved from lib_mips/config.mk with 100% similarity]
arch/mips/lib/Makefile [moved from lib_mips/Makefile with 100% similarity]
arch/mips/lib/board.c [moved from lib_mips/board.c with 100% similarity]
arch/mips/lib/bootm.c [moved from lib_mips/bootm.c with 100% similarity]
arch/mips/lib/bootm_qemu_mips.c [moved from lib_mips/bootm_qemu_mips.c with 100% similarity]
arch/mips/lib/time.c [moved from lib_mips/time.c with 100% similarity]
arch/nios/config.mk [moved from lib_nios/config.mk with 100% similarity]
arch/nios/lib/Makefile [moved from lib_nios/Makefile with 100% similarity]
arch/nios/lib/board.c [moved from lib_nios/board.c with 100% similarity]
arch/nios/lib/bootm.c [moved from lib_nios/bootm.c with 100% similarity]
arch/nios/lib/cache.c [moved from lib_nios/cache.c with 100% similarity]
arch/nios/lib/divmod.c [moved from lib_nios2/divmod.c with 100% similarity]
arch/nios/lib/math.h [moved from lib_nios2/math.h with 100% similarity]
arch/nios/lib/mult.c [moved from lib_nios2/mult.c with 100% similarity]
arch/nios/lib/time.c [moved from lib_nios2/time.c with 100% similarity]
arch/nios2/config.mk [moved from lib_nios2/config.mk with 100% similarity]
arch/nios2/lib/Makefile [moved from lib_nios2/Makefile with 100% similarity]
arch/nios2/lib/board.c [moved from lib_nios2/board.c with 100% similarity]
arch/nios2/lib/bootm.c [moved from lib_nios2/bootm.c with 100% similarity]
arch/nios2/lib/cache.S [moved from lib_nios2/cache.S with 100% similarity]
arch/nios2/lib/divmod.c [moved from lib_nios/divmod.c with 100% similarity]
arch/nios2/lib/math.h [moved from lib_nios/math.h with 100% similarity]
arch/nios2/lib/mult.c [moved from lib_nios/mult.c with 100% similarity]
arch/nios2/lib/time.c [moved from lib_nios/time.c with 100% similarity]
arch/ppc/config.mk [moved from lib_ppc/config.mk with 100% similarity]
arch/ppc/lib/Makefile [moved from lib_ppc/Makefile with 100% similarity]
arch/ppc/lib/bat_rw.c [moved from lib_ppc/bat_rw.c with 100% similarity]
arch/ppc/lib/board.c [moved from lib_ppc/board.c with 100% similarity]
arch/ppc/lib/bootm.c [moved from lib_ppc/bootm.c with 100% similarity]
arch/ppc/lib/cache.c [moved from lib_ppc/cache.c with 100% similarity]
arch/ppc/lib/extable.c [moved from lib_ppc/extable.c with 100% similarity]
arch/ppc/lib/interrupts.c [moved from lib_ppc/interrupts.c with 100% similarity]
arch/ppc/lib/kgdb.c [moved from lib_ppc/kgdb.c with 100% similarity]
arch/ppc/lib/ppccache.S [moved from lib_ppc/ppccache.S with 100% similarity]
arch/ppc/lib/ppcstring.S [moved from lib_ppc/ppcstring.S with 100% similarity]
arch/ppc/lib/reloc.S [moved from lib_ppc/reloc.S with 100% similarity]
arch/ppc/lib/ticks.S [moved from lib_ppc/ticks.S with 100% similarity]
arch/ppc/lib/time.c [moved from lib_ppc/time.c with 100% similarity]
arch/sh/config.mk [moved from lib_sh/config.mk with 100% similarity]
arch/sh/lib/Makefile [moved from lib_sh/Makefile with 100% similarity]
arch/sh/lib/board.c [moved from lib_sh/board.c with 100% similarity]
arch/sh/lib/bootm.c [moved from lib_sh/bootm.c with 100% similarity]
arch/sh/lib/time.c [moved from lib_sh/time.c with 100% similarity]
arch/sh/lib/time_sh2.c [moved from lib_sh/time_sh2.c with 100% similarity]
arch/sparc/config.mk [moved from lib_sparc/config.mk with 100% similarity]
arch/sparc/lib/Makefile [moved from lib_sparc/Makefile with 100% similarity]
arch/sparc/lib/board.c [moved from lib_sparc/board.c with 100% similarity]
arch/sparc/lib/bootm.c [moved from lib_sparc/bootm.c with 100% similarity]
arch/sparc/lib/cache.c [moved from lib_sparc/cache.c with 100% similarity]
arch/sparc/lib/interrupts.c [moved from lib_sparc/interrupts.c with 100% similarity]
arch/sparc/lib/time.c [moved from lib_sparc/time.c with 100% similarity]
board/LEOX/elpt860/u-boot.lds
board/RPXClassic/u-boot.lds
board/RPXlite/u-boot.lds
board/RPXlite_dw/u-boot.lds
board/RRvision/u-boot.lds
board/actux1/u-boot.lds
board/actux2/u-boot.lds
board/actux3/u-boot.lds
board/amirix/ap1000/u-boot.lds
board/astro/mcf5373l/u-boot.lds
board/c2mon/u-boot.lds
board/cobra5272/u-boot.lds
board/cray/L1/u-boot.lds.debug
board/emk/top860/u-boot.lds.debug
board/esd/tasreg/u-boot.lds
board/esteem192e/u-boot.lds
board/etx094/u-boot.lds.debug
board/fads/u-boot.lds.debug
board/freescale/m5208evbe/u-boot.lds
board/freescale/m52277evb/u-boot.spa
board/freescale/m5235evb/u-boot.16
board/freescale/m5235evb/u-boot.32
board/freescale/m5249evb/u-boot.lds
board/freescale/m5253demo/u-boot.lds
board/freescale/m5253evbe/u-boot.lds
board/freescale/m5271evb/u-boot.lds
board/freescale/m5272c3/u-boot.lds
board/freescale/m53017evb/u-boot.lds
board/freescale/m5329evb/u-boot.lds
board/freescale/m5373evb/u-boot.lds
board/freescale/m54451evb/u-boot.spa
board/freescale/m54451evb/u-boot.stm
board/freescale/m54455evb/u-boot.atm
board/freescale/m54455evb/u-boot.int
board/freescale/m547xevb/u-boot.lds
board/freescale/m548xevb/u-boot.lds
board/freescale/mpc7448hpc2/tsi108_init.c
board/freescale/mpc8610hpcd/u-boot.lds
board/freescale/mpc8641hpcn/u-boot.lds
board/freescale/mx31ads/u-boot.lds
board/genietv/u-boot.lds
board/genietv/u-boot.lds.debug
board/hermes/u-boot.lds
board/hermes/u-boot.lds.debug
board/hymod/u-boot.lds
board/icu862/u-boot.lds
board/icu862/u-boot.lds.debug
board/idmr/u-boot.lds
board/ip860/u-boot.lds
board/ip860/u-boot.lds.debug
board/ivm/u-boot.lds.debug
board/jse/jse.c
board/jse/sdram.c
board/keymile/km8xx/u-boot.lds
board/kup/kup4k/u-boot.lds
board/kup/kup4x/u-boot.lds
board/lantec/u-boot.lds
board/lwmon/u-boot.lds.debug
board/mbx8xx/u-boot.lds.debug
board/ml2/u-boot.lds
board/ml2/u-boot.lds.debug
board/mousse/u-boot.lds
board/mousse/u-boot.lds.rom
board/mpl/pip405/u-boot.lds.debug
board/netphone/u-boot.lds
board/netstal/hcu4/hcu4.c
board/netstal/hcu5/README.txt
board/netstal/hcu5/hcu5.c
board/netstal/mcu25/mcu25.c
board/netta/u-boot.lds
board/netta2/u-boot.lds
board/netvia/u-boot.lds
board/quantum/u-boot.lds
board/rbc823/u-boot.lds
board/rmu/u-boot.lds
board/sandburst/karef/u-boot.lds.debug
board/sandburst/metrobox/u-boot.lds.debug
board/sbc8641d/u-boot.lds
board/sc3/u-boot.lds
board/siemens/CCM/u-boot.lds
board/siemens/IAD210/u-boot.lds
board/siemens/pcu_e/u-boot.lds.debug
board/snmc/qs850/u-boot.lds
board/snmc/qs860t/u-boot.lds
board/spc1920/u-boot.lds
board/spd8xx/u-boot.lds.debug
board/stx/stxssa/stxssa.c
board/stx/stxxtc/u-boot.lds
board/svm_sc8xx/u-boot.lds
board/tqc/tqm8xx/u-boot.lds
board/uc100/u-boot.lds
board/v37/u-boot.lds
board/w7o/u-boot.lds.debug
board/westel/amx860/u-boot.lds
board/westel/amx860/u-boot.lds.debug
board/xes/xpedite1000/u-boot.lds.debug
board/xes/xpedite5170/u-boot.lds
config.mk
cpu/mpc5xxx/u-boot-customlayout.lds
doc/README.LED
doc/README.alaska8220
doc/README.m52277evb
doc/README.m53017evb
doc/README.m5373evb
doc/README.m54455evb
doc/README.m5475evb
doc/README.mpc5xx
doc/README.nios
doc/TODO-i386
examples/api/Makefile
include/asm-i386/interrupt.h
include/asm-i386/u-boot-i386.h
include/common.h
include/configs/B2.h
nand_spl/board/freescale/mpc8313erdb/Makefile
nand_spl/board/freescale/mpc8315erdb/Makefile
nand_spl/board/freescale/mpc8536ds/Makefile
nand_spl/board/freescale/mpc8569mds/Makefile
nand_spl/board/freescale/p1_p2_rdb/Makefile
nand_spl/board/sheldon/simpc8313/Makefile

index 8e3eb99..de8a4cd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,7 @@ endif
 ifeq ($(CPU),ixp)
 LIBS += cpu/ixp/npe/libnpe.a
 endif
-LIBS += lib_$(ARCH)/lib$(ARCH).a
+LIBS += arch/$(ARCH)/lib/lib$(ARCH).a
 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 \
        fs/ubifs/libubifs.a
@@ -257,7 +257,7 @@ LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
 # Add GCC lib
 ifdef USE_PRIVATE_LIBGCC
 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
-PLATFORM_LIBGCC = -L $(OBJTREE)/lib_$(ARCH) -lgcc
+PLATFORM_LIBGCC = -L $(OBJTREE)/arch/$(ARCH)/lib -lgcc
 else
 PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc
 endif
@@ -3743,7 +3743,7 @@ clean:
               $(obj)board/netstar/{eeprom,crcek,crcit,*.srec,*.bin}      \
               $(obj)board/trab/trab_fkt   $(obj)board/voiceblue/eeprom   \
               $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds  \
-              $(obj)lib_blackfin/u-boot.lds                              \
+              $(obj)arch/blackfin/lib/u-boot.lds                                 \
               $(obj)u-boot.lds                                           \
               $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
        @rm -f $(obj)include/bmp_logo.h
diff --git a/README b/README
index bb13bc6..dc2103f 100644 (file)
--- a/README
+++ b/README
@@ -182,19 +182,19 @@ Directory Hierarchy:
 - examples     Example code for standalone applications, etc.
 - fs           Filesystem code (cramfs, ext2, jffs2, etc.)
 - include      Header Files
-- lib_arm      Files generic to ARM     architecture
-- lib_avr32    Files generic to AVR32   architecture
-- lib_blackfin Files generic to Blackfin architecture
+- arch/arm/lib Files generic to ARM     architecture
+- arch/avr32/lib       Files generic to AVR32   architecture
+- arch/blackfin/lib    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_microblaze Files generic to microblaze architecture
-- lib_mips     Files generic to MIPS    architecture
-- lib_nios     Files generic to NIOS    architecture
-- lib_nios2    Files generic to NIOS2   architecture
-- lib_ppc      Files generic to PowerPC architecture
-- lib_sh       Files generic to SH      architecture
-- lib_sparc    Files generic to SPARC   architecture
+- arch/i386/lib        Files generic to i386    architecture
+- arch/m68k/lib        Files generic to m68k    architecture
+- arch/microblaze/lib Files generic to microblaze architecture
+- arch/mips/lib        Files generic to MIPS    architecture
+- arch/nios/lib        Files generic to NIOS    architecture
+- arch/nios/lib2       Files generic to NIOS2   architecture
+- arch/ppc/lib Files generic to PowerPC architecture
+- arch/sh/lib  Files generic to SH      architecture
+- arch/sparc/lib       Files generic to SPARC   architecture
 - libfdt       Library files to support flattened device trees
 - net          Networking code
 - post         Power On Self Test
@@ -1940,9 +1940,9 @@ Legacy uImage format:
    13  common/image.c          Start multifile image verification
    14  common/image.c          No initial ramdisk, no multifile, continue.
 
-   15  lib_<arch>/bootm.c      All preparation done, transferring control to OS
+   15  arch/<arch>/lib/bootm.c All preparation done, transferring control to OS
 
-  -30  lib_ppc/board.c         Fatal error, hang the system
+  -30  arch/ppc/lib/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()
 
similarity index 94%
rename from lib_arm/config.mk
rename to arch/arm/config.mk
index 8dd4dcc..e10dafc 100644 (file)
@@ -59,8 +59,8 @@ PLATFORM_CPPFLAGS += $(call cc-option,\
 # For EABI, make sure to provide raise()
 ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS)))
 # This file is parsed several times; make sure to add only once.
-ifeq (,$(findstring lib_arm/eabi_compat.o,$(PLATFORM_LIBS)))
-PLATFORM_LIBS += $(OBJTREE)/lib_arm/eabi_compat.o
+ifeq (,$(findstring arch/arm/lib/eabi_compat.o,$(PLATFORM_LIBS)))
+PLATFORM_LIBS += $(OBJTREE)/arch/arm/lib/eabi_compat.o
 endif
 endif
 LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds
similarity index 100%
rename from lib_arm/Makefile
rename to arch/arm/lib/Makefile
similarity index 100%
rename from lib_arm/_ashldi3.S
rename to arch/arm/lib/_ashldi3.S
similarity index 100%
rename from lib_arm/_ashrdi3.S
rename to arch/arm/lib/_ashrdi3.S
similarity index 100%
rename from lib_arm/_divsi3.S
rename to arch/arm/lib/_divsi3.S
similarity index 100%
rename from lib_arm/_lshrdi3.S
rename to arch/arm/lib/_lshrdi3.S
similarity index 100%
rename from lib_arm/_modsi3.S
rename to arch/arm/lib/_modsi3.S
similarity index 100%
rename from lib_arm/_udivsi3.S
rename to arch/arm/lib/_udivsi3.S
similarity index 100%
rename from lib_arm/_umodsi3.S
rename to arch/arm/lib/_umodsi3.S
similarity index 100%
rename from lib_arm/board.c
rename to arch/arm/lib/board.c
similarity index 100%
rename from lib_arm/bootm.c
rename to arch/arm/lib/bootm.c
similarity index 100%
rename from lib_arm/cache.c
rename to arch/arm/lib/cache.c
similarity index 100%
rename from lib_arm/div0.c
rename to arch/arm/lib/div0.c
similarity index 100%
rename from lib_arm/reset.c
rename to arch/arm/lib/reset.c
similarity index 100%
rename from lib_avr32/config.mk
rename to arch/avr32/config.mk
similarity index 100%
rename from lib_avr32/Makefile
rename to arch/avr32/lib/Makefile
similarity index 100%
rename from lib_avr32/board.c
rename to arch/avr32/lib/board.c
similarity index 100%
rename from lib_avr32/bootm.c
rename to arch/avr32/lib/bootm.c
similarity index 100%
rename from lib_avr32/memset.S
rename to arch/avr32/lib/memset.S
similarity index 97%
rename from lib_blackfin/config.mk
rename to arch/blackfin/config.mk
index 3ecade9..137834e 100644 (file)
@@ -68,5 +68,5 @@ endif
 LDR_FLAGS += $(LDR_FLAGS-y)
 
 ifeq ($(wildcard $(TOPDIR)/board/$(BOARD)/u-boot.lds*),)
-LDSCRIPT = $(obj)lib_$(ARCH)/u-boot.lds.S
+LDSCRIPT = $(obj)arch/$(ARCH)/lib/u-boot.lds.S
 endif
similarity index 100%
rename from lib_blackfin/boot.c
rename to arch/blackfin/lib/boot.c
similarity index 100%
rename from lib_blackfin/ins.S
rename to arch/blackfin/lib/ins.S
similarity index 100%
rename from lib_blackfin/kgdb.c
rename to arch/blackfin/lib/kgdb.c
similarity index 100%
rename from lib_blackfin/kgdb.h
rename to arch/blackfin/lib/kgdb.h
similarity index 100%
rename from lib_blackfin/outs.S
rename to arch/blackfin/lib/outs.S
similarity index 100%
rename from lib_blackfin/post.c
rename to arch/blackfin/lib/post.c
similarity index 100%
rename from lib_i386/config.mk
rename to arch/i386/config.mk
similarity index 100%
rename from lib_i386/Makefile
rename to arch/i386/lib/Makefile
similarity index 100%
rename from lib_i386/bios.S
rename to arch/i386/lib/bios.S
similarity index 100%
rename from lib_i386/bios.h
rename to arch/i386/lib/bios.h
similarity index 100%
rename from lib_i386/bios_pci.S
rename to arch/i386/lib/bios_pci.S
similarity index 100%
rename from lib_i386/board.c
rename to arch/i386/lib/board.c
similarity index 100%
rename from lib_i386/bootm.c
rename to arch/i386/lib/bootm.c
similarity index 100%
rename from lib_i386/pci.c
rename to arch/i386/lib/pci.c
similarity index 100%
rename from lib_i386/realmode.c
rename to arch/i386/lib/realmode.c
similarity index 100%
rename from lib_i386/timer.c
rename to arch/i386/lib/timer.c
similarity index 100%
rename from lib_i386/video.c
rename to arch/i386/lib/video.c
similarity index 100%
rename from lib_i386/zimage.c
rename to arch/i386/lib/zimage.c
similarity index 100%
rename from lib_m68k/config.mk
rename to arch/m68k/config.mk
similarity index 100%
rename from lib_m68k/Makefile
rename to arch/m68k/lib/Makefile
similarity index 100%
rename from lib_m68k/board.c
rename to arch/m68k/lib/board.c
similarity index 100%
rename from lib_m68k/bootm.c
rename to arch/m68k/lib/bootm.c
similarity index 100%
rename from lib_m68k/cache.c
rename to arch/m68k/lib/cache.c
similarity index 100%
rename from lib_m68k/time.c
rename to arch/m68k/lib/time.c
similarity index 100%
rename from lib_m68k/traps.c
rename to arch/m68k/lib/traps.c
similarity index 100%
rename from lib_mips/config.mk
rename to arch/mips/config.mk
similarity index 100%
rename from lib_mips/Makefile
rename to arch/mips/lib/Makefile
similarity index 100%
rename from lib_mips/board.c
rename to arch/mips/lib/board.c
similarity index 100%
rename from lib_mips/bootm.c
rename to arch/mips/lib/bootm.c
similarity index 100%
rename from lib_mips/time.c
rename to arch/mips/lib/time.c
similarity index 100%
rename from lib_nios/config.mk
rename to arch/nios/config.mk
similarity index 100%
rename from lib_nios/Makefile
rename to arch/nios/lib/Makefile
similarity index 100%
rename from lib_nios/board.c
rename to arch/nios/lib/board.c
similarity index 100%
rename from lib_nios/bootm.c
rename to arch/nios/lib/bootm.c
similarity index 100%
rename from lib_nios/cache.c
rename to arch/nios/lib/cache.c
similarity index 100%
rename from lib_nios2/divmod.c
rename to arch/nios/lib/divmod.c
similarity index 100%
rename from lib_nios2/math.h
rename to arch/nios/lib/math.h
similarity index 100%
rename from lib_nios2/mult.c
rename to arch/nios/lib/mult.c
similarity index 100%
rename from lib_nios2/time.c
rename to arch/nios/lib/time.c
similarity index 100%
rename from lib_nios2/config.mk
rename to arch/nios2/config.mk
similarity index 100%
rename from lib_nios2/Makefile
rename to arch/nios2/lib/Makefile
similarity index 100%
rename from lib_nios2/board.c
rename to arch/nios2/lib/board.c
similarity index 100%
rename from lib_nios2/bootm.c
rename to arch/nios2/lib/bootm.c
similarity index 100%
rename from lib_nios2/cache.S
rename to arch/nios2/lib/cache.S
similarity index 100%
rename from lib_nios/divmod.c
rename to arch/nios2/lib/divmod.c
similarity index 100%
rename from lib_nios/math.h
rename to arch/nios2/lib/math.h
similarity index 100%
rename from lib_nios/mult.c
rename to arch/nios2/lib/mult.c
similarity index 100%
rename from lib_nios/time.c
rename to arch/nios2/lib/time.c
similarity index 100%
rename from lib_ppc/config.mk
rename to arch/ppc/config.mk
similarity index 100%
rename from lib_ppc/Makefile
rename to arch/ppc/lib/Makefile
similarity index 100%
rename from lib_ppc/bat_rw.c
rename to arch/ppc/lib/bat_rw.c
similarity index 100%
rename from lib_ppc/board.c
rename to arch/ppc/lib/board.c
similarity index 100%
rename from lib_ppc/bootm.c
rename to arch/ppc/lib/bootm.c
similarity index 100%
rename from lib_ppc/cache.c
rename to arch/ppc/lib/cache.c
similarity index 100%
rename from lib_ppc/extable.c
rename to arch/ppc/lib/extable.c
similarity index 100%
rename from lib_ppc/kgdb.c
rename to arch/ppc/lib/kgdb.c
similarity index 100%
rename from lib_ppc/ppccache.S
rename to arch/ppc/lib/ppccache.S
similarity index 100%
rename from lib_ppc/ppcstring.S
rename to arch/ppc/lib/ppcstring.S
similarity index 100%
rename from lib_ppc/reloc.S
rename to arch/ppc/lib/reloc.S
similarity index 100%
rename from lib_ppc/ticks.S
rename to arch/ppc/lib/ticks.S
similarity index 100%
rename from lib_ppc/time.c
rename to arch/ppc/lib/time.c
similarity index 100%
rename from lib_sh/config.mk
rename to arch/sh/config.mk
similarity index 100%
rename from lib_sh/Makefile
rename to arch/sh/lib/Makefile
similarity index 100%
rename from lib_sh/board.c
rename to arch/sh/lib/board.c
similarity index 100%
rename from lib_sh/bootm.c
rename to arch/sh/lib/bootm.c
similarity index 100%
rename from lib_sh/time.c
rename to arch/sh/lib/time.c
similarity index 100%
rename from lib_sh/time_sh2.c
rename to arch/sh/lib/time_sh2.c
similarity index 100%
rename from lib_sparc/config.mk
rename to arch/sparc/config.mk
similarity index 100%
rename from lib_sparc/Makefile
rename to arch/sparc/lib/Makefile
similarity index 100%
rename from lib_sparc/board.c
rename to arch/sparc/lib/board.c
similarity index 100%
rename from lib_sparc/bootm.c
rename to arch/sparc/lib/bootm.c
similarity index 100%
rename from lib_sparc/cache.c
rename to arch/sparc/lib/cache.c
similarity index 100%
rename from lib_sparc/time.c
rename to arch/sparc/lib/time.c
index 3c44b3e..32778ca 100644 (file)
@@ -66,15 +66,15 @@ SECTIONS
 
     cpu/mpc8xx/start.o                 (.text)
     common/dlmalloc.o                  (.text)
-    lib_ppc/ppcstring.o                        (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o                       (.text)
+    arch/ppc/lib/extable.o                     (.text)
+    arch/ppc/lib/time.o                        (.text)
+    arch/ppc/lib/ticks.o                       (.text)
 
     . = env_offset;
     common/env_embedded.o              (.text)
index 47247ec..c354ff8 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 47247ec..c354ff8 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 7ae7be0..89aafff 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index f22b25f..88644a4 100644 (file)
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     . = env_offset;
     common/env_embedded.o      (.ppcenv)
index 836775f..1087167 100644 (file)
@@ -33,7 +33,7 @@ SECTIONS
                cpu/ixp/start.o(.text)
                lib_generic/string.o(.text)
                lib_generic/vsprintf.o(.text)
-               lib_arm/board.o(.text)
+               arch/arm/lib/board.o(.text)
                common/dlmalloc.o(.text)
                cpu/ixp/cpu.o(.text)
                . = env_offset;
index 0752656..543af30 100644 (file)
@@ -33,7 +33,7 @@ SECTIONS
                cpu/ixp/start.o(.text)
                lib_generic/string.o(.text)
                lib_generic/vsprintf.o(.text)
-               lib_arm/board.o(.text)
+               arch/arm/lib/board.o(.text)
                common/dlmalloc.o(.text)
                cpu/ixp/cpu.o(.text)
 
index a69e7db..f63251d 100644 (file)
@@ -33,7 +33,7 @@ SECTIONS
                cpu/ixp/start.o (.text)
                lib_generic/string.o (.text)
                lib_generic/vsprintf.o (.text)
-               lib_arm/board.o (.text)
+               arch/arm/lib/board.o (.text)
                common/dlmalloc.o (.text)
                cpu/ixp/cpu.o (.text)
 
index 707203d..10308d5 100644 (file)
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
index a9a4e0a..7fbe16f 100644 (file)
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf532x/start.o                (.text)
-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
index 2d0efb3..0571f02 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 7e716bb..8989880 100644 (file)
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
     cpu/mcf52x2/start.o                (.text)
     cpu/mcf52x2/cpu_init.o     (.text)
-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
index 970628d..40d2f78 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     common/env_embedded.o(.text)
 
index bfe8513..4e4943f 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index e3230b9..54e0169 100644 (file)
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
index 3e4490e..215a2c4 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 1af61fb..dd4dbfa 100644 (file)
@@ -62,8 +62,8 @@ SECTIONS
     cpu/mpc8xx/cpu_init.o      (.text)
     cpu/mpc8xx/speed.o (.text)
     cpu/mpc8xx/serial.o        (.text)
-    lib_ppc/extable.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/extable.o     (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/string.o       (.text)
     lib_generic/crc32.o                (.text)
     common/dlmalloc.o  (.text)
index 0a3b958..8d91aed 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index bc9d5cd..3877527 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mcf52x2/start.o                (.text)
     cpu/mcf52x2/libmcf52x2.a   (.text)
-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/lib/libm68k.a            (.text)
     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
index 7ae70d4..23d5710 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mcf5227x/start.o       (.text)
     cpu/mcf5227x/libmcf5227x.a (.text)
-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/lib/libm68k.a            (.text)
     lib_generic/libgeneric.a   (.text)
     common/cmd_mem.o           (.text)
     common/main.o              (.text)
index c134884..940da14 100644 (file)
@@ -57,8 +57,8 @@ SECTIONS
 
     cpu/mcf523x/start.o                (.text)
     cpu/mcf523x/cpu_init.o     (.text)
-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
index 53c337d..50045e1 100644 (file)
@@ -60,7 +60,7 @@ SECTIONS
     cpu/mcf523x/cpu_init.o     (.text)
     cpu/mcf523x/interrupts.o   (.text)
     cpu/mcf523x/speed.o                (.text)
-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/lib/libm68k.a            (.text)
     common/dlmalloc.o          (.text)
     common/cmd_bootm.o         (.text)
     common/cmd_flash.o         (.text)
index e3230b9..54e0169 100644 (file)
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
index 6cb5ee0..e53e67d 100644 (file)
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
index 132fccf..7f4dc27 100644 (file)
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
index 00c1f2a..713b18a 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
index 9d20b22..446ec1b 100644 (file)
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
index c79d06c..fe0e314 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mcf532x/start.o                (.text)
     cpu/mcf532x/libmcf532x.a   (.text)
-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/lib/libm68k.a            (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
index af31098..0ed87ff 100644 (file)
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf532x/start.o                (.text)
-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
index dff74b6..605452b 100644 (file)
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf532x/start.o                (.text)
-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
index d8caefa..569518b 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mcf5445x/start.o               (.text)
     cpu/mcf5445x/libmcf5445x.a (.text)
-    lib_m68k/libm68k.a         (.text)
+    arch/m68k/lib/libm68k.a            (.text)
     common/cmd_flash.o         (.text)
     common/dlmalloc.o          (.text)
     common/main.o              (.text)
index e9eac67..1b06b12 100644 (file)
@@ -61,7 +61,7 @@ SECTIONS
     cpu/mcf5445x/dspi.o                        (.text)
     cpu/mcf5445x/interrupt.o           (.text)
     cpu/mcf5445x/speed.o               (.text)
-    lib_m68k/board.o                   (.text)
+    arch/m68k/lib/board.o                      (.text)
     common/serial.o                    (.text)
     common/console.o                   (.text)
     lib_generic/display_options.o      (.text)
index 08e184c..c48dd75 100644 (file)
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf5445x/start.o               (.text)
-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
index 4d504a2..ef07174 100644 (file)
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf5445x/start.o               (.text)
-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
 
index a3014bd..5f28a10 100644 (file)
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf547x_8x/start.o             (.text)
-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
index a3014bd..5f28a10 100644 (file)
@@ -56,8 +56,8 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf547x_8x/start.o             (.text)
-    lib_m68k/traps.o           (.text)
-    lib_m68k/interrupts.o      (.text)
+    arch/m68k/lib/traps.o              (.text)
+    arch/m68k/lib/interrupts.o (.text)
     common/dlmalloc.o          (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
index 74bb564..c6a3ade 100644 (file)
@@ -323,7 +323,7 @@ int board_early_init_r (void)
         * We will over-ride the env_init called in board_init_f
         * 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)
+        * (arch/ppc/lib/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
         * Taiga Rev. 2.
index b573807..2ad0f0e 100644 (file)
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)
-    lib_ppc/extable.o (.text)
+    arch/ppc/lib/extable.o (.text)
     lib_generic/zlib.o (.text)
     *(.text)
     *(.got1)
index 2b98b5a..796828a 100644 (file)
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)
-    lib_ppc/extable.o (.text)
+    arch/ppc/lib/extable.o (.text)
     lib_generic/zlib.o (.text)
     drivers/bios_emulator/atibios.o (.text)
     *(.text)
index 3182aa6..6f5bda4 100644 (file)
@@ -39,7 +39,7 @@ SECTIONS
 
          cpu/arm1136/start.o                   (.text)
          board/freescale/mx31ads/libmx31ads.a  (.text)
-         lib_arm/libarm.a                      (.text)
+         arch/arm/lib/libarm.a                 (.text)
          net/libnet.a                          (.text)
          drivers/mtd/libmtd.a                  (.text)
 
index 716efcd..9fc71a2 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 3568e6d..9bb2c58 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 7b74cb7..1252baf 100644 (file)
@@ -58,9 +58,9 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     common/dlmalloc.o          (.text)
     cpu/mpc8xx/interrupts.o    (.text)
-    lib_ppc/time.o             (.text)
-    lib_ppc/ticks.o            (.text)
-    lib_ppc/cache.o            (.text)
+    arch/ppc/lib/time.o                (.text)
+    arch/ppc/lib/ticks.o               (.text)
+    arch/ppc/lib/cache.o               (.text)
     lib_generic/crc32.o                (.text)
     . = env_offset;
     common/env_embedded.o(.text)
index 3801206..dc810be 100644 (file)
@@ -56,10 +56,10 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mpc8xx/start.o (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     cpu/mpc8xx/interrupts.o (.text)
-    lib_ppc/time.o             (.text)
-    lib_ppc/ticks.o            (.text)
+    arch/ppc/lib/time.o                (.text)
+    arch/ppc/lib/ticks.o               (.text)
     . = env_offset;
     common/env_embedded.o(.text)
 
index 52d66a2..cc32b44 100644 (file)
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc8260/start.o        (.text)
 /*
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index b43be81..b614262 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
 /*
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 653e0be..919eb21 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 00c1f2a..713b18a 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mcf52x2/start.o                (.text)
-    lib_m68k/traps.o           (.text)
+    arch/m68k/lib/traps.o              (.text)
     cpu/mcf52x2/interrupts.o   (.text)
     common/dlmalloc.o          (.text)
     lib_generic/zlib.o         (.text)
index a786bf2..bbc7139 100644 (file)
@@ -57,10 +57,10 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     cpu/mpc8xx/interrupts.o (.text)
-    lib_ppc/time.o             (.text)
-    lib_ppc/ticks.o            (.text)
+    arch/ppc/lib/time.o                (.text)
+    arch/ppc/lib/ticks.o               (.text)
 /**
     . = env_offset;
     common/env_embedded.o(.text)
index dc2f6e1..fc8fe6c 100644 (file)
@@ -56,10 +56,10 @@ SECTIONS
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     cpu/mpc8xx/start.o (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     cpu/mpc8xx/interrupts.o (.text)
-    lib_ppc/time.o             (.text)
-    lib_ppc/ticks.o            (.text)
+    arch/ppc/lib/time.o                (.text)
+    arch/ppc/lib/ticks.o               (.text)
 /**
     . = env_offset;
     common/env_embedded.o(.text)
index b5206c5..17965a0 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 1849ca4..e4c7b9d 100644 (file)
@@ -26,7 +26,7 @@
 
 /*
  * 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 arch/ppc/lib/board.c:board_init_f by virtue
  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called
@@ -85,7 +85,7 @@ int board_pre_init (void)
 #endif
 
 /*
- * This function is also called by lib_ppc/board.c:board_init_f (it is
+ * This function is also called by arch/ppc/lib/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.
  */
@@ -149,7 +149,7 @@ int checkboard (void)
 /* **** No more functions called by board_init_f. **** */
 
 /*
- * This function is called by lib_ppc/board.c:board_init_r. At this
+ * This function is called by arch/ppc/lib/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.
  */
index 88fdd84..a12ebde 100644 (file)
@@ -27,7 +27,7 @@
 /*
  * 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 arch/ppc/lib/board.c to initialize the memory and return what I
  * found.
  */
 phys_size_t initdram (int board_type)
index a8057f2..8b6305a 100644 (file)
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.ppcenv)
index 79b886a..8e4faa1 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
 /*
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 79b886a..8e4faa1 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
 /*
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 854ed68..814a7a6 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 987c4dd..49f8972 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 0a3b958..8d91aed 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 8fea3be..0083a21 100644 (file)
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
index 970628d..40d2f78 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     common/env_embedded.o(.text)
 
index 5100542..c92a2ab 100644 (file)
@@ -53,8 +53,8 @@ SECTIONS
   .text      :
   {
     cpu/mpc824x/start.o                (.text)
-    lib_ppc/board.o            (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/board.o               (.text)
+    arch/ppc/lib/ppcstring.o           (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index f79c39f..9750fc5 100644 (file)
@@ -54,7 +54,7 @@ SECTIONS
   {
     cpu/mpc824x/start.o        (.text)
         common/board.o (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 970628d..40d2f78 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     common/env_embedded.o(.text)
 
index d64274b..4b17a1f 100644 (file)
@@ -55,12 +55,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 8efbc23..3f07ff1 100644 (file)
@@ -34,7 +34,7 @@ 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 arch/ppc/lib/board.c:board_init_f by virtue
  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called
index f649876..0a54f9a 100644 (file)
@@ -109,7 +109,7 @@ _start:
        call cpu_init_f /* run low-level CPU init code     (from Flash) */
 
     call cpu_init_f
-    board_init_f: (lib_ppc\board.c)
+    board_init_f: (arch/ppc/lib\board.c)
        init_sequence defines a list of function to be called
            board_early_init_f: (board/netstal/hcu5/hcu5.c)
                We are using Bootstrap-Option A
@@ -141,7 +141,7 @@ _start:
 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: (arch/ppc/lib\board.c)
        setup bd function pointers
        trap_init
        flash_init: (board/netstal/hcu5/flash.c)
@@ -162,7 +162,7 @@ Most of the HW specific code for the HCU5 may be found in
 include/configs/hcu5.h
 board/netstal/hcu5/*
 cpu/ppc4xx/*
-lib_ppc/*
+arch/ppc/lib/*
 include/ppc440.h
 
 Drivers for serial etc are found under drivers/
index c545cc0..90433fe 100644 (file)
@@ -49,7 +49,7 @@ 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 arch/ppc/lib/board.c:board_init_f by virtue
  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called
index c66ab97..cc2f998 100644 (file)
@@ -39,7 +39,7 @@ 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 arch/ppc/lib/board.c:board_init_f by virtue
  * of being in the init_sequence array.
  *
  * The SDRAM has been initialized already -- start.S:start called
index 860c887..991d7a1 100644 (file)
@@ -55,12 +55,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 860c887..991d7a1 100644 (file)
@@ -55,12 +55,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index a7d290a..7eb01ee 100644 (file)
@@ -55,12 +55,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 47247ec..c354ff8 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index e0ea600..6074c14 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 47247ec..c354ff8 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 48fd579..1d8ce10 100644 (file)
@@ -67,7 +67,7 @@ SECTIONS
     drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
     lib_generic/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */
index 4bc5cea..bbfea13 100644 (file)
@@ -67,7 +67,7 @@ SECTIONS
     drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
     lib_generic/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */
index b71a7d6..648efa2 100644 (file)
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)
-    lib_ppc/extable.o (.text)
+    arch/ppc/lib/extable.o (.text)
     lib_generic/zlib.o (.text)
     *(.text)
     *(.got1)
index 16dc384..04b350a 100644 (file)
@@ -70,7 +70,7 @@ SECTIONS
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
     lib_generic/zlib.o         (.text)
 
 /*    . = env_offset;*/
index 2d0efb3..0571f02 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 104b44c..877cf9a 100644 (file)
@@ -57,9 +57,9 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     cpu/mpc8xx/interrupts.o (.text)
-    lib_ppc/time.o             (.text)
+    arch/ppc/lib/time.o                (.text)
     . = env_offset;
     common/env_embedded.o(.text)
 
index 987c4dd..49f8972 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 9ef2c20..ce115f5 100644 (file)
@@ -58,12 +58,12 @@ SECTIONS
        cpu/mpc8xx/start.o              (.text)
        cpu/mpc8xx/traps.o              (.text)
        common/dlmalloc.o               (.text)
-       lib_ppc/ppcstring.o             (.text)
+       arch/ppc/lib/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)
+       arch/ppc/lib/cache.o            (.text)
+       arch/ppc/lib/time.o             (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
        common/env_embedded.o   (.ppcenv)
index 9ef2c20..ce115f5 100644 (file)
@@ -58,12 +58,12 @@ SECTIONS
        cpu/mpc8xx/start.o              (.text)
        cpu/mpc8xx/traps.o              (.text)
        common/dlmalloc.o               (.text)
-       lib_ppc/ppcstring.o             (.text)
+       arch/ppc/lib/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)
+       arch/ppc/lib/cache.o            (.text)
+       arch/ppc/lib/time.o             (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
        common/env_embedded.o   (.ppcenv)
index d6711b5..172cfbb 100644 (file)
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.ppcenv)
index 0a3b958..8d91aed 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index 73dddf3..678ec58 100644 (file)
@@ -259,7 +259,7 @@ board_early_init_f(void)
 #endif
 
        /* Why is the phy reset done _after_ the ethernet
-        * initialization in lib_ppc/board.c?
+        * initialization in arch/ppc/lib/board.c?
         * Do it here so it's done before the TSECs are used.
         */
        reset_phy();
index 860c887..991d7a1 100644 (file)
@@ -55,12 +55,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.text)
index 02aa9dd..cf78200 100644 (file)
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     . = env_offset;
     common/env_embedded.o      (.ppcenv)
index 2df8d84..9f452c1 100644 (file)
@@ -58,11 +58,11 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/ppcstring.o           (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
-    lib_ppc/cache.o            (.text)
+    arch/ppc/lib/cache.o               (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o      (.ppcenv)
index e3ea52a..967e432 100644 (file)
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
     common/env_embedded.o      (.text)
 
index 6f2ea9a..c3dd8c7 100644 (file)
@@ -58,12 +58,12 @@ SECTIONS
     cpu/mpc8xx/start.o         (.text)
     cpu/mpc8xx/traps.o         (.text)
     common/dlmalloc.o          (.text)
-    lib_ppc/ppcstring.o                (.text)
+    arch/ppc/lib/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)
+    arch/ppc/lib/cache.o               (.text)
+    arch/ppc/lib/time.o                (.text)
 
 /*
     . = env_offset;
index 8bb4929..85b1cd6 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     common/env_embedded.o(.text)
 
index 2d0efb3..0571f02 100644 (file)
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
index 653e0be..919eb21 100644 (file)
@@ -59,7 +59,7 @@ SECTIONS
     common/dlmalloc.o  (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
index d00834e..0830d0a 100644 (file)
@@ -65,7 +65,7 @@ SECTIONS
     cpu/ppc4xx/speed.o (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
-    lib_ppc/extable.o  (.text)
+    arch/ppc/lib/extable.o     (.text)
     lib_generic/zlib.o         (.text)
 
 /*    common/env_embedded.o(.text) */
index b71a7d6..648efa2 100644 (file)
@@ -58,7 +58,7 @@ SECTIONS
     cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib_generic/crc32.o (.text)
-    lib_ppc/extable.o (.text)
+    arch/ppc/lib/extable.o (.text)
     lib_generic/zlib.o (.text)
     *(.text)
     *(.got1)
index 1a61dbb..85b524e 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -114,7 +114,7 @@ sinclude $(OBJTREE)/include/autoconf.mk
 # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files.
 CPUDIR=cpu/$(CPU)
 
-sinclude $(TOPDIR)/lib_$(ARCH)/config.mk       # include architecture dependend rules
+sinclude $(TOPDIR)/arch/$(ARCH)/config.mk      # include architecture dependend rules
 sinclude $(TOPDIR)/$(CPUDIR)/config.mk         # include  CPU  specific rules
 
 ifdef  SOC
index c340086..c08c9c9 100644 (file)
@@ -58,8 +58,8 @@ SECTIONS
     cpu/mpc5xxx/start.o          (.text)
     cpu/mpc5xxx/traps.o          (.text)
     lib_generic/crc32.o         (.text)
-    lib_ppc/cache.o             (.text)
-    lib_ppc/time.o              (.text)
+    arch/ppc/lib/cache.o             (.text)
+    arch/ppc/lib/time.o              (.text)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o        (.ppcenv)
index 94e552a..c3bcb3a 100644 (file)
@@ -69,7 +69,7 @@ yellow_LED_off
 blue_LED_on
 blue_LED_off
 
-These are weakly defined in lib_arm/board.c to noops. Where applicable, define
+These are weakly defined in arch/arm/lib/board.c to noops. Where applicable, define
 these functions in the board specific source.
 
 TBD : Describe older board dependent macros similar to what is done for
index 0bd68d9..279dac6 100644 (file)
@@ -22,7 +22,7 @@ Changed files:
 - include/asm-ppc/global_data.h added global variables - inp_clk, pci_clk,
                            vco_clk, pev_clk, flb_clk, and bExtUart
 
-- lib_ppc/board.c          added CONFIG_MPC8220 support
+- arch/ppc/lib/board.c     added CONFIG_MPC8220 support
 
 - net/eth.c                added FEC support for MPC8220
 
index 40f9028..f30b45e 100644 (file)
@@ -53,12 +53,12 @@ Changed files:
 
 - include/configs/M52277EVB.h          Board specific configuration file
 
-- 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
+- arch/m68k/lib/board.c                        board init function
+- arch/m68k/lib/cache.c
+- arch/m68k/lib/interrupts                     Coldfire common interrupt functions
+- arch/m68k/lib/m68k_linux.c
+- arch/m68k/lib/time.c                 Timer functions (Dma timer and PIT)
+- arch/m68k/lib/traps.c                        Exception init code
 
 1 MCF52277 specific Options/Settings
 ====================================
index 60cfa95..780a803 100644 (file)
@@ -51,12 +51,12 @@ Changed files:
 
 - include/configs/M53017EVB.h          Board specific configuration file
 
-- 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
+- arch/m68k/lib/board.c                        board init function
+- arch/m68k/lib/cache.c
+- arch/m68k/lib/interrupts                     Coldfire common interrupt functions
+- arch/m68k/lib/m68k_linux.c
+- arch/m68k/lib/time.c                 Timer functions (Dma timer and PIT)
+- arch/m68k/lib/traps.c                        Exception init code
 
 1 MCF5301x specific Options/Settings
 ====================================
index 5591748..24a659b 100644 (file)
@@ -50,12 +50,12 @@ Changed files:
 
 - include/configs/M5373EVB.h           Board specific configuration file
 
-- 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
+- arch/m68k/lib/board.c                        board init function
+- arch/m68k/lib/cache.c
+- arch/m68k/lib/interrupts                     Coldfire common interrupt functions
+- arch/m68k/lib/m68k_linux.c
+- arch/m68k/lib/time.c                 Timer functions (Dma timer and PIT)
+- arch/m68k/lib/traps.c                        Exception init code
 
 1 MCF5373 specific Options/Settings
 ====================================
index 1888e16..257bcd5 100644 (file)
@@ -52,12 +52,12 @@ Changed files:
 
 - include/configs/M54455EVB.h  Board specific configuration file
 
-- 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
+- arch/m68k/lib/board.c                        board init function
+- arch/m68k/lib/cache.c
+- arch/m68k/lib/interrupts                     Coldfire common interrupt functions
+- arch/m68k/lib/m68k_linux.c
+- arch/m68k/lib/time.c                 Timer functions (Dma timer and PIT)
+- arch/m68k/lib/traps.c                        Exception init code
 
 - rtc/mcfrtc.c                         Realtime clock Driver
 
index f3a1d7b..b61dfba 100644 (file)
@@ -58,11 +58,11 @@ Changed files:
 
 - include/configs/M5475EVB.h           Board specific configuration file
 
-- 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
+- arch/m68k/lib/board.c                        board init function
+- arch/m68k/lib/cache.c
+- arch/m68k/lib/interrupts                     Coldfire common interrupt functions
+- arch/m68k/lib/m68k_linux.c
+- arch/m68k/lib/traps.c                        Exception init code
 
 1 MCF547x specific Options/Settings
 ====================================
index 07be863..2e12174 100644 (file)
@@ -34,9 +34,9 @@ u-boot-0.2.0/include/mpc5xx.h
 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/arch/ppc/lib/board.c
+u-boot-0.2.0/arch/ppc/lib/cache.c
+u-boot-0.2.0/arch/ppc/lib/time.c
 u-boot-0.2.0/Makefile
 u-boot-0.2.0/CREDITS
 u-boot-0.2.0/doc/README.mpc5xx
index 7f34938..da30ff5 100644 (file)
@@ -244,7 +244,7 @@ cover most of the individual functions to get you started.
 
                (gdb) directory common
                (gdb) directory cpu/nios
-               (gdb) directory lib_nios
+               (gdb) directory arch/nios/lib
                (gdb) directory board/altera/dk1c20
 
        Note that the last command is for the DK1C20 board only. If you
index 84113f8..2261f4a 100644 (file)
@@ -8,7 +8,7 @@ i386 port missing features:
 * re-entry of protected mode from real mode, should be added to realmode_switch.S 
   (and used by INT 10h and INT 16h handlers for console I/O during early
    linux boot...) 
-* missing functions in lib_i386 and cpu/i386
+* missing functions in arch/i386/lib and cpu/i386
 * speaker beep interface
 
 
index d4c5ca2..62751ec 100644 (file)
@@ -47,7 +47,7 @@ EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/string.o
 EXT_COBJ_FILES-$(CONFIG_API) += lib_generic/time.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) += arch/ppc/lib/ppcstring.o
 endif
 
 # Create a list of source files so their dependencies can be auto-generated
@@ -79,7 +79,7 @@ $(obj)%.o: $(SRCTREE)/lib_generic/%.c
        $(CC) -g $(CFLAGS) -c -o $@ $<
 
 # Rule to build architecture-specific library assembly files
-$(obj)%.o: $(SRCTREE)/lib_$(ARCH)/%.S
+$(obj)%.o: $(SRCTREE)/arch/$(ARCH)/lib/%.S
        $(CC) -g $(CFLAGS) -c -o $@ $<
 
 #########################################################################
index 3e2674a..8d324d9 100644 (file)
@@ -30,7 +30,7 @@
 /* cpu/i386/interrupts.c */
 void set_vector(u8 intnum, void *routine);
 
-/* lib_i386/interupts.c */
+/* arch/i386/lib/interupts.c */
 void disable_irq(int irq);
 void enable_irq(int irq);
 
index 7c99c8c..a08632d 100644 (file)
@@ -33,7 +33,7 @@ void timer_isr(void *);
 typedef void (timer_fnc_t) (void);
 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/, arch/i386/lib/, or $(BOARD)/ */
 int timer_init(void);
 
 /* cpu/.../interrupts.c */
@@ -46,7 +46,7 @@ int dram_init(void);
 void isa_unmap_rom(u32 addr);
 u32 isa_map_rom(u32 bus_addr, int size);
 
-/* lib_i386/... */
+/* arch/i386/lib/... */
 int video_bios_init(void);
 int video_init(void);
 
index a133e34..7aa910d 100644 (file)
@@ -230,7 +230,7 @@ int parse_line (char *, char *[]);
 void   init_cmd_timeout(void);
 void   reset_cmd_timeout(void);
 
-/* lib_$(ARCH)/board.c */
+/* arch/$(ARCH)/lib/board.c */
 void   board_init_f  (ulong) __attribute__ ((noreturn));
 void   board_init_r  (gd_t *, ulong) __attribute__ ((noreturn));
 int    checkboard    (void);
@@ -604,17 +604,17 @@ ulong     vfd_setmem (ulong);
 /* $(CPU)/.../video.c */
 ulong  video_setmem (ulong);
 
-/* lib_$(ARCH)/cache.c */
+/* arch/$(ARCH)/lib/cache.c */
 void   flush_cache   (unsigned long, unsigned long);
 void   flush_dcache_range(unsigned long start, unsigned long stop);
 void   invalidate_dcache_range(unsigned long start, unsigned long stop);
 
 
-/* lib_$(ARCH)/ticks.S */
+/* arch/$(ARCH)/lib/ticks.S */
 unsigned long long get_ticks(void);
 void   wait_ticks    (unsigned long);
 
-/* lib_$(ARCH)/time.c */
+/* arch/$(ARCH)/lib/time.c */
 void   __udelay      (unsigned long);
 ulong  usec2ticks    (unsigned long usec);
 ulong  ticks2usec    (unsigned long ticks);
index f51a261..ca7350d 100644 (file)
 */
 
 /*
-       Linux TAGs (see lib_arm/armlinux.c)
+       Linux TAGs (see arch/arm/lib/armlinux.c)
 */
 #define CONFIG_CMDLINE_TAG
 #undef CONFIG_SETUP_MEMORY_TAGS
index a13e7e2..ee1dc4b 100644 (file)
@@ -84,13 +84,13 @@ $(obj)nand_init.c:
        ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
 
 $(obj)cache.c:
-       ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
 
 $(obj)time.c:
-       ln -sf $(SRCTREE)/lib_ppc/time.c $(obj)time.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/time.c $(obj)time.c
 
 $(obj)ticks.S:
-       ln -sf $(SRCTREE)/lib_ppc/ticks.S $(obj)ticks.S
+       ln -sf $(SRCTREE)/arch/ppc/lib/ticks.S $(obj)ticks.S
 
 #########################################################################
 
index a13e7e2..ee1dc4b 100644 (file)
@@ -84,13 +84,13 @@ $(obj)nand_init.c:
        ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
 
 $(obj)cache.c:
-       ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
 
 $(obj)time.c:
-       ln -sf $(SRCTREE)/lib_ppc/time.c $(obj)time.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/time.c $(obj)time.c
 
 $(obj)ticks.S:
-       ln -sf $(SRCTREE)/lib_ppc/ticks.S $(obj)ticks.S
+       ln -sf $(SRCTREE)/arch/ppc/lib/ticks.S $(obj)ticks.S
 
 #########################################################################
 
index be0caaa..ff8b8be 100644 (file)
@@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS)
 
 $(obj)cache.c:
        @rm -f $(obj)cache.c
-       ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c
index be0caaa..ff8b8be 100644 (file)
@@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS)
 
 $(obj)cache.c:
        @rm -f $(obj)cache.c
-       ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c
index be0caaa..ff8b8be 100644 (file)
@@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS)
 
 $(obj)cache.c:
        @rm -f $(obj)cache.c
-       ln -sf $(SRCTREE)/lib_ppc/cache.c $(obj)cache.c
+       ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c
index 6920fe8..48c22f8 100644 (file)
@@ -90,15 +90,15 @@ $(obj)nand_init.c:
 
 $(obj)cache.c:
        @rm -f $@
-       ln -s $(SRCTREE)/lib_ppc/cache.c $@
+       ln -s $(SRCTREE)/arch/ppc/lib/cache.c $@
 
 $(obj)time.c:
        @rm -f $@
-       ln -s $(SRCTREE)/lib_ppc/time.c $@
+       ln -s $(SRCTREE)/arch/ppc/lib/time.c $@
 
 $(obj)ticks.S:
        @rm -f $@
-       ln -s $(SRCTREE)/lib_ppc/ticks.S $@
+       ln -s $(SRCTREE)/arch/ppc/lib/ticks.S $@
 
 #########################################################################