251 files changed, 232 insertions, 232 deletions

diff --git a/Makefile b/Makefile
index 8e3eb9938d6..de8a4cdba3f 100644
--- 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 bb13bc62a37..dc2103fd433 100644
--- 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()
 
diff --git a/lib_arm/config.mk b/arch/arm/config.mk
index 8dd4dccf368..e10dafca583 100644
--- a/lib_arm/config.mk
+++ b/arch/arm/config.mk
@@ -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
diff --git a/lib_arm/Makefile b/arch/arm/lib/Makefile
index 02933485cd1..02933485cd1 100644
--- a/lib_arm/Makefile
+++ b/arch/arm/lib/Makefile
diff --git a/lib_arm/_ashldi3.S b/arch/arm/lib/_ashldi3.S
index 834ddc25426..834ddc25426 100644
--- a/lib_arm/_ashldi3.S
+++ b/arch/arm/lib/_ashldi3.S
diff --git a/lib_arm/_ashrdi3.S b/arch/arm/lib/_ashrdi3.S
index 671ac87a2b5..671ac87a2b5 100644
--- a/lib_arm/_ashrdi3.S
+++ b/arch/arm/lib/_ashrdi3.S
diff --git a/lib_arm/_divsi3.S b/arch/arm/lib/_divsi3.S
index cfbadb2ab99..cfbadb2ab99 100644
--- a/lib_arm/_divsi3.S
+++ b/arch/arm/lib/_divsi3.S
diff --git a/lib_arm/_lshrdi3.S b/arch/arm/lib/_lshrdi3.S
index e7fa7993878..e7fa7993878 100644
--- a/lib_arm/_lshrdi3.S
+++ b/arch/arm/lib/_lshrdi3.S
diff --git a/lib_arm/_modsi3.S b/arch/arm/lib/_modsi3.S
index 539c5849970..539c5849970 100644
--- a/lib_arm/_modsi3.S
+++ b/arch/arm/lib/_modsi3.S
diff --git a/lib_arm/_udivsi3.S b/arch/arm/lib/_udivsi3.S
index 13098026104..13098026104 100644
--- a/lib_arm/_udivsi3.S
+++ b/arch/arm/lib/_udivsi3.S
diff --git a/lib_arm/_umodsi3.S b/arch/arm/lib/_umodsi3.S
index 8465ef09d23..8465ef09d23 100644
--- a/lib_arm/_umodsi3.S
+++ b/arch/arm/lib/_umodsi3.S
diff --git a/lib_arm/board.c b/arch/arm/lib/board.c
index f5660a985b7..f5660a985b7 100644
--- a/lib_arm/board.c
+++ b/arch/arm/lib/board.c
diff --git a/lib_arm/bootm.c b/arch/arm/lib/bootm.c
index 128b7e313cd..128b7e313cd 100644
--- a/lib_arm/bootm.c
+++ b/arch/arm/lib/bootm.c
diff --git a/lib_arm/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index 62ed54fb4d6..62ed54fb4d6 100644
--- a/lib_arm/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
diff --git a/lib_arm/cache.c b/arch/arm/lib/cache.c
index 61ee9d3b13b..61ee9d3b13b 100644
--- a/lib_arm/cache.c
+++ b/arch/arm/lib/cache.c
diff --git a/lib_arm/div0.c b/arch/arm/lib/div0.c
index 6267bf16a5d..6267bf16a5d 100644
--- a/lib_arm/div0.c
+++ b/arch/arm/lib/div0.c
diff --git a/lib_arm/eabi_compat.c b/arch/arm/lib/eabi_compat.c
index 86eacf1b0e9..86eacf1b0e9 100644
--- a/lib_arm/eabi_compat.c
+++ b/arch/arm/lib/eabi_compat.c
diff --git a/lib_arm/interrupts.c b/arch/arm/lib/interrupts.c
index 1f2b815611c..1f2b815611c 100644
--- a/lib_arm/interrupts.c
+++ b/arch/arm/lib/interrupts.c
diff --git a/lib_arm/reset.c b/arch/arm/lib/reset.c
index 4fcedfa150b..4fcedfa150b 100644
--- a/lib_arm/reset.c
+++ b/arch/arm/lib/reset.c
diff --git a/lib_avr32/config.mk b/arch/avr32/config.mk
index 1121ca1cc25..1121ca1cc25 100644
--- a/lib_avr32/config.mk
+++ b/arch/avr32/config.mk
diff --git a/lib_avr32/Makefile b/arch/avr32/lib/Makefile
index 37b80514f3f..37b80514f3f 100644
--- a/lib_avr32/Makefile
+++ b/arch/avr32/lib/Makefile
diff --git a/lib_avr32/board.c b/arch/avr32/lib/board.c
index 917ed6ce75e..917ed6ce75e 100644
--- a/lib_avr32/board.c
+++ b/arch/avr32/lib/board.c
diff --git a/lib_avr32/bootm.c b/arch/avr32/lib/bootm.c
index 6a3172a9a0c..6a3172a9a0c 100644
--- a/lib_avr32/bootm.c
+++ b/arch/avr32/lib/bootm.c
diff --git a/lib_avr32/interrupts.c b/arch/avr32/lib/interrupts.c
index bbbc490db23..bbbc490db23 100644
--- a/lib_avr32/interrupts.c
+++ b/arch/avr32/lib/interrupts.c
diff --git a/lib_avr32/memset.S b/arch/avr32/lib/memset.S
index 79e3c675a92..79e3c675a92 100644
--- a/lib_avr32/memset.S
+++ b/arch/avr32/lib/memset.S
diff --git a/lib_blackfin/config.mk b/arch/blackfin/config.mk
index 3ecade9aa43..137834e7eed 100644
--- a/lib_blackfin/config.mk
+++ b/arch/blackfin/config.mk
@@ -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
diff --git a/lib_blackfin/.gitignore b/arch/blackfin/lib/.gitignore
index 09f1be04eb5..09f1be04eb5 100644
--- a/lib_blackfin/.gitignore
+++ b/arch/blackfin/lib/.gitignore
diff --git a/lib_blackfin/Makefile b/arch/blackfin/lib/Makefile
index 3bdba754db1..3bdba754db1 100644
--- a/lib_blackfin/Makefile
+++ b/arch/blackfin/lib/Makefile
diff --git a/lib_blackfin/__kgdb.S b/arch/blackfin/lib/__kgdb.S
index cba4179d3ef..cba4179d3ef 100644
--- a/lib_blackfin/__kgdb.S
+++ b/arch/blackfin/lib/__kgdb.S
diff --git a/lib_blackfin/board.c b/arch/blackfin/lib/board.c
index 4e9bb19226c..4e9bb19226c 100644
--- a/lib_blackfin/board.c
+++ b/arch/blackfin/lib/board.c
diff --git a/lib_blackfin/boot.c b/arch/blackfin/lib/boot.c
index 951d5b0d027..951d5b0d027 100644
--- a/lib_blackfin/boot.c
+++ b/arch/blackfin/lib/boot.c
diff --git a/lib_blackfin/cache.c b/arch/blackfin/lib/cache.c
index 0a321a448f4..0a321a448f4 100644
--- a/lib_blackfin/cache.c
+++ b/arch/blackfin/lib/cache.c
diff --git a/lib_blackfin/clocks.c b/arch/blackfin/lib/clocks.c
index 0be395bb30f..0be395bb30f 100644
--- a/lib_blackfin/clocks.c
+++ b/arch/blackfin/lib/clocks.c
diff --git a/lib_blackfin/cmd_cache_dump.c b/arch/blackfin/lib/cmd_cache_dump.c
index de5840e4ccf..de5840e4ccf 100644
--- a/lib_blackfin/cmd_cache_dump.c
+++ b/arch/blackfin/lib/cmd_cache_dump.c
diff --git a/lib_blackfin/ins.S b/arch/blackfin/lib/ins.S
index 4519596420e..4519596420e 100644
--- a/lib_blackfin/ins.S
+++ b/arch/blackfin/lib/ins.S
diff --git a/lib_blackfin/kgdb.c b/arch/blackfin/lib/kgdb.c
index bd62d710581..bd62d710581 100644
--- a/lib_blackfin/kgdb.c
+++ b/arch/blackfin/lib/kgdb.c
diff --git a/lib_blackfin/kgdb.h b/arch/blackfin/lib/kgdb.h
index 18f1f493cc8..18f1f493cc8 100644
--- a/lib_blackfin/kgdb.h
+++ b/arch/blackfin/lib/kgdb.h
diff --git a/lib_blackfin/memcmp.S b/arch/blackfin/lib/memcmp.S
index 6c834a7e853..6c834a7e853 100644
--- a/lib_blackfin/memcmp.S
+++ b/arch/blackfin/lib/memcmp.S
diff --git a/lib_blackfin/memcpy.S b/arch/blackfin/lib/memcpy.S
index e6b359a344b..e6b359a344b 100644
--- a/lib_blackfin/memcpy.S
+++ b/arch/blackfin/lib/memcpy.S
diff --git a/lib_blackfin/memmove.S b/arch/blackfin/lib/memmove.S
index e385c4f6f5a..e385c4f6f5a 100644
--- a/lib_blackfin/memmove.S
+++ b/arch/blackfin/lib/memmove.S
diff --git a/lib_blackfin/memset.S b/arch/blackfin/lib/memset.S
index 26f63cdc94e..26f63cdc94e 100644
--- a/lib_blackfin/memset.S
+++ b/arch/blackfin/lib/memset.S
diff --git a/lib_blackfin/muldi3.c b/arch/blackfin/lib/muldi3.c
index bf1ca535fa7..bf1ca535fa7 100644
--- a/lib_blackfin/muldi3.c
+++ b/arch/blackfin/lib/muldi3.c
diff --git a/lib_blackfin/outs.S b/arch/blackfin/lib/outs.S
index 90c6033c9e5..90c6033c9e5 100644
--- a/lib_blackfin/outs.S
+++ b/arch/blackfin/lib/outs.S
diff --git a/lib_blackfin/post.c b/arch/blackfin/lib/post.c
index faf6b96ba27..faf6b96ba27 100644
--- a/lib_blackfin/post.c
+++ b/arch/blackfin/lib/post.c
diff --git a/lib_blackfin/string.c b/arch/blackfin/lib/string.c
index e344d3b94b0..e344d3b94b0 100644
--- a/lib_blackfin/string.c
+++ b/arch/blackfin/lib/string.c
diff --git a/lib_blackfin/tests.c b/arch/blackfin/lib/tests.c
index bf7fba00c11..bf7fba00c11 100644
--- a/lib_blackfin/tests.c
+++ b/arch/blackfin/lib/tests.c
diff --git a/lib_blackfin/u-boot.lds.S b/arch/blackfin/lib/u-boot.lds.S
index 2b23d8ba63e..2b23d8ba63e 100644
--- a/lib_blackfin/u-boot.lds.S
+++ b/arch/blackfin/lib/u-boot.lds.S
diff --git a/lib_i386/config.mk b/arch/i386/config.mk
index 4b990e04ef2..4b990e04ef2 100644
--- a/lib_i386/config.mk
+++ b/arch/i386/config.mk
diff --git a/lib_i386/Makefile b/arch/i386/lib/Makefile
index 9838506689c..9838506689c 100644
--- a/lib_i386/Makefile
+++ b/arch/i386/lib/Makefile
diff --git a/lib_i386/bios.S b/arch/i386/lib/bios.S
index 48f1b811222..48f1b811222 100644
--- a/lib_i386/bios.S
+++ b/arch/i386/lib/bios.S
diff --git a/lib_i386/bios.h b/arch/i386/lib/bios.h
index 4901f8917a2..4901f8917a2 100644
--- a/lib_i386/bios.h
+++ b/arch/i386/lib/bios.h
diff --git a/lib_i386/bios_pci.S b/arch/i386/lib/bios_pci.S
index 9e412e5e4c4..9e412e5e4c4 100644
--- a/lib_i386/bios_pci.S
+++ b/arch/i386/lib/bios_pci.S
diff --git a/lib_i386/bios_setup.c b/arch/i386/lib/bios_setup.c
index 6491e522ec4..6491e522ec4 100644
--- a/lib_i386/bios_setup.c
+++ b/arch/i386/lib/bios_setup.c
diff --git a/lib_i386/board.c b/arch/i386/lib/board.c
index f3b6348551e..f3b6348551e 100644
--- a/lib_i386/board.c
+++ b/arch/i386/lib/board.c
diff --git a/lib_i386/bootm.c b/arch/i386/lib/bootm.c
index f96d7bd6daa..f96d7bd6daa 100644
--- a/lib_i386/bootm.c
+++ b/arch/i386/lib/bootm.c
diff --git a/lib_i386/interrupts.c b/arch/i386/lib/interrupts.c
index 51def59954c..51def59954c 100644
--- a/lib_i386/interrupts.c
+++ b/arch/i386/lib/interrupts.c
diff --git a/lib_i386/pcat_interrupts.c b/arch/i386/lib/pcat_interrupts.c
index 67e6e97e35e..67e6e97e35e 100644
--- a/lib_i386/pcat_interrupts.c
+++ b/arch/i386/lib/pcat_interrupts.c
diff --git a/lib_i386/pcat_timer.c b/arch/i386/lib/pcat_timer.c
index 1373fd125c8..1373fd125c8 100644
--- a/lib_i386/pcat_timer.c
+++ b/arch/i386/lib/pcat_timer.c
diff --git a/lib_i386/pci.c b/arch/i386/lib/pci.c
index 9020e7ce764..9020e7ce764 100644
--- a/lib_i386/pci.c
+++ b/arch/i386/lib/pci.c
diff --git a/lib_i386/pci_type1.c b/arch/i386/lib/pci_type1.c
index 225ae4a9909..225ae4a9909 100644
--- a/lib_i386/pci_type1.c
+++ b/arch/i386/lib/pci_type1.c
diff --git a/lib_i386/realmode.c b/arch/i386/lib/realmode.c
index 3c3c1fc961f..3c3c1fc961f 100644
--- a/lib_i386/realmode.c
+++ b/arch/i386/lib/realmode.c
diff --git a/lib_i386/realmode_switch.S b/arch/i386/lib/realmode_switch.S
index d6c74ecd79b..d6c74ecd79b 100644
--- a/lib_i386/realmode_switch.S
+++ b/arch/i386/lib/realmode_switch.S
diff --git a/lib_i386/timer.c b/arch/i386/lib/timer.c
index 5cb1f54fb56..5cb1f54fb56 100644
--- a/lib_i386/timer.c
+++ b/arch/i386/lib/timer.c
diff --git a/lib_i386/video.c b/arch/i386/lib/video.c
index c58ed104cc8..c58ed104cc8 100644
--- a/lib_i386/video.c
+++ b/arch/i386/lib/video.c
diff --git a/lib_i386/video_bios.c b/arch/i386/lib/video_bios.c
index c8060e60a77..c8060e60a77 100644
--- a/lib_i386/video_bios.c
+++ b/arch/i386/lib/video_bios.c
diff --git a/lib_i386/zimage.c b/arch/i386/lib/zimage.c
index c3b4e597aab..c3b4e597aab 100644
--- a/lib_i386/zimage.c
+++ b/arch/i386/lib/zimage.c
diff --git a/lib_m68k/config.mk b/arch/m68k/config.mk
index 749c38968ab..749c38968ab 100644
--- a/lib_m68k/config.mk
+++ b/arch/m68k/config.mk
diff --git a/lib_m68k/Makefile b/arch/m68k/lib/Makefile
index 6db35ed2c10..6db35ed2c10 100644
--- a/lib_m68k/Makefile
+++ b/arch/m68k/lib/Makefile
diff --git a/lib_m68k/board.c b/arch/m68k/lib/board.c
index 732023d67c0..732023d67c0 100644
--- a/lib_m68k/board.c
+++ b/arch/m68k/lib/board.c
diff --git a/lib_m68k/bootm.c b/arch/m68k/lib/bootm.c
index e5ed6eb7cc6..e5ed6eb7cc6 100644
--- a/lib_m68k/bootm.c
+++ b/arch/m68k/lib/bootm.c
diff --git a/lib_m68k/cache.c b/arch/m68k/lib/cache.c
index ed881783f10..ed881783f10 100644
--- a/lib_m68k/cache.c
+++ b/arch/m68k/lib/cache.c
diff --git a/lib_m68k/interrupts.c b/arch/m68k/lib/interrupts.c
index 133494f6dcc..133494f6dcc 100644
--- a/lib_m68k/interrupts.c
+++ b/arch/m68k/lib/interrupts.c
diff --git a/lib_m68k/time.c b/arch/m68k/lib/time.c
index 7eaea5e7f77..7eaea5e7f77 100644
--- a/lib_m68k/time.c
+++ b/arch/m68k/lib/time.c
diff --git a/lib_m68k/traps.c b/arch/m68k/lib/traps.c
index 1ca94dc55f7..1ca94dc55f7 100644
--- a/lib_m68k/traps.c
+++ b/arch/m68k/lib/traps.c
diff --git a/lib_microblaze/config.mk b/arch/microblaze/config.mk
index c3c9f958c0b..c3c9f958c0b 100644
--- a/lib_microblaze/config.mk
+++ b/arch/microblaze/config.mk
diff --git a/lib_microblaze/Makefile b/arch/microblaze/lib/Makefile
index 9b0f296e3fd..9b0f296e3fd 100644
--- a/lib_microblaze/Makefile
+++ b/arch/microblaze/lib/Makefile
diff --git a/lib_microblaze/board.c b/arch/microblaze/lib/board.c
index d4baea930af..d4baea930af 100644
--- a/lib_microblaze/board.c
+++ b/arch/microblaze/lib/board.c
diff --git a/lib_microblaze/bootm.c b/arch/microblaze/lib/bootm.c
index bce4774fe37..bce4774fe37 100644
--- a/lib_microblaze/bootm.c
+++ b/arch/microblaze/lib/bootm.c
diff --git a/lib_microblaze/cache.c b/arch/microblaze/lib/cache.c
index 4b2e8e3790e..4b2e8e3790e 100644
--- a/lib_microblaze/cache.c
+++ b/arch/microblaze/lib/cache.c
diff --git a/lib_microblaze/time.c b/arch/microblaze/lib/time.c
index da016a0015c..da016a0015c 100644
--- a/lib_microblaze/time.c
+++ b/arch/microblaze/lib/time.c
diff --git a/lib_mips/config.mk b/arch/mips/config.mk
index aa06761ae35..aa06761ae35 100644
--- a/lib_mips/config.mk
+++ b/arch/mips/config.mk
diff --git a/lib_mips/Makefile b/arch/mips/lib/Makefile
index 7967e5803a3..7967e5803a3 100644
--- a/lib_mips/Makefile
+++ b/arch/mips/lib/Makefile
diff --git a/lib_mips/board.c b/arch/mips/lib/board.c
index b2d113e870a..b2d113e870a 100644
--- a/lib_mips/board.c
+++ b/arch/mips/lib/board.c
diff --git a/lib_mips/bootm.c b/arch/mips/lib/bootm.c
index 54af24cba3f..54af24cba3f 100644
--- a/lib_mips/bootm.c
+++ b/arch/mips/lib/bootm.c
diff --git a/lib_mips/bootm_qemu_mips.c b/arch/mips/lib/bootm_qemu_mips.c
index cc70fa93f3e..cc70fa93f3e 100644
--- a/lib_mips/bootm_qemu_mips.c
+++ b/arch/mips/lib/bootm_qemu_mips.c
diff --git a/lib_mips/time.c b/arch/mips/lib/time.c
index 0e6644149b4..0e6644149b4 100644
--- a/lib_mips/time.c
+++ b/arch/mips/lib/time.c
diff --git a/lib_nios/config.mk b/arch/nios/config.mk
index e1b9f07bb30..e1b9f07bb30 100644
--- a/lib_nios/config.mk
+++ b/arch/nios/config.mk
diff --git a/lib_nios/Makefile b/arch/nios/lib/Makefile
index f66e9893ab5..f66e9893ab5 100644
--- a/lib_nios/Makefile
+++ b/arch/nios/lib/Makefile
diff --git a/lib_nios/board.c b/arch/nios/lib/board.c
index 5d2fb2ec4af..5d2fb2ec4af 100644
--- a/lib_nios/board.c
+++ b/arch/nios/lib/board.c
diff --git a/lib_nios/bootm.c b/arch/nios/lib/bootm.c
index b0d5b825746..b0d5b825746 100644
--- a/lib_nios/bootm.c
+++ b/arch/nios/lib/bootm.c
diff --git a/lib_nios/cache.c b/arch/nios/lib/cache.c
index 87dbab1734d..87dbab1734d 100644
--- a/lib_nios/cache.c
+++ b/arch/nios/lib/cache.c
diff --git a/lib_nios/divmod.c b/arch/nios/lib/divmod.c
index 3c7e71e9757..3c7e71e9757 100644
--- a/lib_nios/divmod.c
+++ b/arch/nios/lib/divmod.c
diff --git a/lib_nios/math.h b/arch/nios/lib/math.h
index f0aed8edc36..f0aed8edc36 100644
--- a/lib_nios/math.h
+++ b/arch/nios/lib/math.h
diff --git a/lib_nios/mult.c b/arch/nios/lib/mult.c
index ec8139ed5a6..ec8139ed5a6 100644
--- a/lib_nios/mult.c
+++ b/arch/nios/lib/mult.c
diff --git a/lib_nios/time.c b/arch/nios/lib/time.c
index d5096ee1290..d5096ee1290 100644
--- a/lib_nios/time.c
+++ b/arch/nios/lib/time.c
diff --git a/lib_nios2/config.mk b/arch/nios2/config.mk
index be406392803..be406392803 100644
--- a/lib_nios2/config.mk
+++ b/arch/nios2/config.mk
diff --git a/lib_nios2/Makefile b/arch/nios2/lib/Makefile
index b69bc38850e..b69bc38850e 100644
--- a/lib_nios2/Makefile
+++ b/arch/nios2/lib/Makefile
diff --git a/lib_nios2/board.c b/arch/nios2/lib/board.c
index 8ec66a35404..8ec66a35404 100644
--- a/lib_nios2/board.c
+++ b/arch/nios2/lib/board.c
diff --git a/lib_nios2/bootm.c b/arch/nios2/lib/bootm.c
index 5d25edf80d2..5d25edf80d2 100644
--- a/lib_nios2/bootm.c
+++ b/arch/nios2/lib/bootm.c
diff --git a/lib_nios2/cache.S b/arch/nios2/lib/cache.S
index ee3b4b79bf1..ee3b4b79bf1 100644
--- a/lib_nios2/cache.S
+++ b/arch/nios2/lib/cache.S
diff --git a/lib_nios2/divmod.c b/arch/nios2/lib/divmod.c
index 3c7e71e9757..3c7e71e9757 100644
--- a/lib_nios2/divmod.c
+++ b/arch/nios2/lib/divmod.c
diff --git a/lib_nios2/math.h b/arch/nios2/lib/math.h
index f0aed8edc36..f0aed8edc36 100644
--- a/lib_nios2/math.h
+++ b/arch/nios2/lib/math.h
diff --git a/lib_nios2/mult.c b/arch/nios2/lib/mult.c
index ec8139ed5a6..ec8139ed5a6 100644
--- a/lib_nios2/mult.c
+++ b/arch/nios2/lib/mult.c
diff --git a/lib_nios2/time.c b/arch/nios2/lib/time.c
index d5096ee1290..d5096ee1290 100644
--- a/lib_nios2/time.c
+++ b/arch/nios2/lib/time.c
diff --git a/lib_ppc/config.mk b/arch/ppc/config.mk
index 06a3b107d59..06a3b107d59 100644
--- a/lib_ppc/config.mk
+++ b/arch/ppc/config.mk
diff --git a/lib_ppc/Makefile b/arch/ppc/lib/Makefile
index 334e457805c..334e457805c 100644
--- a/lib_ppc/Makefile
+++ b/arch/ppc/lib/Makefile
diff --git a/lib_ppc/bat_rw.c b/arch/ppc/lib/bat_rw.c
index c48c2401515..c48c2401515 100644
--- a/lib_ppc/bat_rw.c
+++ b/arch/ppc/lib/bat_rw.c
diff --git a/lib_ppc/board.c b/arch/ppc/lib/board.c
index a30acee4feb..a30acee4feb 100644
--- a/lib_ppc/board.c
+++ b/arch/ppc/lib/board.c
diff --git a/lib_ppc/bootm.c b/arch/ppc/lib/bootm.c
index 0685a9331cb..0685a9331cb 100644
--- a/lib_ppc/bootm.c
+++ b/arch/ppc/lib/bootm.c
diff --git a/lib_ppc/cache.c b/arch/ppc/lib/cache.c
index 338b08bd770..338b08bd770 100644
--- a/lib_ppc/cache.c
+++ b/arch/ppc/lib/cache.c
diff --git a/lib_ppc/extable.c b/arch/ppc/lib/extable.c
index 7408d5c9694..7408d5c9694 100644
--- a/lib_ppc/extable.c
+++ b/arch/ppc/lib/extable.c
diff --git a/lib_ppc/interrupts.c b/arch/ppc/lib/interrupts.c
index f6031707aeb..f6031707aeb 100644
--- a/lib_ppc/interrupts.c
+++ b/arch/ppc/lib/interrupts.c
diff --git a/lib_ppc/kgdb.c b/arch/ppc/lib/kgdb.c
index d3eb1f35a9f..d3eb1f35a9f 100644
--- a/lib_ppc/kgdb.c
+++ b/arch/ppc/lib/kgdb.c
diff --git a/lib_ppc/ppccache.S b/arch/ppc/lib/ppccache.S
index 278a8048f87..278a8048f87 100644
--- a/lib_ppc/ppccache.S
+++ b/arch/ppc/lib/ppccache.S
diff --git a/lib_ppc/ppcstring.S b/arch/ppc/lib/ppcstring.S
index 97023a0555a..97023a0555a 100644
--- a/lib_ppc/ppcstring.S
+++ b/arch/ppc/lib/ppcstring.S
diff --git a/lib_ppc/reloc.S b/arch/ppc/lib/reloc.S
index 50f9a83fc62..50f9a83fc62 100644
--- a/lib_ppc/reloc.S
+++ b/arch/ppc/lib/reloc.S
diff --git a/lib_ppc/ticks.S b/arch/ppc/lib/ticks.S
index b8d25b7f465..b8d25b7f465 100644
--- a/lib_ppc/ticks.S
+++ b/arch/ppc/lib/ticks.S
diff --git a/lib_ppc/time.c b/arch/ppc/lib/time.c
index 29099612db4..29099612db4 100644
--- a/lib_ppc/time.c
+++ b/arch/ppc/lib/time.c
diff --git a/lib_sh/config.mk b/arch/sh/config.mk
index 797bf4c2269..797bf4c2269 100644
--- a/lib_sh/config.mk
+++ b/arch/sh/config.mk
diff --git a/lib_sh/Makefile b/arch/sh/lib/Makefile
index f7c6479426d..f7c6479426d 100644
--- a/lib_sh/Makefile
+++ b/arch/sh/lib/Makefile
diff --git a/lib_sh/board.c b/arch/sh/lib/board.c
index c97e20c3e1c..c97e20c3e1c 100644
--- a/lib_sh/board.c
+++ b/arch/sh/lib/board.c
diff --git a/lib_sh/bootm.c b/arch/sh/lib/bootm.c
index ae1f869f10d..ae1f869f10d 100644
--- a/lib_sh/bootm.c
+++ b/arch/sh/lib/bootm.c
diff --git a/lib_sh/time.c b/arch/sh/lib/time.c
index 9a8f89aef60..9a8f89aef60 100644
--- a/lib_sh/time.c
+++ b/arch/sh/lib/time.c
diff --git a/lib_sh/time_sh2.c b/arch/sh/lib/time_sh2.c
index 789b46f0e02..789b46f0e02 100644
--- a/lib_sh/time_sh2.c
+++ b/arch/sh/lib/time_sh2.c
diff --git a/lib_sparc/config.mk b/arch/sparc/config.mk
index 4de6515ef49..4de6515ef49 100644
--- a/lib_sparc/config.mk
+++ b/arch/sparc/config.mk
diff --git a/lib_sparc/Makefile b/arch/sparc/lib/Makefile
index 040ca10d3b3..040ca10d3b3 100644
--- a/lib_sparc/Makefile
+++ b/arch/sparc/lib/Makefile
diff --git a/lib_sparc/board.c b/arch/sparc/lib/board.c
index 11eea603c11..11eea603c11 100644
--- a/lib_sparc/board.c
+++ b/arch/sparc/lib/board.c
diff --git a/lib_sparc/bootm.c b/arch/sparc/lib/bootm.c
index c62cf57d80b..c62cf57d80b 100644
--- a/lib_sparc/bootm.c
+++ b/arch/sparc/lib/bootm.c
diff --git a/lib_sparc/cache.c b/arch/sparc/lib/cache.c
index 59d9bbe6728..59d9bbe6728 100644
--- a/lib_sparc/cache.c
+++ b/arch/sparc/lib/cache.c
diff --git a/lib_sparc/interrupts.c b/arch/sparc/lib/interrupts.c
index 4c73b82a6fd..4c73b82a6fd 100644
--- a/lib_sparc/interrupts.c
+++ b/arch/sparc/lib/interrupts.c
diff --git a/lib_sparc/time.c b/arch/sparc/lib/time.c
index 82b2a3abce5..82b2a3abce5 100644
--- a/lib_sparc/time.c
+++ b/arch/sparc/lib/time.c
diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
index 3c44b3ef295..32778cacdae 100644
--- a/board/LEOX/elpt860/u-boot.lds
+++ b/board/LEOX/elpt860/u-boot.lds
@@ -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)
diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds
index 47247ec8133..c354ff82834 100644
--- a/board/RPXClassic/u-boot.lds
+++ b/board/RPXClassic/u-boot.lds
@@ -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)
diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds
index 47247ec8133..c354ff82834 100644
--- a/board/RPXlite/u-boot.lds
+++ b/board/RPXlite/u-boot.lds
@@ -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)
diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds
index 7ae7be0c02c..89aaffff33c 100644
--- a/board/RPXlite_dw/u-boot.lds
+++ b/board/RPXlite_dw/u-boot.lds
@@ -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)
diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
index f22b25fc3d0..88644a4591f 100644
--- a/board/RRvision/u-boot.lds
+++ b/board/RRvision/u-boot.lds
@@ -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)
diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
index 836775f0fee..1087167bae3 100644
--- a/board/actux1/u-boot.lds
+++ b/board/actux1/u-boot.lds
@@ -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;
diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds
index 0752656b597..543af3050d1 100644
--- a/board/actux2/u-boot.lds
+++ b/board/actux2/u-boot.lds
@@ -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)
 
diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds
index a69e7db9ca2..f63251dd968 100644
--- a/board/actux3/u-boot.lds
+++ b/board/actux3/u-boot.lds
@@ -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)
 
diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds
index 707203d60f8..10308d59835 100644
--- a/board/amirix/ap1000/u-boot.lds
+++ b/board/amirix/ap1000/u-boot.lds
@@ -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;*/
diff --git a/board/astro/mcf5373l/u-boot.lds b/board/astro/mcf5373l/u-boot.lds
index a9a4e0a233a..7fbe16f3481 100644
--- a/board/astro/mcf5373l/u-boot.lds
+++ b/board/astro/mcf5373l/u-boot.lds
@@ -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)
 
diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
index 2d0efb31612..0571f025a1e 100644
--- a/board/c2mon/u-boot.lds
+++ b/board/c2mon/u-boot.lds
@@ -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)
diff --git a/board/cobra5272/u-boot.lds b/board/cobra5272/u-boot.lds
index 7e716bb09a6..8989880202f 100644
--- a/board/cobra5272/u-boot.lds
+++ b/board/cobra5272/u-boot.lds
@@ -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)
diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug
index 970628d556e..40d2f78ead9 100644
--- a/board/cray/L1/u-boot.lds.debug
+++ b/board/cray/L1/u-boot.lds.debug
@@ -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)
 
diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index bfe85134e5d..4e4943fe6d7 100644
--- a/board/emk/top860/u-boot.lds.debug
+++ b/board/emk/top860/u-boot.lds.debug
@@ -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)
diff --git a/board/esd/tasreg/u-boot.lds b/board/esd/tasreg/u-boot.lds
index e3230b9f20a..54e0169533e 100644
--- a/board/esd/tasreg/u-boot.lds
+++ b/board/esd/tasreg/u-boot.lds
@@ -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)
diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds
index 3e4490ec492..215a2c49ef8 100644
--- a/board/esteem192e/u-boot.lds
+++ b/board/esteem192e/u-boot.lds
@@ -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)
diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug
index 1af61fb2b5a..dd4dbfaa364 100644
--- a/board/etx094/u-boot.lds.debug
+++ b/board/etx094/u-boot.lds.debug
@@ -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)
diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug
index 0a3b958fad6..8d91aed3fe3 100644
--- a/board/fads/u-boot.lds.debug
+++ b/board/fads/u-boot.lds.debug
@@ -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)
diff --git a/board/freescale/m5208evbe/u-boot.lds b/board/freescale/m5208evbe/u-boot.lds
index bc9d5cd0d6e..3877527d873 100644
--- a/board/freescale/m5208evbe/u-boot.lds
+++ b/board/freescale/m5208evbe/u-boot.lds
@@ -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 : .;
diff --git a/board/freescale/m52277evb/u-boot.spa b/board/freescale/m52277evb/u-boot.spa
index 7ae70d455fa..23d57107eed 100644
--- a/board/freescale/m52277evb/u-boot.spa
+++ b/board/freescale/m52277evb/u-boot.spa
@@ -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)
diff --git a/board/freescale/m5235evb/u-boot.16 b/board/freescale/m5235evb/u-boot.16
index c134884375d..940da1467c2 100644
--- a/board/freescale/m5235evb/u-boot.16
+++ b/board/freescale/m5235evb/u-boot.16
@@ -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)
 
diff --git a/board/freescale/m5235evb/u-boot.32 b/board/freescale/m5235evb/u-boot.32
index 53c337df893..50045e1a45b 100644
--- a/board/freescale/m5235evb/u-boot.32
+++ b/board/freescale/m5235evb/u-boot.32
@@ -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)
diff --git a/board/freescale/m5249evb/u-boot.lds b/board/freescale/m5249evb/u-boot.lds
index e3230b9f20a..54e0169533e 100644
--- a/board/freescale/m5249evb/u-boot.lds
+++ b/board/freescale/m5249evb/u-boot.lds
@@ -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)
diff --git a/board/freescale/m5253demo/u-boot.lds b/board/freescale/m5253demo/u-boot.lds
index 6cb5ee05f30..e53e67de909 100644
--- a/board/freescale/m5253demo/u-boot.lds
+++ b/board/freescale/m5253demo/u-boot.lds
@@ -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)
diff --git a/board/freescale/m5253evbe/u-boot.lds b/board/freescale/m5253evbe/u-boot.lds
index 132fccf1046..7f4dc271439 100644
--- a/board/freescale/m5253evbe/u-boot.lds
+++ b/board/freescale/m5253evbe/u-boot.lds
@@ -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)
diff --git a/board/freescale/m5271evb/u-boot.lds b/board/freescale/m5271evb/u-boot.lds
index 00c1f2a52e0..713b18a95b4 100644
--- a/board/freescale/m5271evb/u-boot.lds
+++ b/board/freescale/m5271evb/u-boot.lds
@@ -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)
diff --git a/board/freescale/m5272c3/u-boot.lds b/board/freescale/m5272c3/u-boot.lds
index 9d20b228cb9..446ec1be4f2 100644
--- a/board/freescale/m5272c3/u-boot.lds
+++ b/board/freescale/m5272c3/u-boot.lds
@@ -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)
diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds
index c79d06c64a4..fe0e3141f97 100644
--- a/board/freescale/m53017evb/u-boot.lds
+++ b/board/freescale/m53017evb/u-boot.lds
@@ -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)
 
diff --git a/board/freescale/m5329evb/u-boot.lds b/board/freescale/m5329evb/u-boot.lds
index af310988ff8..0ed87ff30c4 100644
--- a/board/freescale/m5329evb/u-boot.lds
+++ b/board/freescale/m5329evb/u-boot.lds
@@ -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)
 
diff --git a/board/freescale/m5373evb/u-boot.lds b/board/freescale/m5373evb/u-boot.lds
index dff74b65430..605452b7072 100644
--- a/board/freescale/m5373evb/u-boot.lds
+++ b/board/freescale/m5373evb/u-boot.lds
@@ -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)
 
diff --git a/board/freescale/m54451evb/u-boot.spa b/board/freescale/m54451evb/u-boot.spa
index d8caefad649..569518b895b 100644
--- a/board/freescale/m54451evb/u-boot.spa
+++ b/board/freescale/m54451evb/u-boot.spa
@@ -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)
diff --git a/board/freescale/m54451evb/u-boot.stm b/board/freescale/m54451evb/u-boot.stm
index e9eac67b90e..1b06b12b96d 100644
--- a/board/freescale/m54451evb/u-boot.stm
+++ b/board/freescale/m54451evb/u-boot.stm
@@ -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)
diff --git a/board/freescale/m54455evb/u-boot.atm b/board/freescale/m54455evb/u-boot.atm
index 08e184c1e66..c48dd752292 100644
--- a/board/freescale/m54455evb/u-boot.atm
+++ b/board/freescale/m54455evb/u-boot.atm
@@ -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)
 
diff --git a/board/freescale/m54455evb/u-boot.int b/board/freescale/m54455evb/u-boot.int
index 4d504a22f1e..ef0717426ad 100644
--- a/board/freescale/m54455evb/u-boot.int
+++ b/board/freescale/m54455evb/u-boot.int
@@ -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)
 
diff --git a/board/freescale/m547xevb/u-boot.lds b/board/freescale/m547xevb/u-boot.lds
index a3014bd104f..5f28a10baad 100644
--- a/board/freescale/m547xevb/u-boot.lds
+++ b/board/freescale/m547xevb/u-boot.lds
@@ -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 : .;
diff --git a/board/freescale/m548xevb/u-boot.lds b/board/freescale/m548xevb/u-boot.lds
index a3014bd104f..5f28a10baad 100644
--- a/board/freescale/m548xevb/u-boot.lds
+++ b/board/freescale/m548xevb/u-boot.lds
@@ -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 : .;
diff --git a/board/freescale/mpc7448hpc2/tsi108_init.c b/board/freescale/mpc7448hpc2/tsi108_init.c
index 74bb564ed9d..c6a3ade2c37 100644
--- a/board/freescale/mpc7448hpc2/tsi108_init.c
+++ b/board/freescale/mpc7448hpc2/tsi108_init.c
@@ -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.
diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds
index b573807fe92..2ad0f0e6a97 100644
--- a/board/freescale/mpc8610hpcd/u-boot.lds
+++ b/board/freescale/mpc8610hpcd/u-boot.lds
@@ -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)
diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds
index 2b98b5a9cc7..796828a37c6 100644
--- a/board/freescale/mpc8641hpcn/u-boot.lds
+++ b/board/freescale/mpc8641hpcn/u-boot.lds
@@ -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)
diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds
index 3182aa675e1..6f5bda45721 100644
--- a/board/freescale/mx31ads/u-boot.lds
+++ b/board/freescale/mx31ads/u-boot.lds
@@ -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)
 
diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 716efcdd0ba..9fc71a2c5e2 100644
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/u-boot.lds
@@ -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)
diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug
index 3568e6de691..9bb2c58f722 100644
--- a/board/genietv/u-boot.lds.debug
+++ b/board/genietv/u-boot.lds.debug
@@ -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)
diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index 7b74cb7d5f6..1252baf41c4 100644
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/u-boot.lds
@@ -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)
diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug
index 38012069319..dc810beaec7 100644
--- a/board/hermes/u-boot.lds.debug
+++ b/board/hermes/u-boot.lds.debug
@@ -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)
 
diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index 52d66a2df30..cc32b4462e0 100644
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -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)
diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds
index b43be81b690..b614262b882 100644
--- a/board/icu862/u-boot.lds
+++ b/board/icu862/u-boot.lds
@@ -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)
diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug
index 653e0be45ce..919eb2194d4 100644
--- a/board/icu862/u-boot.lds.debug
+++ b/board/icu862/u-boot.lds.debug
@@ -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)
diff --git a/board/idmr/u-boot.lds b/board/idmr/u-boot.lds
index 00c1f2a52e0..713b18a95b4 100644
--- a/board/idmr/u-boot.lds
+++ b/board/idmr/u-boot.lds
@@ -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)
diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds
index a786bf23e10..bbc7139e532 100644
--- a/board/ip860/u-boot.lds
+++ b/board/ip860/u-boot.lds
@@ -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)
diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug
index dc2f6e12f5e..fc8fe6cec2b 100644
--- a/board/ip860/u-boot.lds.debug
+++ b/board/ip860/u-boot.lds.debug
@@ -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)
diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug
index b5206c50fd9..17965a05cc2 100644
--- a/board/ivm/u-boot.lds.debug
+++ b/board/ivm/u-boot.lds.debug
@@ -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)
diff --git a/board/jse/jse.c b/board/jse/jse.c
index 1849ca47d77..e4c7b9dd94a 100644
--- a/board/jse/jse.c
+++ b/board/jse/jse.c
@@ -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.
  */
diff --git a/board/jse/sdram.c b/board/jse/sdram.c
index 88fdd84130f..a12ebde2367 100644
--- a/board/jse/sdram.c
+++ b/board/jse/sdram.c
@@ -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)
diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds
index a8057f225bf..8b6305a55e6 100644
--- a/board/keymile/km8xx/u-boot.lds
+++ b/board/keymile/km8xx/u-boot.lds
@@ -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)
diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds
index 79b886af216..8e4faa15b1b 100644
--- a/board/kup/kup4k/u-boot.lds
+++ b/board/kup/kup4k/u-boot.lds
@@ -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)
diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds
index 79b886af216..8e4faa15b1b 100644
--- a/board/kup/kup4x/u-boot.lds
+++ b/board/kup/kup4x/u-boot.lds
@@ -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)
diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds
index 854ed689322..814a7a69d79 100644
--- a/board/lantec/u-boot.lds
+++ b/board/lantec/u-boot.lds
@@ -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)
diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug
index 987c4ddb9ba..49f897213a6 100644
--- a/board/lwmon/u-boot.lds.debug
+++ b/board/lwmon/u-boot.lds.debug
@@ -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)
diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug
index 0a3b958fad6..8d91aed3fe3 100644
--- a/board/mbx8xx/u-boot.lds.debug
+++ b/board/mbx8xx/u-boot.lds.debug
@@ -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)
diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds
index 8fea3be41b0..0083a211d3d 100644
--- a/board/ml2/u-boot.lds
+++ b/board/ml2/u-boot.lds
@@ -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;*/
diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug
index 970628d556e..40d2f78ead9 100644
--- a/board/ml2/u-boot.lds.debug
+++ b/board/ml2/u-boot.lds.debug
@@ -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)
 
diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index 5100542e733..c92a2abe2c7 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -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)
diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom
index f79c39f7161..9750fc5f190 100644
--- a/board/mousse/u-boot.lds.rom
+++ b/board/mousse/u-boot.lds.rom
@@ -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)
diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug
index 970628d556e..40d2f78ead9 100644
--- a/board/mpl/pip405/u-boot.lds.debug
+++ b/board/mpl/pip405/u-boot.lds.debug
@@ -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)
 
diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index d64274b683c..4b17a1f7651 100644
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -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)
diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c
index 8efbc23c897..3f07ff1263e 100644
--- a/board/netstal/hcu4/hcu4.c
+++ b/board/netstal/hcu4/hcu4.c
@@ -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
diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt
index f64987637a8..0a54f9aee1c 100644
--- a/board/netstal/hcu5/README.txt
+++ b/board/netstal/hcu5/README.txt
@@ -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/
diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c
index c545cc01ea7..90433fe82d5 100644
--- a/board/netstal/hcu5/hcu5.c
+++ b/board/netstal/hcu5/hcu5.c
@@ -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
diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c
index c66ab97ac5b..cc2f99874ea 100644
--- a/board/netstal/mcu25/mcu25.c
+++ b/board/netstal/mcu25/mcu25.c
@@ -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
diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index 860c887c25d..991d7a1a90c 100644
--- a/board/netta/u-boot.lds
+++ b/board/netta/u-boot.lds
@@ -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)
diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds
index 860c887c25d..991d7a1a90c 100644
--- a/board/netta2/u-boot.lds
+++ b/board/netta2/u-boot.lds
@@ -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)
diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds
index a7d290ae88d..7eb01ee7270 100644
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds
@@ -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)
diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds
index 47247ec8133..c354ff82834 100644
--- a/board/quantum/u-boot.lds
+++ b/board/quantum/u-boot.lds
@@ -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)
diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index e0ea600d28c..6074c14ba26 100644
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds
@@ -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)
diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds
index 47247ec8133..c354ff82834 100644
--- a/board/rmu/u-boot.lds
+++ b/board/rmu/u-boot.lds
@@ -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)
diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
index 48fd579162f..1d8ce105e40 100644
--- a/board/sandburst/karef/u-boot.lds.debug
+++ b/board/sandburst/karef/u-boot.lds.debug
@@ -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) */
diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug
index 4bc5ceac026..bbfea131e01 100644
--- a/board/sandburst/metrobox/u-boot.lds.debug
+++ b/board/sandburst/metrobox/u-boot.lds.debug
@@ -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) */
diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds
index b71a7d6e580..648efa285bc 100644
--- a/board/sbc8641d/u-boot.lds
+++ b/board/sbc8641d/u-boot.lds
@@ -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)
diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds
index 16dc3840158..04b350aab78 100644
--- a/board/sc3/u-boot.lds
+++ b/board/sc3/u-boot.lds
@@ -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;*/
diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds
index 2d0efb31612..0571f025a1e 100644
--- a/board/siemens/CCM/u-boot.lds
+++ b/board/siemens/CCM/u-boot.lds
@@ -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)
diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds
index 104b44ccffb..877cf9ae016 100644
--- a/board/siemens/IAD210/u-boot.lds
+++ b/board/siemens/IAD210/u-boot.lds
@@ -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)
 
diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug
index 987c4ddb9ba..49f897213a6 100644
--- a/board/siemens/pcu_e/u-boot.lds.debug
+++ b/board/siemens/pcu_e/u-boot.lds.debug
@@ -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)
diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds
index 9ef2c201a26..ce115f59e7b 100644
--- a/board/snmc/qs850/u-boot.lds
+++ b/board/snmc/qs850/u-boot.lds
@@ -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)
diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds
index 9ef2c201a26..ce115f59e7b 100644
--- a/board/snmc/qs860t/u-boot.lds
+++ b/board/snmc/qs860t/u-boot.lds
@@ -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)
diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds
index d6711b5bf2c..172cfbbc88d 100644
--- a/board/spc1920/u-boot.lds
+++ b/board/spc1920/u-boot.lds
@@ -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)
diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug
index 0a3b958fad6..8d91aed3fe3 100644
--- a/board/spd8xx/u-boot.lds.debug
+++ b/board/spd8xx/u-boot.lds.debug
@@ -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)
diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c
index 73dddf3e0c9..678ec5850f6 100644
--- a/board/stx/stxssa/stxssa.c
+++ b/board/stx/stxssa/stxssa.c
@@ -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();
diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds
index 860c887c25d..991d7a1a90c 100644
--- a/board/stx/stxxtc/u-boot.lds
+++ b/board/stx/stxxtc/u-boot.lds
@@ -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)
diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds
index 02aa9dd9876..cf782000196 100644
--- a/board/svm_sc8xx/u-boot.lds
+++ b/board/svm_sc8xx/u-boot.lds
@@ -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)
diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds
index 2df8d8459c7..9f452c1c8e6 100644
--- a/board/tqc/tqm8xx/u-boot.lds
+++ b/board/tqc/tqm8xx/u-boot.lds
@@ -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)
diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds
index e3ea52aeded..967e4322cb7 100644
--- a/board/uc100/u-boot.lds
+++ b/board/uc100/u-boot.lds
@@ -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)
 
diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index 6f2ea9a613d..c3dd8c7abc1 100644
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds
@@ -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;
diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug
index 8bb4929a461..85b1cd69dd2 100644
--- a/board/w7o/u-boot.lds.debug
+++ b/board/w7o/u-boot.lds.debug
@@ -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)
 
diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds
index 2d0efb31612..0571f025a1e 100644
--- a/board/westel/amx860/u-boot.lds
+++ b/board/westel/amx860/u-boot.lds
@@ -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)
diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug
index 653e0be45ce..919eb2194d4 100644
--- a/board/westel/amx860/u-boot.lds.debug
+++ b/board/westel/amx860/u-boot.lds.debug
@@ -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)
diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug
index d00834eef37..0830d0aa1b4 100644
--- a/board/xes/xpedite1000/u-boot.lds.debug
+++ b/board/xes/xpedite1000/u-boot.lds.debug
@@ -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) */
diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds
index b71a7d6e580..648efa285bc 100644
--- a/board/xes/xpedite5170/u-boot.lds
+++ b/board/xes/xpedite5170/u-boot.lds
@@ -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)
diff --git a/config.mk b/config.mk
index 1a61dbb7fa0..85b524eada7 100644
--- 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
diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds
index c3400866197..c08c9c92329 100644
--- a/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -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)
diff --git a/doc/README.LED b/doc/README.LED
index 94e552aa03d..c3bcb3ac809 100644
--- a/doc/README.LED
+++ b/doc/README.LED
@@ -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
diff --git a/doc/README.alaska8220 b/doc/README.alaska8220
index 0bd68d9628b..279dac69f5c 100644
--- a/doc/README.alaska8220
+++ b/doc/README.alaska8220
@@ -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
 
diff --git a/doc/README.m52277evb b/doc/README.m52277evb
index 40f9028c6f2..f30b45e1c91 100644
--- a/doc/README.m52277evb
+++ b/doc/README.m52277evb
@@ -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
 ====================================
diff --git a/doc/README.m53017evb b/doc/README.m53017evb
index 60cfa95af3c..780a8038a53 100644
--- a/doc/README.m53017evb
+++ b/doc/README.m53017evb
@@ -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
 ====================================
diff --git a/doc/README.m5373evb b/doc/README.m5373evb
index 55917489338..24a659b18e0 100644
--- a/doc/README.m5373evb
+++ b/doc/README.m5373evb
@@ -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
 ====================================
diff --git a/doc/README.m54455evb b/doc/README.m54455evb
index 1888e166253..257bcd5a1fe 100644
--- a/doc/README.m54455evb
+++ b/doc/README.m54455evb
@@ -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
 
diff --git a/doc/README.m5475evb b/doc/README.m5475evb
index f3a1d7b28b2..b61dfba3cdd 100644
--- a/doc/README.m5475evb
+++ b/doc/README.m5475evb
@@ -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
 ====================================
diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx
index 07be8637fa7..2e121746ddc 100644
--- a/doc/README.mpc5xx
+++ b/doc/README.mpc5xx
@@ -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
diff --git a/doc/README.nios b/doc/README.nios
index 7f349380810..da30ff5ae4e 100644
--- a/doc/README.nios
+++ b/doc/README.nios
@@ -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
diff --git a/doc/TODO-i386 b/doc/TODO-i386
index 84113f8112c..2261f4a1f34 100644
--- a/doc/TODO-i386
+++ b/doc/TODO-i386
@@ -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
 
 
diff --git a/examples/api/Makefile b/examples/api/Makefile
index d4c5ca2559f..62751ece960 100644
--- a/examples/api/Makefile
+++ b/examples/api/Makefile
@@ -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 $@ $<
 
 #########################################################################
diff --git a/include/asm-i386/interrupt.h b/include/asm-i386/interrupt.h
index 3e2674af683..8d324d9f37a 100644
--- a/include/asm-i386/interrupt.h
+++ b/include/asm-i386/interrupt.h
@@ -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);
 
diff --git a/include/asm-i386/u-boot-i386.h b/include/asm-i386/u-boot-i386.h
index 7c99c8c57df..a08632d2d31 100644
--- a/include/asm-i386/u-boot-i386.h
+++ b/include/asm-i386/u-boot-i386.h
@@ -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);
 
diff --git a/include/common.h b/include/common.h
index a133e3479a4..7aa910dc987 100644
--- a/include/common.h
+++ b/include/common.h
@@ -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);
diff --git a/include/configs/B2.h b/include/configs/B2.h
index f51a26115c4..ca7350dc40d 100644
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -207,7 +207,7 @@
 */
 
 /*
-	Linux TAGs (see lib_arm/armlinux.c)
+	Linux TAGs (see arch/arm/lib/armlinux.c)
 */
 #define CONFIG_CMDLINE_TAG
 #undef CONFIG_SETUP_MEMORY_TAGS
diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile
index a13e7e2f1fb..ee1dc4b298f 100644
--- a/nand_spl/board/freescale/mpc8313erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8313erdb/Makefile
@@ -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
 
 #########################################################################
 
diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index a13e7e2f1fb..ee1dc4b298f 100644
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -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
 
 #########################################################################
 
diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index be0caaa7b3d..ff8b8be6a41 100644
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -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
diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index be0caaa7b3d..ff8b8be6a41 100644
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -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
diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index be0caaa7b3d..ff8b8be6a41 100644
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -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
diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index 6920fe886b5..48c22f84b11 100644
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -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 $@
 
 #########################################################################