ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

442 files changed, 392 insertions, 387 deletions

diff --git a/Makefile b/Makefile
index fdd781a86..ddfe73c06 100644
--- a/Makefile
+++ b/Makefile
@@ -227,12 +227,12 @@ LIBS += drivers/qe/qe.a
 endif
 ifeq ($(CPU),mpc85xx)
 LIBS += drivers/qe/qe.a
-LIBS += cpu/mpc8xxx/ddr/libddr.a
-LIBS += cpu/mpc8xxx/lib8xxx.a
+LIBS += arch/ppc/cpu/mpc8xxx/ddr/libddr.a
+LIBS += arch/ppc/cpu/mpc8xxx/lib8xxx.a
 endif
 ifeq ($(CPU),mpc86xx)
-LIBS += cpu/mpc8xxx/ddr/libddr.a
-LIBS += cpu/mpc8xxx/lib8xxx.a
+LIBS += arch/ppc/cpu/mpc8xxx/ddr/libddr.a
+LIBS += arch/ppc/cpu/mpc8xxx/lib8xxx.a
 endif
 LIBS += drivers/rtc/librtc.a
 LIBS += drivers/serial/libserial.a
@@ -3768,7 +3768,7 @@ clobber:	clean
 	@rm -f $(obj)u-boot.kwb
 	@rm -f $(obj)u-boot.imx
 	@rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
-	@rm -f $(obj)cpu/mpc824x/bedbug_603e.c
+	@rm -f $(obj)arch/ppc/cpu/mpc824x/bedbug_603e.c
 	@rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
 	@[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
 	@[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f
diff --git a/README b/README
index e1d58bdf0..d5ccdc552 100644
--- a/README
+++ b/README
@@ -1393,7 +1393,7 @@ The following options need to be configured:
 		to run and CONFIG_SYS_I2C_SLAVE to be the address of this node (ie
 		the CPU's i2c node address).
 
-		Now, the u-boot i2c code for the mpc8xx (cpu/mpc8xx/i2c.c)
+		Now, the u-boot i2c code for the mpc8xx (arch/ppc/cpu/mpc8xx/i2c.c)
 		sets the CPU up as a master node and so its address should
 		therefore be cleared to 0 (See, eg, MPC823e User's Manual
 		p.16-473). So, set CONFIG_SYS_I2C_SLAVE to 0.
@@ -2703,7 +2703,7 @@ Low Level (hardware related) configuration options:
   CONFIG_SYS_PCI_MSTR_MEMIO_SIZE, CONFIG_SYS_POCMR1_MASK_ATTRIB, CONFIG_SYS_PCI_MSTR_IO_LOCAL,
   CONFIG_SYS_PCI_MSTR_IO_BUS, CONFIG_SYS_CPU_PCI_IO_START, CONFIG_SYS_PCI_MSTR_IO_SIZE,
   CONFIG_SYS_POCMR2_MASK_ATTRIB: (MPC826x only)
-		Overrides the default PCI memory map in cpu/mpc8260/pci.c if set.
+		Overrides the default PCI memory map in arch/ppc/cpu/mpc8260/pci.c if set.
 
 - CONFIG_PCI_DISABLE_PCIE:
 		Disable PCI-Express on systems where it is supported but not
diff --git a/cpu/74xx_7xx/Makefile b/arch/ppc/cpu/74xx_7xx/Makefile
index fe905f31f..fe905f31f 100644
--- a/cpu/74xx_7xx/Makefile
+++ b/arch/ppc/cpu/74xx_7xx/Makefile
diff --git a/cpu/74xx_7xx/cache.S b/arch/ppc/cpu/74xx_7xx/cache.S
index 66c72983d..66c72983d 100644
--- a/cpu/74xx_7xx/cache.S
+++ b/arch/ppc/cpu/74xx_7xx/cache.S
diff --git a/cpu/74xx_7xx/config.mk b/arch/ppc/cpu/74xx_7xx/config.mk
index df1f6aced..df1f6aced 100644
--- a/cpu/74xx_7xx/config.mk
+++ b/arch/ppc/cpu/74xx_7xx/config.mk
diff --git a/cpu/74xx_7xx/cpu.c b/arch/ppc/cpu/74xx_7xx/cpu.c
index 3c172779b..3c172779b 100644
--- a/cpu/74xx_7xx/cpu.c
+++ b/arch/ppc/cpu/74xx_7xx/cpu.c
diff --git a/cpu/74xx_7xx/cpu_init.c b/arch/ppc/cpu/74xx_7xx/cpu_init.c
index 1dd1b2cd8..1dd1b2cd8 100644
--- a/cpu/74xx_7xx/cpu_init.c
+++ b/arch/ppc/cpu/74xx_7xx/cpu_init.c
diff --git a/cpu/74xx_7xx/interrupts.c b/arch/ppc/cpu/74xx_7xx/interrupts.c
index 0ea1aec7a..0ea1aec7a 100644
--- a/cpu/74xx_7xx/interrupts.c
+++ b/arch/ppc/cpu/74xx_7xx/interrupts.c
diff --git a/cpu/74xx_7xx/io.S b/arch/ppc/cpu/74xx_7xx/io.S
index af2e6d12f..af2e6d12f 100644
--- a/cpu/74xx_7xx/io.S
+++ b/arch/ppc/cpu/74xx_7xx/io.S
diff --git a/cpu/74xx_7xx/kgdb.S b/arch/ppc/cpu/74xx_7xx/kgdb.S
index ad487cdaf..ad487cdaf 100644
--- a/cpu/74xx_7xx/kgdb.S
+++ b/arch/ppc/cpu/74xx_7xx/kgdb.S
diff --git a/cpu/74xx_7xx/speed.c b/arch/ppc/cpu/74xx_7xx/speed.c
index f2fdcd5dc..f2fdcd5dc 100644
--- a/cpu/74xx_7xx/speed.c
+++ b/arch/ppc/cpu/74xx_7xx/speed.c
diff --git a/cpu/74xx_7xx/start.S b/arch/ppc/cpu/74xx_7xx/start.S
index 88fdf88c3..88fdf88c3 100644
--- a/cpu/74xx_7xx/start.S
+++ b/arch/ppc/cpu/74xx_7xx/start.S
diff --git a/cpu/74xx_7xx/traps.c b/arch/ppc/cpu/74xx_7xx/traps.c
index 1d5dd017e..1d5dd017e 100644
--- a/cpu/74xx_7xx/traps.c
+++ b/arch/ppc/cpu/74xx_7xx/traps.c
diff --git a/cpu/mpc512x/Makefile b/arch/ppc/cpu/mpc512x/Makefile
index 427db7ae0..1719c66e8 100644
--- a/cpu/mpc512x/Makefile
+++ b/arch/ppc/cpu/mpc512x/Makefile
@@ -37,8 +37,8 @@ COBJS-y += iopin.o
 COBJS-y += serial.o
 COBJS-y += speed.o
 COBJS-${CONFIG_FSL_DIU_FB} += diu.o
-COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_diu_fb.o
-COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_logo_bmp.o
+COBJS-${CONFIG_FSL_DIU_FB} += ../../../../board/freescale/common/fsl_diu_fb.o
+COBJS-${CONFIG_FSL_DIU_FB} += ../../../../board/freescale/common/fsl_logo_bmp.o
 COBJS-${CONFIG_CMD_IDE} += ide.o
 COBJS-${CONFIG_IIM} += iim.o
 COBJS-$(CONFIG_PCI) += pci.o
diff --git a/cpu/mpc512x/asm-offsets.h b/arch/ppc/cpu/mpc512x/asm-offsets.h
index 4b147783f..5873fe05e 100644
--- a/cpu/mpc512x/asm-offsets.h
+++ b/arch/ppc/cpu/mpc512x/asm-offsets.h
@@ -1,5 +1,5 @@
 /*
- * needed for cpu/mpc512x/start.S
+ * needed for arch/ppc/cpu/mpc512x/start.S
  *
  * These should be auto-generated
  */
diff --git a/cpu/mpc512x/config.mk b/arch/ppc/cpu/mpc512x/config.mk
index fb0a563e6..b6727dcd2 100644
--- a/cpu/mpc512x/config.mk
+++ b/arch/ppc/cpu/mpc512x/config.mk
@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \
 
 # Use default linker script.
 # A board port can override this setting in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc512x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc512x/u-boot.lds
diff --git a/cpu/mpc512x/cpu.c b/arch/ppc/cpu/mpc512x/cpu.c
index 09cbd2024..09cbd2024 100644
--- a/cpu/mpc512x/cpu.c
+++ b/arch/ppc/cpu/mpc512x/cpu.c
diff --git a/cpu/mpc512x/cpu_init.c b/arch/ppc/cpu/mpc512x/cpu_init.c
index fe6beaf84..fe6beaf84 100644
--- a/cpu/mpc512x/cpu_init.c
+++ b/arch/ppc/cpu/mpc512x/cpu_init.c
diff --git a/cpu/mpc512x/diu.c b/arch/ppc/cpu/mpc512x/diu.c
index c2453c68d..93611615f 100644
--- a/cpu/mpc512x/diu.c
+++ b/arch/ppc/cpu/mpc512x/diu.c
@@ -27,7 +27,7 @@
 #include <command.h>
 #include <asm/io.h>
 
-#include "../../board/freescale/common/fsl_diu_fb.h"
+#include "../../../../board/freescale/common/fsl_diu_fb.h"
 
 #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
 #include <stdio_dev.h>
diff --git a/cpu/mpc512x/fixed_sdram.c b/arch/ppc/cpu/mpc512x/fixed_sdram.c
index 442b5fc91..442b5fc91 100644
--- a/cpu/mpc512x/fixed_sdram.c
+++ b/arch/ppc/cpu/mpc512x/fixed_sdram.c
diff --git a/cpu/mpc512x/i2c.c b/arch/ppc/cpu/mpc512x/i2c.c
index e2d909751..e2d909751 100644
--- a/cpu/mpc512x/i2c.c
+++ b/arch/ppc/cpu/mpc512x/i2c.c
diff --git a/cpu/mpc512x/ide.c b/arch/ppc/cpu/mpc512x/ide.c
index dd6b2f467..dd6b2f467 100644
--- a/cpu/mpc512x/ide.c
+++ b/arch/ppc/cpu/mpc512x/ide.c
diff --git a/cpu/mpc512x/iim.c b/arch/ppc/cpu/mpc512x/iim.c
index 8f2eb37e1..8f2eb37e1 100644
--- a/cpu/mpc512x/iim.c
+++ b/arch/ppc/cpu/mpc512x/iim.c
diff --git a/cpu/mpc512x/interrupts.c b/arch/ppc/cpu/mpc512x/interrupts.c
index ef7c773b2..ef7c773b2 100644
--- a/cpu/mpc512x/interrupts.c
+++ b/arch/ppc/cpu/mpc512x/interrupts.c
diff --git a/cpu/mpc512x/iopin.c b/arch/ppc/cpu/mpc512x/iopin.c
index be2094762..be2094762 100644
--- a/cpu/mpc512x/iopin.c
+++ b/arch/ppc/cpu/mpc512x/iopin.c
diff --git a/cpu/mpc512x/pci.c b/arch/ppc/cpu/mpc512x/pci.c
index 141db8b86..141db8b86 100644
--- a/cpu/mpc512x/pci.c
+++ b/arch/ppc/cpu/mpc512x/pci.c
diff --git a/cpu/mpc512x/serial.c b/arch/ppc/cpu/mpc512x/serial.c
index ec2f41bb3..ec2f41bb3 100644
--- a/cpu/mpc512x/serial.c
+++ b/arch/ppc/cpu/mpc512x/serial.c
diff --git a/cpu/mpc512x/speed.c b/arch/ppc/cpu/mpc512x/speed.c
index ce8d0949b..ce8d0949b 100644
--- a/cpu/mpc512x/speed.c
+++ b/arch/ppc/cpu/mpc512x/speed.c
diff --git a/cpu/mpc512x/start.S b/arch/ppc/cpu/mpc512x/start.S
index d26b61707..d26b61707 100644
--- a/cpu/mpc512x/start.S
+++ b/arch/ppc/cpu/mpc512x/start.S
diff --git a/cpu/mpc512x/traps.c b/arch/ppc/cpu/mpc512x/traps.c
index 786f4a5a7..786f4a5a7 100644
--- a/cpu/mpc512x/traps.c
+++ b/arch/ppc/cpu/mpc512x/traps.c
diff --git a/cpu/mpc512x/u-boot.lds b/arch/ppc/cpu/mpc512x/u-boot.lds
index 2e260eb2a..fbc2026d5 100644
--- a/cpu/mpc512x/u-boot.lds
+++ b/arch/ppc/cpu/mpc512x/u-boot.lds
@@ -49,7 +49,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc512x/start.o	(.text)
+    arch/ppc/cpu/mpc512x/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/cpu/mpc5xx/Makefile b/arch/ppc/cpu/mpc5xx/Makefile
index 8aab0189d..f2ebb9a12 100644
--- a/cpu/mpc5xx/Makefile
+++ b/arch/ppc/cpu/mpc5xx/Makefile
@@ -25,11 +25,11 @@
 #
 
 #
-# File:			cpu/mpc5xx/Makefile
+# File:			arch/ppc/cpu/mpc5xx/Makefile
 #
 # Discription:		Makefile to build mpc5xx cpu configuration.
 #			Will include top config.mk which itselfs
-#			uses the definitions made in cpu/mpc5xx/config.mk
+#			uses the definitions made in arch/ppc/cpu/mpc5xx/config.mk
 #
 
 
diff --git a/cpu/mpc5xx/config.mk b/arch/ppc/cpu/mpc5xx/config.mk
index 78549249b..e0b0ce1fd 100644
--- a/cpu/mpc5xx/config.mk
+++ b/arch/ppc/cpu/mpc5xx/config.mk
@@ -33,4 +33,4 @@ PLATFORM_RELFLAGS +=	-fPIC -meabi
 PLATFORM_CPPFLAGS +=	-DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xx/u-boot.lds
diff --git a/cpu/mpc5xx/cpu.c b/arch/ppc/cpu/mpc5xx/cpu.c
index 7fffebcc1..7fffebcc1 100644
--- a/cpu/mpc5xx/cpu.c
+++ b/arch/ppc/cpu/mpc5xx/cpu.c
diff --git a/cpu/mpc5xx/cpu_init.c b/arch/ppc/cpu/mpc5xx/cpu_init.c
index cb4bf8473..cb4bf8473 100644
--- a/cpu/mpc5xx/cpu_init.c
+++ b/arch/ppc/cpu/mpc5xx/cpu_init.c
diff --git a/cpu/mpc5xx/interrupts.c b/arch/ppc/cpu/mpc5xx/interrupts.c
index 167543fcf..167543fcf 100644
--- a/cpu/mpc5xx/interrupts.c
+++ b/arch/ppc/cpu/mpc5xx/interrupts.c
diff --git a/cpu/mpc5xx/serial.c b/arch/ppc/cpu/mpc5xx/serial.c
index 88c6db81c..88c6db81c 100644
--- a/cpu/mpc5xx/serial.c
+++ b/arch/ppc/cpu/mpc5xx/serial.c
diff --git a/cpu/mpc5xx/speed.c b/arch/ppc/cpu/mpc5xx/speed.c
index ea5c1dead..ea5c1dead 100644
--- a/cpu/mpc5xx/speed.c
+++ b/arch/ppc/cpu/mpc5xx/speed.c
diff --git a/cpu/mpc5xx/spi.c b/arch/ppc/cpu/mpc5xx/spi.c
index 3ca15ea83..3ca15ea83 100644
--- a/cpu/mpc5xx/spi.c
+++ b/arch/ppc/cpu/mpc5xx/spi.c
diff --git a/cpu/mpc5xx/start.S b/arch/ppc/cpu/mpc5xx/start.S
index 0af879e39..0af879e39 100644
--- a/cpu/mpc5xx/start.S
+++ b/arch/ppc/cpu/mpc5xx/start.S
diff --git a/cpu/mpc5xx/traps.c b/arch/ppc/cpu/mpc5xx/traps.c
index 6882c21a4..6882c21a4 100644
--- a/cpu/mpc5xx/traps.c
+++ b/arch/ppc/cpu/mpc5xx/traps.c
diff --git a/cpu/mpc5xx/u-boot.lds b/arch/ppc/cpu/mpc5xx/u-boot.lds
index deeb06ae2..55190c72d 100644
--- a/cpu/mpc5xx/u-boot.lds
+++ b/arch/ppc/cpu/mpc5xx/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc5xx/start.o	(.text)
+    arch/ppc/cpu/mpc5xx/start.o	(.text)
 
     *(.text)
     *(.got1)
diff --git a/cpu/mpc5xxx/Makefile b/arch/ppc/cpu/mpc5xxx/Makefile
index 0ee061155..0ee061155 100644
--- a/cpu/mpc5xxx/Makefile
+++ b/arch/ppc/cpu/mpc5xxx/Makefile
diff --git a/cpu/mpc5xxx/config.mk b/arch/ppc/cpu/mpc5xxx/config.mk
index 5e82f67ea..9a64cb623 100644
--- a/cpu/mpc5xxx/config.mk
+++ b/arch/ppc/cpu/mpc5xxx/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 \
 		     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds
diff --git a/cpu/mpc5xxx/cpu.c b/arch/ppc/cpu/mpc5xxx/cpu.c
index b20234d32..b20234d32 100644
--- a/cpu/mpc5xxx/cpu.c
+++ b/arch/ppc/cpu/mpc5xxx/cpu.c
diff --git a/cpu/mpc5xxx/cpu_init.c b/arch/ppc/cpu/mpc5xxx/cpu_init.c
index 9daf3755a..9daf3755a 100644
--- a/cpu/mpc5xxx/cpu_init.c
+++ b/arch/ppc/cpu/mpc5xxx/cpu_init.c
diff --git a/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S b/arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
index 00c23121a..00c23121a 100644
--- a/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
+++ b/arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
diff --git a/cpu/mpc5xxx/i2c.c b/arch/ppc/cpu/mpc5xxx/i2c.c
index 4f7f71632..4f7f71632 100644
--- a/cpu/mpc5xxx/i2c.c
+++ b/arch/ppc/cpu/mpc5xxx/i2c.c
diff --git a/cpu/mpc5xxx/ide.c b/arch/ppc/cpu/mpc5xxx/ide.c
index d337abb1c..d337abb1c 100644
--- a/cpu/mpc5xxx/ide.c
+++ b/arch/ppc/cpu/mpc5xxx/ide.c
diff --git a/cpu/mpc5xxx/interrupts.c b/arch/ppc/cpu/mpc5xxx/interrupts.c
index 6035771ee..6035771ee 100644
--- a/cpu/mpc5xxx/interrupts.c
+++ b/arch/ppc/cpu/mpc5xxx/interrupts.c
diff --git a/cpu/mpc5xxx/io.S b/arch/ppc/cpu/mpc5xxx/io.S
index 2178a2676..2178a2676 100644
--- a/cpu/mpc5xxx/io.S
+++ b/arch/ppc/cpu/mpc5xxx/io.S
diff --git a/cpu/mpc5xxx/loadtask.c b/arch/ppc/cpu/mpc5xxx/loadtask.c
index 47e7b596a..47e7b596a 100644
--- a/cpu/mpc5xxx/loadtask.c
+++ b/arch/ppc/cpu/mpc5xxx/loadtask.c
diff --git a/cpu/mpc5xxx/pci_mpc5200.c b/arch/ppc/cpu/mpc5xxx/pci_mpc5200.c
index 8268f8afe..8268f8afe 100644
--- a/cpu/mpc5xxx/pci_mpc5200.c
+++ b/arch/ppc/cpu/mpc5xxx/pci_mpc5200.c
diff --git a/cpu/mpc5xxx/serial.c b/arch/ppc/cpu/mpc5xxx/serial.c
index 66759887c..66759887c 100644
--- a/cpu/mpc5xxx/serial.c
+++ b/arch/ppc/cpu/mpc5xxx/serial.c
diff --git a/cpu/mpc5xxx/speed.c b/arch/ppc/cpu/mpc5xxx/speed.c
index 8027d3e08..8027d3e08 100644
--- a/cpu/mpc5xxx/speed.c
+++ b/arch/ppc/cpu/mpc5xxx/speed.c
diff --git a/cpu/mpc5xxx/start.S b/arch/ppc/cpu/mpc5xxx/start.S
index ba4994421..ba4994421 100644
--- a/cpu/mpc5xxx/start.S
+++ b/arch/ppc/cpu/mpc5xxx/start.S
diff --git a/cpu/mpc5xxx/traps.c b/arch/ppc/cpu/mpc5xxx/traps.c
index 934a2f2ab..934a2f2ab 100644
--- a/cpu/mpc5xxx/traps.c
+++ b/arch/ppc/cpu/mpc5xxx/traps.c
diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
index 6c80139f2..81ebde987 100644
--- a/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within  */
     /* the sector layout of our flash chips!    XXX FIXME XXX   */
 
-    cpu/mpc5xxx/start.o          (.text)
-    cpu/mpc5xxx/traps.o          (.text)
+    arch/ppc/cpu/mpc5xxx/start.o          (.text)
+    arch/ppc/cpu/mpc5xxx/traps.o          (.text)
     lib/crc32.o         (.text)
     arch/ppc/lib/cache.o             (.text)
     arch/ppc/lib/time.o              (.text)
diff --git a/cpu/mpc5xxx/u-boot.lds b/arch/ppc/cpu/mpc5xxx/u-boot.lds
index 7fe1e9512..64ef48129 100644
--- a/cpu/mpc5xxx/u-boot.lds
+++ b/arch/ppc/cpu/mpc5xxx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc5xxx/start.o	(.text)
+    arch/ppc/cpu/mpc5xxx/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/cpu/mpc5xxx/usb.c b/arch/ppc/cpu/mpc5xxx/usb.c
index bec7da3ea..bec7da3ea 100644
--- a/cpu/mpc5xxx/usb.c
+++ b/arch/ppc/cpu/mpc5xxx/usb.c
diff --git a/cpu/mpc5xxx/usb_ohci.c b/arch/ppc/cpu/mpc5xxx/usb_ohci.c
index 7976e4df7..7976e4df7 100644
--- a/cpu/mpc5xxx/usb_ohci.c
+++ b/arch/ppc/cpu/mpc5xxx/usb_ohci.c
diff --git a/cpu/mpc5xxx/usb_ohci.h b/arch/ppc/cpu/mpc5xxx/usb_ohci.h
index 629b529a6..629b529a6 100644
--- a/cpu/mpc5xxx/usb_ohci.h
+++ b/arch/ppc/cpu/mpc5xxx/usb_ohci.h
diff --git a/cpu/mpc8220/Makefile b/arch/ppc/cpu/mpc8220/Makefile
index b4fad286d..b4fad286d 100644
--- a/cpu/mpc8220/Makefile
+++ b/arch/ppc/cpu/mpc8220/Makefile
diff --git a/cpu/mpc8220/config.mk b/arch/ppc/cpu/mpc8220/config.mk
index 3ce40c0db..e2ebf38bd 100644
--- a/cpu/mpc8220/config.mk
+++ b/arch/ppc/cpu/mpc8220/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 \
 		     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc8220/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8220/u-boot.lds
diff --git a/cpu/mpc8220/cpu.c b/arch/ppc/cpu/mpc8220/cpu.c
index 563cfe053..563cfe053 100644
--- a/cpu/mpc8220/cpu.c
+++ b/arch/ppc/cpu/mpc8220/cpu.c
diff --git a/cpu/mpc8220/cpu_init.c b/arch/ppc/cpu/mpc8220/cpu_init.c
index 8f52c7dd0..8f52c7dd0 100644
--- a/cpu/mpc8220/cpu_init.c
+++ b/arch/ppc/cpu/mpc8220/cpu_init.c
diff --git a/cpu/mpc8220/dma.h b/arch/ppc/cpu/mpc8220/dma.h
index d06ee6313..d06ee6313 100644
--- a/cpu/mpc8220/dma.h
+++ b/arch/ppc/cpu/mpc8220/dma.h
diff --git a/cpu/mpc8220/dramSetup.c b/arch/ppc/cpu/mpc8220/dramSetup.c
index 52cf1333f..52cf1333f 100644
--- a/cpu/mpc8220/dramSetup.c
+++ b/arch/ppc/cpu/mpc8220/dramSetup.c
diff --git a/cpu/mpc8220/dramSetup.h b/arch/ppc/cpu/mpc8220/dramSetup.h
index 3b64e088c..3b64e088c 100644
--- a/cpu/mpc8220/dramSetup.h
+++ b/arch/ppc/cpu/mpc8220/dramSetup.h
diff --git a/cpu/mpc8220/fec.c b/arch/ppc/cpu/mpc8220/fec.c
index 992e0ffbc..992e0ffbc 100644
--- a/cpu/mpc8220/fec.c
+++ b/arch/ppc/cpu/mpc8220/fec.c
diff --git a/cpu/mpc8220/fec.h b/arch/ppc/cpu/mpc8220/fec.h
index a8927fcdb..a8927fcdb 100644
--- a/cpu/mpc8220/fec.h
+++ b/arch/ppc/cpu/mpc8220/fec.h
diff --git a/cpu/mpc8220/fec_dma_tasks.S b/arch/ppc/cpu/mpc8220/fec_dma_tasks.S
index 3f8a03bf1..3f8a03bf1 100644
--- a/cpu/mpc8220/fec_dma_tasks.S
+++ b/arch/ppc/cpu/mpc8220/fec_dma_tasks.S
diff --git a/cpu/mpc8220/i2c.c b/arch/ppc/cpu/mpc8220/i2c.c
index 76ecdf11e..76ecdf11e 100644
--- a/cpu/mpc8220/i2c.c
+++ b/arch/ppc/cpu/mpc8220/i2c.c
diff --git a/cpu/mpc8220/i2cCore.c b/arch/ppc/cpu/mpc8220/i2cCore.c
index b89ad034f..b89ad034f 100644
--- a/cpu/mpc8220/i2cCore.c
+++ b/arch/ppc/cpu/mpc8220/i2cCore.c
diff --git a/cpu/mpc8220/i2cCore.h b/arch/ppc/cpu/mpc8220/i2cCore.h
index 72783fd48..72783fd48 100644
--- a/cpu/mpc8220/i2cCore.h
+++ b/arch/ppc/cpu/mpc8220/i2cCore.h
diff --git a/cpu/mpc8220/interrupts.c b/arch/ppc/cpu/mpc8220/interrupts.c
index 78e99179c..78e99179c 100644
--- a/cpu/mpc8220/interrupts.c
+++ b/arch/ppc/cpu/mpc8220/interrupts.c
diff --git a/cpu/mpc8220/io.S b/arch/ppc/cpu/mpc8220/io.S
index 5ecdf550a..5ecdf550a 100644
--- a/cpu/mpc8220/io.S
+++ b/arch/ppc/cpu/mpc8220/io.S
diff --git a/cpu/mpc8220/loadtask.c b/arch/ppc/cpu/mpc8220/loadtask.c
index 6d8b627e8..6d8b627e8 100644
--- a/cpu/mpc8220/loadtask.c
+++ b/arch/ppc/cpu/mpc8220/loadtask.c
diff --git a/cpu/mpc8220/pci.c b/arch/ppc/cpu/mpc8220/pci.c
index 7ef43b72c..7ef43b72c 100644
--- a/cpu/mpc8220/pci.c
+++ b/arch/ppc/cpu/mpc8220/pci.c
diff --git a/cpu/mpc8220/speed.c b/arch/ppc/cpu/mpc8220/speed.c
index 62ac845b7..62ac845b7 100644
--- a/cpu/mpc8220/speed.c
+++ b/arch/ppc/cpu/mpc8220/speed.c
diff --git a/cpu/mpc8220/start.S b/arch/ppc/cpu/mpc8220/start.S
index e28999d32..e28999d32 100644
--- a/cpu/mpc8220/start.S
+++ b/arch/ppc/cpu/mpc8220/start.S
diff --git a/cpu/mpc8220/traps.c b/arch/ppc/cpu/mpc8220/traps.c
index 456578001..456578001 100644
--- a/cpu/mpc8220/traps.c
+++ b/arch/ppc/cpu/mpc8220/traps.c
diff --git a/cpu/mpc8220/u-boot.lds b/arch/ppc/cpu/mpc8220/u-boot.lds
index 4400e60c8..8c5d3071f 100644
--- a/cpu/mpc8220/u-boot.lds
+++ b/arch/ppc/cpu/mpc8220/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8220/start.o	(.text)
+    arch/ppc/cpu/mpc8220/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/cpu/mpc8220/uart.c b/arch/ppc/cpu/mpc8220/uart.c
index 0c4b536b4..0c4b536b4 100644
--- a/cpu/mpc8220/uart.c
+++ b/arch/ppc/cpu/mpc8220/uart.c
diff --git a/cpu/mpc824x/.gitignore b/arch/ppc/cpu/mpc824x/.gitignore
index 2d79931e9..2d79931e9 100644
--- a/cpu/mpc824x/.gitignore
+++ b/arch/ppc/cpu/mpc824x/.gitignore
diff --git a/cpu/mpc824x/Makefile b/arch/ppc/cpu/mpc824x/Makefile
index a57ad12c4..a57ad12c4 100644
--- a/cpu/mpc824x/Makefile
+++ b/arch/ppc/cpu/mpc824x/Makefile
diff --git a/cpu/mpc824x/config.mk b/arch/ppc/cpu/mpc824x/config.mk
index 940474bbd..31ecd20d9 100644
--- a/cpu/mpc824x/config.mk
+++ b/arch/ppc/cpu/mpc824x/config.mk
@@ -26,4 +26,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi
 PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc824x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc824x/u-boot.lds
diff --git a/cpu/mpc824x/cpu.c b/arch/ppc/cpu/mpc824x/cpu.c
index 08f6a947f..08f6a947f 100644
--- a/cpu/mpc824x/cpu.c
+++ b/arch/ppc/cpu/mpc824x/cpu.c
diff --git a/cpu/mpc824x/cpu_init.c b/arch/ppc/cpu/mpc824x/cpu_init.c
index 395f7767d..395f7767d 100644
--- a/cpu/mpc824x/cpu_init.c
+++ b/arch/ppc/cpu/mpc824x/cpu_init.c
diff --git a/cpu/mpc824x/drivers/epic.h b/arch/ppc/cpu/mpc824x/drivers/epic.h
index 2803f631c..2803f631c 100644
--- a/cpu/mpc824x/drivers/epic.h
+++ b/arch/ppc/cpu/mpc824x/drivers/epic.h
diff --git a/cpu/mpc824x/drivers/epic/README b/arch/ppc/cpu/mpc824x/drivers/epic/README
index 57989969b..57989969b 100644
--- a/cpu/mpc824x/drivers/epic/README
+++ b/arch/ppc/cpu/mpc824x/drivers/epic/README
diff --git a/cpu/mpc824x/drivers/epic/epic.h b/arch/ppc/cpu/mpc824x/drivers/epic/epic.h
index 58f81c5df..58f81c5df 100644
--- a/cpu/mpc824x/drivers/epic/epic.h
+++ b/arch/ppc/cpu/mpc824x/drivers/epic/epic.h
diff --git a/cpu/mpc824x/drivers/epic/epic1.c b/arch/ppc/cpu/mpc824x/drivers/epic/epic1.c
index ecbb42d0d..ecbb42d0d 100644
--- a/cpu/mpc824x/drivers/epic/epic1.c
+++ b/arch/ppc/cpu/mpc824x/drivers/epic/epic1.c
diff --git a/cpu/mpc824x/drivers/epic/epic2.S b/arch/ppc/cpu/mpc824x/drivers/epic/epic2.S
index 52d19aae8..52d19aae8 100644
--- a/cpu/mpc824x/drivers/epic/epic2.S
+++ b/arch/ppc/cpu/mpc824x/drivers/epic/epic2.S
diff --git a/cpu/mpc824x/drivers/epic/epicutil.S b/arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S
index 4877050ba..4877050ba 100644
--- a/cpu/mpc824x/drivers/epic/epicutil.S
+++ b/arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S
diff --git a/cpu/mpc824x/drivers/errors.h b/arch/ppc/cpu/mpc824x/drivers/errors.h
index 20794a2e8..20794a2e8 100644
--- a/cpu/mpc824x/drivers/errors.h
+++ b/arch/ppc/cpu/mpc824x/drivers/errors.h
diff --git a/cpu/mpc824x/drivers/i2c/i2c.c b/arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c
index 637ae4c1b..637ae4c1b 100644
--- a/cpu/mpc824x/drivers/i2c/i2c.c
+++ b/arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c
diff --git a/cpu/mpc824x/drivers/i2c_export.h b/arch/ppc/cpu/mpc824x/drivers/i2c_export.h
index 6264d189b..6264d189b 100644
--- a/cpu/mpc824x/drivers/i2c_export.h
+++ b/arch/ppc/cpu/mpc824x/drivers/i2c_export.h
diff --git a/cpu/mpc824x/interrupts.c b/arch/ppc/cpu/mpc824x/interrupts.c
index 139c52cd3..139c52cd3 100644
--- a/cpu/mpc824x/interrupts.c
+++ b/arch/ppc/cpu/mpc824x/interrupts.c
diff --git a/cpu/mpc824x/pci.c b/arch/ppc/cpu/mpc824x/pci.c
index cf9cf41ae..cf9cf41ae 100644
--- a/cpu/mpc824x/pci.c
+++ b/arch/ppc/cpu/mpc824x/pci.c
diff --git a/cpu/mpc824x/speed.c b/arch/ppc/cpu/mpc824x/speed.c
index fdcb9723c..fdcb9723c 100644
--- a/cpu/mpc824x/speed.c
+++ b/arch/ppc/cpu/mpc824x/speed.c
diff --git a/cpu/mpc824x/start.S b/arch/ppc/cpu/mpc824x/start.S
index f3f595af2..f3f595af2 100644
--- a/cpu/mpc824x/start.S
+++ b/arch/ppc/cpu/mpc824x/start.S
diff --git a/cpu/mpc824x/traps.c b/arch/ppc/cpu/mpc824x/traps.c
index 0a7243020..0a7243020 100644
--- a/cpu/mpc824x/traps.c
+++ b/arch/ppc/cpu/mpc824x/traps.c
diff --git a/cpu/mpc8260/u-boot.lds b/arch/ppc/cpu/mpc824x/u-boot.lds
index c777cf9da..8a6d5084e 100644
--- a/cpu/mpc8260/u-boot.lds
+++ b/arch/ppc/cpu/mpc824x/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8260/start.o		(.text)
+    arch/ppc/cpu/mpc824x/start.o		(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/cpu/mpc8260/Makefile b/arch/ppc/cpu/mpc8260/Makefile
index 9f0c2dd50..9f0c2dd50 100644
--- a/cpu/mpc8260/Makefile
+++ b/arch/ppc/cpu/mpc8260/Makefile
diff --git a/cpu/mpc8260/bedbug_603e.c b/arch/ppc/cpu/mpc8260/bedbug_603e.c
index c969ff65e..c969ff65e 100644
--- a/cpu/mpc8260/bedbug_603e.c
+++ b/arch/ppc/cpu/mpc8260/bedbug_603e.c
diff --git a/cpu/mpc8260/commproc.c b/arch/ppc/cpu/mpc8260/commproc.c
index 94f6bc224..94f6bc224 100644
--- a/cpu/mpc8260/commproc.c
+++ b/arch/ppc/cpu/mpc8260/commproc.c
diff --git a/cpu/mpc8260/config.mk b/arch/ppc/cpu/mpc8260/config.mk
index 39d81eef8..51bb9faf2 100644
--- a/cpu/mpc8260/config.mk
+++ b/arch/ppc/cpu/mpc8260/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 \
 		     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc8260/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8260/u-boot.lds
diff --git a/cpu/mpc8260/cpu.c b/arch/ppc/cpu/mpc8260/cpu.c
index aedbf297a..aedbf297a 100644
--- a/cpu/mpc8260/cpu.c
+++ b/arch/ppc/cpu/mpc8260/cpu.c
diff --git a/cpu/mpc8260/cpu_init.c b/arch/ppc/cpu/mpc8260/cpu_init.c
index 1d5277344..1d5277344 100644
--- a/cpu/mpc8260/cpu_init.c
+++ b/arch/ppc/cpu/mpc8260/cpu_init.c
diff --git a/cpu/mpc8260/ether_fcc.c b/arch/ppc/cpu/mpc8260/ether_fcc.c
index 5ac02a09c..5ac02a09c 100644
--- a/cpu/mpc8260/ether_fcc.c
+++ b/arch/ppc/cpu/mpc8260/ether_fcc.c
diff --git a/cpu/mpc8260/ether_scc.c b/arch/ppc/cpu/mpc8260/ether_scc.c
index 432111df4..432111df4 100644
--- a/cpu/mpc8260/ether_scc.c
+++ b/arch/ppc/cpu/mpc8260/ether_scc.c
diff --git a/cpu/mpc8260/i2c.c b/arch/ppc/cpu/mpc8260/i2c.c
index d2bdcc2d8..d2bdcc2d8 100644
--- a/cpu/mpc8260/i2c.c
+++ b/arch/ppc/cpu/mpc8260/i2c.c
diff --git a/cpu/mpc8260/interrupts.c b/arch/ppc/cpu/mpc8260/interrupts.c
index a7700c4b6..a7700c4b6 100644
--- a/cpu/mpc8260/interrupts.c
+++ b/arch/ppc/cpu/mpc8260/interrupts.c
diff --git a/cpu/mpc8260/kgdb.S b/arch/ppc/cpu/mpc8260/kgdb.S
index c5936c734..c5936c734 100644
--- a/cpu/mpc8260/kgdb.S
+++ b/arch/ppc/cpu/mpc8260/kgdb.S
diff --git a/cpu/mpc8260/pci.c b/arch/ppc/cpu/mpc8260/pci.c
index 6a14ba4ad..6a14ba4ad 100644
--- a/cpu/mpc8260/pci.c
+++ b/arch/ppc/cpu/mpc8260/pci.c
diff --git a/cpu/mpc8260/serial_scc.c b/arch/ppc/cpu/mpc8260/serial_scc.c
index 4ab6a2864..4ab6a2864 100644
--- a/cpu/mpc8260/serial_scc.c
+++ b/arch/ppc/cpu/mpc8260/serial_scc.c
diff --git a/cpu/mpc8260/serial_smc.c b/arch/ppc/cpu/mpc8260/serial_smc.c
index fbb3fb042..fbb3fb042 100644
--- a/cpu/mpc8260/serial_smc.c
+++ b/arch/ppc/cpu/mpc8260/serial_smc.c
diff --git a/cpu/mpc8260/speed.c b/arch/ppc/cpu/mpc8260/speed.c
index 0e1c2b065..0e1c2b065 100644
--- a/cpu/mpc8260/speed.c
+++ b/arch/ppc/cpu/mpc8260/speed.c
diff --git a/cpu/mpc8260/speed.h b/arch/ppc/cpu/mpc8260/speed.h
index 3f32a143c..3f32a143c 100644
--- a/cpu/mpc8260/speed.h
+++ b/arch/ppc/cpu/mpc8260/speed.h
diff --git a/cpu/mpc8260/spi.c b/arch/ppc/cpu/mpc8260/spi.c
index f5d2ac35a..f5d2ac35a 100644
--- a/cpu/mpc8260/spi.c
+++ b/arch/ppc/cpu/mpc8260/spi.c
diff --git a/cpu/mpc8260/start.S b/arch/ppc/cpu/mpc8260/start.S
index 1fc70bc5e..1fc70bc5e 100644
--- a/cpu/mpc8260/start.S
+++ b/arch/ppc/cpu/mpc8260/start.S
diff --git a/cpu/mpc8260/traps.c b/arch/ppc/cpu/mpc8260/traps.c
index d216f71f9..d216f71f9 100644
--- a/cpu/mpc8260/traps.c
+++ b/arch/ppc/cpu/mpc8260/traps.c
diff --git a/cpu/mpc824x/u-boot.lds b/arch/ppc/cpu/mpc8260/u-boot.lds
index 0eac48f2c..988784416 100644
--- a/cpu/mpc824x/u-boot.lds
+++ b/arch/ppc/cpu/mpc8260/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc824x/start.o		(.text)
+    arch/ppc/cpu/mpc8260/start.o		(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/cpu/mpc83xx/Makefile b/arch/ppc/cpu/mpc83xx/Makefile
index 15e2c18b1..15e2c18b1 100644
--- a/cpu/mpc83xx/Makefile
+++ b/arch/ppc/cpu/mpc83xx/Makefile
diff --git a/cpu/mpc83xx/config.mk b/arch/ppc/cpu/mpc83xx/config.mk
index e80919bc2..8596f6a5e 100644
--- a/cpu/mpc83xx/config.mk
+++ b/arch/ppc/cpu/mpc83xx/config.mk
@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC83xx -DCONFIG_E300 \
 			-ffixed-r2 -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc83xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc83xx/u-boot.lds
diff --git a/cpu/mpc83xx/cpu.c b/arch/ppc/cpu/mpc83xx/cpu.c
index 51180d6da..51180d6da 100644
--- a/cpu/mpc83xx/cpu.c
+++ b/arch/ppc/cpu/mpc83xx/cpu.c
diff --git a/cpu/mpc83xx/cpu_init.c b/arch/ppc/cpu/mpc83xx/cpu_init.c
index 75b45222b..75b45222b 100644
--- a/cpu/mpc83xx/cpu_init.c
+++ b/arch/ppc/cpu/mpc83xx/cpu_init.c
diff --git a/cpu/mpc83xx/ecc.c b/arch/ppc/cpu/mpc83xx/ecc.c
index f3942b411..f3942b411 100644
--- a/cpu/mpc83xx/ecc.c
+++ b/arch/ppc/cpu/mpc83xx/ecc.c
diff --git a/cpu/mpc83xx/fdt.c b/arch/ppc/cpu/mpc83xx/fdt.c
index daf73a6e5..daf73a6e5 100644
--- a/cpu/mpc83xx/fdt.c
+++ b/arch/ppc/cpu/mpc83xx/fdt.c
diff --git a/cpu/mpc83xx/interrupts.c b/arch/ppc/cpu/mpc83xx/interrupts.c
index faffbaf83..faffbaf83 100644
--- a/cpu/mpc83xx/interrupts.c
+++ b/arch/ppc/cpu/mpc83xx/interrupts.c
diff --git a/cpu/mpc83xx/nand_init.c b/arch/ppc/cpu/mpc83xx/nand_init.c
index 38e141a82..38e141a82 100644
--- a/cpu/mpc83xx/nand_init.c
+++ b/arch/ppc/cpu/mpc83xx/nand_init.c
diff --git a/cpu/mpc83xx/pci.c b/arch/ppc/cpu/mpc83xx/pci.c
index a42b230ff..a42b230ff 100644
--- a/cpu/mpc83xx/pci.c
+++ b/arch/ppc/cpu/mpc83xx/pci.c
diff --git a/cpu/mpc83xx/pcie.c b/arch/ppc/cpu/mpc83xx/pcie.c
index 77f8906b9..77f8906b9 100644
--- a/cpu/mpc83xx/pcie.c
+++ b/arch/ppc/cpu/mpc83xx/pcie.c
diff --git a/cpu/mpc83xx/qe_io.c b/arch/ppc/cpu/mpc83xx/qe_io.c
index db94f0009..db94f0009 100644
--- a/cpu/mpc83xx/qe_io.c
+++ b/arch/ppc/cpu/mpc83xx/qe_io.c
diff --git a/cpu/mpc83xx/serdes.c b/arch/ppc/cpu/mpc83xx/serdes.c
index 64033fe4c..64033fe4c 100644
--- a/cpu/mpc83xx/serdes.c
+++ b/arch/ppc/cpu/mpc83xx/serdes.c
diff --git a/cpu/mpc83xx/spd_sdram.c b/arch/ppc/cpu/mpc83xx/spd_sdram.c
index 44aaa9abc..44aaa9abc 100644
--- a/cpu/mpc83xx/spd_sdram.c
+++ b/arch/ppc/cpu/mpc83xx/spd_sdram.c
diff --git a/cpu/mpc83xx/speed.c b/arch/ppc/cpu/mpc83xx/speed.c
index bde7e920a..bde7e920a 100644
--- a/cpu/mpc83xx/speed.c
+++ b/arch/ppc/cpu/mpc83xx/speed.c
diff --git a/cpu/mpc83xx/start.S b/arch/ppc/cpu/mpc83xx/start.S
index 68bb6209c..68bb6209c 100644
--- a/cpu/mpc83xx/start.S
+++ b/arch/ppc/cpu/mpc83xx/start.S
diff --git a/cpu/mpc83xx/traps.c b/arch/ppc/cpu/mpc83xx/traps.c
index 9d71b8b73..9d71b8b73 100644
--- a/cpu/mpc83xx/traps.c
+++ b/arch/ppc/cpu/mpc83xx/traps.c
diff --git a/cpu/mpc83xx/u-boot.lds b/arch/ppc/cpu/mpc83xx/u-boot.lds
index c84d4b022..157cef676 100644
--- a/cpu/mpc83xx/u-boot.lds
+++ b/arch/ppc/cpu/mpc83xx/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc83xx/start.o	(.text)
+    arch/ppc/cpu/mpc83xx/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/cpu/mpc85xx/Makefile b/arch/ppc/cpu/mpc85xx/Makefile
index f064fee26..f064fee26 100644
--- a/cpu/mpc85xx/Makefile
+++ b/arch/ppc/cpu/mpc85xx/Makefile
diff --git a/cpu/mpc85xx/commproc.c b/arch/ppc/cpu/mpc85xx/commproc.c
index 594aace4b..594aace4b 100644
--- a/cpu/mpc85xx/commproc.c
+++ b/arch/ppc/cpu/mpc85xx/commproc.c
diff --git a/cpu/mpc85xx/config.mk b/arch/ppc/cpu/mpc85xx/config.mk
index 408184ad1..ffb813dc3 100644
--- a/cpu/mpc85xx/config.mk
+++ b/arch/ppc/cpu/mpc85xx/config.mk
@@ -32,4 +32,4 @@ PLATFORM_CPPFLAGS +=$(call cc-option,-mspe=yes)
 PLATFORM_CPPFLAGS +=$(call cc-option,-mno-spe)
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc85xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc85xx/u-boot.lds
diff --git a/cpu/mpc85xx/cpu.c b/arch/ppc/cpu/mpc85xx/cpu.c
index 0cc6e0323..0cc6e0323 100644
--- a/cpu/mpc85xx/cpu.c
+++ b/arch/ppc/cpu/mpc85xx/cpu.c
diff --git a/cpu/mpc85xx/cpu_init.c b/arch/ppc/cpu/mpc85xx/cpu_init.c
index e0126d331..e0126d331 100644
--- a/cpu/mpc85xx/cpu_init.c
+++ b/arch/ppc/cpu/mpc85xx/cpu_init.c
diff --git a/cpu/mpc85xx/cpu_init_early.c b/arch/ppc/cpu/mpc85xx/cpu_init_early.c
index 32aa94b61..32aa94b61 100644
--- a/cpu/mpc85xx/cpu_init_early.c
+++ b/arch/ppc/cpu/mpc85xx/cpu_init_early.c
diff --git a/cpu/mpc85xx/cpu_init_nand.c b/arch/ppc/cpu/mpc85xx/cpu_init_nand.c
index 184cca4c5..184cca4c5 100644
--- a/cpu/mpc85xx/cpu_init_nand.c
+++ b/arch/ppc/cpu/mpc85xx/cpu_init_nand.c
diff --git a/cpu/mpc85xx/ddr-gen1.c b/arch/ppc/cpu/mpc85xx/ddr-gen1.c
index 54437dd0c..54437dd0c 100644
--- a/cpu/mpc85xx/ddr-gen1.c
+++ b/arch/ppc/cpu/mpc85xx/ddr-gen1.c
diff --git a/cpu/mpc85xx/ddr-gen2.c b/arch/ppc/cpu/mpc85xx/ddr-gen2.c
index 655f99c02..655f99c02 100644
--- a/cpu/mpc85xx/ddr-gen2.c
+++ b/arch/ppc/cpu/mpc85xx/ddr-gen2.c
diff --git a/cpu/mpc85xx/ddr-gen3.c b/arch/ppc/cpu/mpc85xx/ddr-gen3.c
index 0691ca455..0691ca455 100644
--- a/cpu/mpc85xx/ddr-gen3.c
+++ b/arch/ppc/cpu/mpc85xx/ddr-gen3.c
diff --git a/cpu/mpc85xx/ether_fcc.c b/arch/ppc/cpu/mpc85xx/ether_fcc.c
index 5f1414d75..5f1414d75 100644
--- a/cpu/mpc85xx/ether_fcc.c
+++ b/arch/ppc/cpu/mpc85xx/ether_fcc.c
diff --git a/cpu/mpc85xx/fdt.c b/arch/ppc/cpu/mpc85xx/fdt.c
index 1d11ab470..1d11ab470 100644
--- a/cpu/mpc85xx/fdt.c
+++ b/arch/ppc/cpu/mpc85xx/fdt.c
diff --git a/cpu/mpc85xx/fixed_ivor.S b/arch/ppc/cpu/mpc85xx/fixed_ivor.S
index 320cae329..320cae329 100644
--- a/cpu/mpc85xx/fixed_ivor.S
+++ b/arch/ppc/cpu/mpc85xx/fixed_ivor.S
diff --git a/cpu/mpc85xx/interrupts.c b/arch/ppc/cpu/mpc85xx/interrupts.c
index 409367d15..409367d15 100644
--- a/cpu/mpc85xx/interrupts.c
+++ b/arch/ppc/cpu/mpc85xx/interrupts.c
diff --git a/cpu/mpc85xx/mp.c b/arch/ppc/cpu/mpc85xx/mp.c
index 826bf32d4..826bf32d4 100644
--- a/cpu/mpc85xx/mp.c
+++ b/arch/ppc/cpu/mpc85xx/mp.c
diff --git a/cpu/mpc85xx/mp.h b/arch/ppc/cpu/mpc85xx/mp.h
index 3422cc107..3422cc107 100644
--- a/cpu/mpc85xx/mp.h
+++ b/arch/ppc/cpu/mpc85xx/mp.h
diff --git a/cpu/mpc85xx/mpc8536_serdes.c b/arch/ppc/cpu/mpc85xx/mpc8536_serdes.c
index cb6a6f00c..cb6a6f00c 100644
--- a/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/ppc/cpu/mpc85xx/mpc8536_serdes.c
diff --git a/cpu/mpc85xx/pci.c b/arch/ppc/cpu/mpc85xx/pci.c
index 75d2716ef..75d2716ef 100644
--- a/cpu/mpc85xx/pci.c
+++ b/arch/ppc/cpu/mpc85xx/pci.c
diff --git a/cpu/mpc85xx/qe_io.c b/arch/ppc/cpu/mpc85xx/qe_io.c
index 72a29b7b5..72a29b7b5 100644
--- a/cpu/mpc85xx/qe_io.c
+++ b/arch/ppc/cpu/mpc85xx/qe_io.c
diff --git a/cpu/mpc85xx/release.S b/arch/ppc/cpu/mpc85xx/release.S
index 0b5b9da03..0b5b9da03 100644
--- a/cpu/mpc85xx/release.S
+++ b/arch/ppc/cpu/mpc85xx/release.S
diff --git a/cpu/mpc85xx/resetvec.S b/arch/ppc/cpu/mpc85xx/resetvec.S
index 29555d4a0..29555d4a0 100644
--- a/cpu/mpc85xx/resetvec.S
+++ b/arch/ppc/cpu/mpc85xx/resetvec.S
diff --git a/cpu/mpc85xx/serial_scc.c b/arch/ppc/cpu/mpc85xx/serial_scc.c
index 2dab2124f..2dab2124f 100644
--- a/cpu/mpc85xx/serial_scc.c
+++ b/arch/ppc/cpu/mpc85xx/serial_scc.c
diff --git a/cpu/mpc85xx/speed.c b/arch/ppc/cpu/mpc85xx/speed.c
index 268edbc5b..268edbc5b 100644
--- a/cpu/mpc85xx/speed.c
+++ b/arch/ppc/cpu/mpc85xx/speed.c
diff --git a/cpu/mpc85xx/start.S b/arch/ppc/cpu/mpc85xx/start.S
index b3cb56a5b..b3cb56a5b 100644
--- a/cpu/mpc85xx/start.S
+++ b/arch/ppc/cpu/mpc85xx/start.S
diff --git a/cpu/mpc85xx/tlb.c b/arch/ppc/cpu/mpc85xx/tlb.c
index b3037acea..b3037acea 100644
--- a/cpu/mpc85xx/tlb.c
+++ b/arch/ppc/cpu/mpc85xx/tlb.c
diff --git a/cpu/mpc85xx/traps.c b/arch/ppc/cpu/mpc85xx/traps.c
index 10108d86e..10108d86e 100644
--- a/cpu/mpc85xx/traps.c
+++ b/arch/ppc/cpu/mpc85xx/traps.c
diff --git a/cpu/mpc85xx/u-boot-nand.lds b/arch/ppc/cpu/mpc85xx/u-boot-nand.lds
index b4c63e2a2..b9240f22a 100644
--- a/cpu/mpc85xx/u-boot-nand.lds
+++ b/arch/ppc/cpu/mpc85xx/u-boot-nand.lds
@@ -117,7 +117,7 @@ SECTIONS
 
   .bootpg ADDR(.text) - 0x1000 :
   {
-    cpu/mpc85xx/start.o	(.bootpg)
+    arch/ppc/cpu/mpc85xx/start.o	(.bootpg)
   } :text = 0xffff
 
   . = ADDR(.text) + 0x80000;
diff --git a/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds
index fef3e42e0..fef3e42e0 100644
--- a/cpu/mpc85xx/u-boot-nand_spl.lds
+++ b/arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds
diff --git a/cpu/mpc85xx/u-boot.lds b/arch/ppc/cpu/mpc85xx/u-boot.lds
index 183dce951..9698bf405 100644
--- a/cpu/mpc85xx/u-boot.lds
+++ b/arch/ppc/cpu/mpc85xx/u-boot.lds
@@ -121,7 +121,7 @@ SECTIONS
 
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {
-    cpu/mpc85xx/start.o	(.bootpg)
+    arch/ppc/cpu/mpc85xx/start.o	(.bootpg)
   } :text = 0xffff
 
   .resetvec RESET_VECTOR_ADDRESS :
diff --git a/cpu/mpc86xx/Makefile b/arch/ppc/cpu/mpc86xx/Makefile
index daca79ad4..daca79ad4 100644
--- a/cpu/mpc86xx/Makefile
+++ b/arch/ppc/cpu/mpc86xx/Makefile
diff --git a/cpu/mpc86xx/cache.S b/arch/ppc/cpu/mpc86xx/cache.S
index 0bb058b04..0bb058b04 100644
--- a/cpu/mpc86xx/cache.S
+++ b/arch/ppc/cpu/mpc86xx/cache.S
diff --git a/cpu/mpc86xx/config.mk b/arch/ppc/cpu/mpc86xx/config.mk
index ca2f8376e..ca2f8376e 100644
--- a/cpu/mpc86xx/config.mk
+++ b/arch/ppc/cpu/mpc86xx/config.mk
diff --git a/cpu/mpc86xx/cpu.c b/arch/ppc/cpu/mpc86xx/cpu.c
index 188757587..188757587 100644
--- a/cpu/mpc86xx/cpu.c
+++ b/arch/ppc/cpu/mpc86xx/cpu.c
diff --git a/cpu/mpc86xx/cpu_init.c b/arch/ppc/cpu/mpc86xx/cpu_init.c
index b4f047d85..b4f047d85 100644
--- a/cpu/mpc86xx/cpu_init.c
+++ b/arch/ppc/cpu/mpc86xx/cpu_init.c
diff --git a/cpu/mpc86xx/ddr-8641.c b/arch/ppc/cpu/mpc86xx/ddr-8641.c
index b8f2c9387..b8f2c9387 100644
--- a/cpu/mpc86xx/ddr-8641.c
+++ b/arch/ppc/cpu/mpc86xx/ddr-8641.c
diff --git a/cpu/mpc86xx/fdt.c b/arch/ppc/cpu/mpc86xx/fdt.c
index 51f3f4c22..51f3f4c22 100644
--- a/cpu/mpc86xx/fdt.c
+++ b/arch/ppc/cpu/mpc86xx/fdt.c
diff --git a/cpu/mpc86xx/interrupts.c b/arch/ppc/cpu/mpc86xx/interrupts.c
index c78fc7225..c78fc7225 100644
--- a/cpu/mpc86xx/interrupts.c
+++ b/arch/ppc/cpu/mpc86xx/interrupts.c
diff --git a/cpu/mpc86xx/mp.c b/arch/ppc/cpu/mpc86xx/mp.c
index b4a0faacd..b4a0faacd 100644
--- a/cpu/mpc86xx/mp.c
+++ b/arch/ppc/cpu/mpc86xx/mp.c
diff --git a/cpu/mpc86xx/release.S b/arch/ppc/cpu/mpc86xx/release.S
index 67a6f2bdb..67a6f2bdb 100644
--- a/cpu/mpc86xx/release.S
+++ b/arch/ppc/cpu/mpc86xx/release.S
diff --git a/cpu/mpc86xx/speed.c b/arch/ppc/cpu/mpc86xx/speed.c
index 64a3479d7..64a3479d7 100644
--- a/cpu/mpc86xx/speed.c
+++ b/arch/ppc/cpu/mpc86xx/speed.c
diff --git a/cpu/mpc86xx/start.S b/arch/ppc/cpu/mpc86xx/start.S
index ed1e4ca66..ed1e4ca66 100644
--- a/cpu/mpc86xx/start.S
+++ b/arch/ppc/cpu/mpc86xx/start.S
diff --git a/cpu/mpc86xx/traps.c b/arch/ppc/cpu/mpc86xx/traps.c
index 406403e51..406403e51 100644
--- a/cpu/mpc86xx/traps.c
+++ b/arch/ppc/cpu/mpc86xx/traps.c
diff --git a/cpu/mpc8xx/Makefile b/arch/ppc/cpu/mpc8xx/Makefile
index 5f7045969..5f7045969 100644
--- a/cpu/mpc8xx/Makefile
+++ b/arch/ppc/cpu/mpc8xx/Makefile
diff --git a/cpu/mpc8xx/bedbug_860.c b/arch/ppc/cpu/mpc8xx/bedbug_860.c
index 0308bbbf7..0308bbbf7 100644
--- a/cpu/mpc8xx/bedbug_860.c
+++ b/arch/ppc/cpu/mpc8xx/bedbug_860.c
diff --git a/cpu/mpc8xx/commproc.c b/arch/ppc/cpu/mpc8xx/commproc.c
index a87a0dce8..a87a0dce8 100644
--- a/cpu/mpc8xx/commproc.c
+++ b/arch/ppc/cpu/mpc8xx/commproc.c
diff --git a/cpu/mpc8xx/config.mk b/arch/ppc/cpu/mpc8xx/config.mk
index 5540d6535..5540d6535 100644
--- a/cpu/mpc8xx/config.mk
+++ b/arch/ppc/cpu/mpc8xx/config.mk
diff --git a/cpu/mpc8xx/cpu.c b/arch/ppc/cpu/mpc8xx/cpu.c
index 2eb848bd0..2eb848bd0 100644
--- a/cpu/mpc8xx/cpu.c
+++ b/arch/ppc/cpu/mpc8xx/cpu.c
diff --git a/cpu/mpc8xx/cpu_init.c b/arch/ppc/cpu/mpc8xx/cpu_init.c
index eb0091bdb..eb0091bdb 100644
--- a/cpu/mpc8xx/cpu_init.c
+++ b/arch/ppc/cpu/mpc8xx/cpu_init.c
diff --git a/cpu/mpc8xx/fdt.c b/arch/ppc/cpu/mpc8xx/fdt.c
index 7130983ff..7130983ff 100644
--- a/cpu/mpc8xx/fdt.c
+++ b/arch/ppc/cpu/mpc8xx/fdt.c
diff --git a/cpu/mpc8xx/fec.c b/arch/ppc/cpu/mpc8xx/fec.c
index 89c1ff939..89c1ff939 100644
--- a/cpu/mpc8xx/fec.c
+++ b/arch/ppc/cpu/mpc8xx/fec.c
diff --git a/cpu/mpc8xx/fec.h b/arch/ppc/cpu/mpc8xx/fec.h
index a49417c66..a49417c66 100644
--- a/cpu/mpc8xx/fec.h
+++ b/arch/ppc/cpu/mpc8xx/fec.h
diff --git a/cpu/mpc8xx/i2c.c b/arch/ppc/cpu/mpc8xx/i2c.c
index 338cababe..338cababe 100644
--- a/cpu/mpc8xx/i2c.c
+++ b/arch/ppc/cpu/mpc8xx/i2c.c
diff --git a/cpu/mpc8xx/interrupts.c b/arch/ppc/cpu/mpc8xx/interrupts.c
index 5daa6b275..5daa6b275 100644
--- a/cpu/mpc8xx/interrupts.c
+++ b/arch/ppc/cpu/mpc8xx/interrupts.c
diff --git a/cpu/mpc8xx/kgdb.S b/arch/ppc/cpu/mpc8xx/kgdb.S
index 2cc8fe63c..2cc8fe63c 100644
--- a/cpu/mpc8xx/kgdb.S
+++ b/arch/ppc/cpu/mpc8xx/kgdb.S
diff --git a/cpu/mpc8xx/lcd.c b/arch/ppc/cpu/mpc8xx/lcd.c
index 4b88b21b3..4b88b21b3 100644
--- a/cpu/mpc8xx/lcd.c
+++ b/arch/ppc/cpu/mpc8xx/lcd.c
diff --git a/cpu/mpc8xx/plprcr_write.S b/arch/ppc/cpu/mpc8xx/plprcr_write.S
index e32567114..e32567114 100644
--- a/cpu/mpc8xx/plprcr_write.S
+++ b/arch/ppc/cpu/mpc8xx/plprcr_write.S
diff --git a/cpu/mpc8xx/scc.c b/arch/ppc/cpu/mpc8xx/scc.c
index effb967e3..effb967e3 100644
--- a/cpu/mpc8xx/scc.c
+++ b/arch/ppc/cpu/mpc8xx/scc.c
diff --git a/cpu/mpc8xx/serial.c b/arch/ppc/cpu/mpc8xx/serial.c
index 664db65a5..664db65a5 100644
--- a/cpu/mpc8xx/serial.c
+++ b/arch/ppc/cpu/mpc8xx/serial.c
diff --git a/cpu/mpc8xx/speed.c b/arch/ppc/cpu/mpc8xx/speed.c
index f309f29c0..f309f29c0 100644
--- a/cpu/mpc8xx/speed.c
+++ b/arch/ppc/cpu/mpc8xx/speed.c
diff --git a/cpu/mpc8xx/spi.c b/arch/ppc/cpu/mpc8xx/spi.c
index b2ac23e5e..b2ac23e5e 100644
--- a/cpu/mpc8xx/spi.c
+++ b/arch/ppc/cpu/mpc8xx/spi.c
diff --git a/cpu/mpc8xx/start.S b/arch/ppc/cpu/mpc8xx/start.S
index 7cf602fd4..7cf602fd4 100644
--- a/cpu/mpc8xx/start.S
+++ b/arch/ppc/cpu/mpc8xx/start.S
diff --git a/cpu/mpc8xx/traps.c b/arch/ppc/cpu/mpc8xx/traps.c
index 6efe8e0ea..6efe8e0ea 100644
--- a/cpu/mpc8xx/traps.c
+++ b/arch/ppc/cpu/mpc8xx/traps.c
diff --git a/cpu/mpc8xx/upatch.c b/arch/ppc/cpu/mpc8xx/upatch.c
index a8cb735ab..a8cb735ab 100644
--- a/cpu/mpc8xx/upatch.c
+++ b/arch/ppc/cpu/mpc8xx/upatch.c
diff --git a/cpu/mpc8xx/video.c b/arch/ppc/cpu/mpc8xx/video.c
index c79c499b6..c79c499b6 100644
--- a/cpu/mpc8xx/video.c
+++ b/arch/ppc/cpu/mpc8xx/video.c
diff --git a/cpu/mpc8xx/wlkbd.c b/arch/ppc/cpu/mpc8xx/wlkbd.c
index 13009e264..13009e264 100644
--- a/cpu/mpc8xx/wlkbd.c
+++ b/arch/ppc/cpu/mpc8xx/wlkbd.c
diff --git a/cpu/mpc8xxx/Makefile b/arch/ppc/cpu/mpc8xxx/Makefile
index 481f9e541..481f9e541 100644
--- a/cpu/mpc8xxx/Makefile
+++ b/arch/ppc/cpu/mpc8xxx/Makefile
diff --git a/cpu/mpc8xxx/cpu.c b/arch/ppc/cpu/mpc8xxx/cpu.c
index 47842e98d..fef062b22 100644
--- a/cpu/mpc8xxx/cpu.c
+++ b/arch/ppc/cpu/mpc8xxx/cpu.c
@@ -1,9 +1,9 @@
 /*
  * Copyright 2009-2010 Freescale Semiconductor, Inc.
  *
- * This file is derived from cpu/mpc85xx/cpu.c and cpu/mpc86xx/cpu.c.
- * Basically this file contains cpu specific common code for 85xx/86xx
- * processors.
+ * This file is derived from arch/ppc/cpu/mpc85xx/cpu.c and
+ * arch/ppc/cpu/mpc86xx/cpu.c. Basically this file contains
+ * cpu specific common code for 85xx/86xx processors.
  * See file CREDITS for list of people who contributed to this
  * project.
  *
diff --git a/cpu/mpc8xxx/ddr/Makefile b/arch/ppc/cpu/mpc8xxx/ddr/Makefile
index cb7f85655..cb7f85655 100644
--- a/cpu/mpc8xxx/ddr/Makefile
+++ b/arch/ppc/cpu/mpc8xxx/ddr/Makefile
diff --git a/cpu/mpc8xxx/ddr/common_timing_params.h b/arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h
index 5aea517f2..5aea517f2 100644
--- a/cpu/mpc8xxx/ddr/common_timing_params.h
+++ b/arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h
diff --git a/cpu/mpc8xxx/ddr/ctrl_regs.c b/arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c
index 03f9c4380..03f9c4380 100644
--- a/cpu/mpc8xxx/ddr/ctrl_regs.c
+++ b/arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c
diff --git a/cpu/mpc8xxx/ddr/ddr.h b/arch/ppc/cpu/mpc8xxx/ddr/ddr.h
index f1220750d..f1220750d 100644
--- a/cpu/mpc8xxx/ddr/ddr.h
+++ b/arch/ppc/cpu/mpc8xxx/ddr/ddr.h
diff --git a/cpu/mpc8xxx/ddr/ddr1_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
index 918476441..918476441 100644
--- a/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
+++ b/arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
diff --git a/cpu/mpc8xxx/ddr/ddr2_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
index d9d0fa70e..d9d0fa70e 100644
--- a/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
+++ b/arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
diff --git a/cpu/mpc8xxx/ddr/ddr3_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
index d4199baa8..d4199baa8 100644
--- a/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
+++ b/arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
diff --git a/cpu/mpc8xxx/ddr/lc_common_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
index e888e3ea5..e888e3ea5 100644
--- a/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
+++ b/arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
diff --git a/cpu/mpc8xxx/ddr/main.c b/arch/ppc/cpu/mpc8xxx/ddr/main.c
index faa1af95e..faa1af95e 100644
--- a/cpu/mpc8xxx/ddr/main.c
+++ b/arch/ppc/cpu/mpc8xxx/ddr/main.c
diff --git a/cpu/mpc8xxx/ddr/options.c b/arch/ppc/cpu/mpc8xxx/ddr/options.c
index 46731c815..46731c815 100644
--- a/cpu/mpc8xxx/ddr/options.c
+++ b/arch/ppc/cpu/mpc8xxx/ddr/options.c
diff --git a/cpu/mpc8xxx/ddr/util.c b/arch/ppc/cpu/mpc8xxx/ddr/util.c
index 1e2d92128..1e2d92128 100644
--- a/cpu/mpc8xxx/ddr/util.c
+++ b/arch/ppc/cpu/mpc8xxx/ddr/util.c
diff --git a/cpu/mpc8xxx/fdt.c b/arch/ppc/cpu/mpc8xxx/fdt.c
index 3a9b5841b..e68d6f336 100644
--- a/cpu/mpc8xxx/fdt.c
+++ b/arch/ppc/cpu/mpc8xxx/fdt.c
@@ -1,9 +1,9 @@
 /*
  * Copyright 2009 Freescale Semiconductor, Inc.
  *
- * This file is derived from cpu/mpc85xx/cpu.c and cpu/mpc86xx/cpu.c.
- * Basically this file contains cpu specific common code for 85xx/86xx
- * processors.
+ * This file is derived from arch/ppc/cpu/mpc85xx/cpu.c and
+ * arch/ppc/cpu/mpc86xx/cpu.c. Basically this file contains
+ * cpu specific common code for 85xx/86xx processors.
  * See file CREDITS for list of people who contributed to this
  * project.
  *
diff --git a/cpu/mpc8xxx/pci_cfg.c b/arch/ppc/cpu/mpc8xxx/pci_cfg.c
index 9b7181d5b..9b7181d5b 100644
--- a/cpu/mpc8xxx/pci_cfg.c
+++ b/arch/ppc/cpu/mpc8xxx/pci_cfg.c
diff --git a/cpu/ppc4xx/40x_spd_sdram.c b/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
index 5e6dbe333..595d5687d 100644
--- a/cpu/ppc4xx/40x_spd_sdram.c
+++ b/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
@@ -1,5 +1,5 @@
 /*
- * cpu/ppc4xx/40x_spd_sdram.c
+ * arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
  * This SPD SDRAM detection code supports IBM/AMCC PPC44x cpu with a
  * SDRAM controller. Those are all current 405 PPC's.
  *
diff --git a/cpu/ppc4xx/44x_spd_ddr.c b/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
index 6176eabfb..9d1994f99 100644
--- a/cpu/ppc4xx/44x_spd_ddr.c
+++ b/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
@@ -1,5 +1,5 @@
 /*
- * cpu/ppc4xx/44x_spd_ddr.c
+ * arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
  * This SPD DDR detection code supports IBM/AMCC PPC44x cpu with a
  * DDR controller. Those are 440GP/GX/EP/GR.
  *
diff --git a/cpu/ppc4xx/44x_spd_ddr2.c b/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
index 593a28691..ea6c2ac77 100644
--- a/cpu/ppc4xx/44x_spd_ddr2.c
+++ b/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
@@ -1,5 +1,5 @@
 /*
- * cpu/ppc4xx/44x_spd_ddr2.c
+ * arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
  * This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
  * DDR2 controller (non Denali Core). Those currently are:
  *
diff --git a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
index 0283c91d8..72630716c 100644
--- a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+++ b/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
@@ -1,5 +1,5 @@
 /*
- * cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+ * arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
  * This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
  * DDR2 controller (non Denali Core). Those currently are:
  *
diff --git a/cpu/ppc4xx/4xx_pci.c b/arch/ppc/cpu/ppc4xx/4xx_pci.c
index eed4534e5..eed4534e5 100644
--- a/cpu/ppc4xx/4xx_pci.c
+++ b/arch/ppc/cpu/ppc4xx/4xx_pci.c
diff --git a/cpu/ppc4xx/4xx_pcie.c b/arch/ppc/cpu/ppc4xx/4xx_pcie.c
index 10b58b711..10b58b711 100644
--- a/cpu/ppc4xx/4xx_pcie.c
+++ b/arch/ppc/cpu/ppc4xx/4xx_pcie.c
diff --git a/cpu/ppc4xx/4xx_uart.c b/arch/ppc/cpu/ppc4xx/4xx_uart.c
index 8de65425c..8de65425c 100644
--- a/cpu/ppc4xx/4xx_uart.c
+++ b/arch/ppc/cpu/ppc4xx/4xx_uart.c
diff --git a/cpu/ppc4xx/Makefile b/arch/ppc/cpu/ppc4xx/Makefile
index 88d53fbb1..88d53fbb1 100644
--- a/cpu/ppc4xx/Makefile
+++ b/arch/ppc/cpu/ppc4xx/Makefile
diff --git a/cpu/ppc4xx/bedbug_405.c b/arch/ppc/cpu/ppc4xx/bedbug_405.c
index ef11cb65e..ef11cb65e 100644
--- a/cpu/ppc4xx/bedbug_405.c
+++ b/arch/ppc/cpu/ppc4xx/bedbug_405.c
diff --git a/cpu/ppc4xx/cache.S b/arch/ppc/cpu/ppc4xx/cache.S
index 269716fce..269716fce 100644
--- a/cpu/ppc4xx/cache.S
+++ b/arch/ppc/cpu/ppc4xx/cache.S
diff --git a/cpu/ppc4xx/cmd_chip_config.c b/arch/ppc/cpu/ppc4xx/cmd_chip_config.c
index ba57211dd..ba57211dd 100644
--- a/cpu/ppc4xx/cmd_chip_config.c
+++ b/arch/ppc/cpu/ppc4xx/cmd_chip_config.c
diff --git a/cpu/ppc4xx/commproc.c b/arch/ppc/cpu/ppc4xx/commproc.c
index a1696d37e..a1696d37e 100644
--- a/cpu/ppc4xx/commproc.c
+++ b/arch/ppc/cpu/ppc4xx/commproc.c
diff --git a/cpu/ppc4xx/config.mk b/arch/ppc/cpu/ppc4xx/config.mk
index c1de1e97e..ea4d70784 100644
--- a/cpu/ppc4xx/config.mk
+++ b/arch/ppc/cpu/ppc4xx/config.mk
@@ -34,4 +34,4 @@ PLATFORM_CPPFLAGS += -Wa,-m405 -mcpu=405
 endif
 
 # Use default linker script.  Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/ppc4xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/ppc4xx/u-boot.lds
diff --git a/cpu/ppc4xx/cpu.c b/arch/ppc/cpu/ppc4xx/cpu.c
index e1a023b70..e1a023b70 100644
--- a/cpu/ppc4xx/cpu.c
+++ b/arch/ppc/cpu/ppc4xx/cpu.c
diff --git a/cpu/ppc4xx/cpu_init.c b/arch/ppc/cpu/ppc4xx/cpu_init.c
index 8a6e545c1..8a6e545c1 100644
--- a/cpu/ppc4xx/cpu_init.c
+++ b/arch/ppc/cpu/ppc4xx/cpu_init.c
diff --git a/cpu/ppc4xx/dcr.S b/arch/ppc/cpu/ppc4xx/dcr.S
index 93465a3b5..93465a3b5 100644
--- a/cpu/ppc4xx/dcr.S
+++ b/arch/ppc/cpu/ppc4xx/dcr.S
diff --git a/cpu/ppc4xx/denali_data_eye.c b/arch/ppc/cpu/ppc4xx/denali_data_eye.c
index ffc381744..15a9b4f3e 100644
--- a/cpu/ppc4xx/denali_data_eye.c
+++ b/arch/ppc/cpu/ppc4xx/denali_data_eye.c
@@ -1,5 +1,5 @@
 /*
- * cpu/ppc4xx/denali_data_eye.c
+ * arch/ppc/cpu/ppc4xx/denali_data_eye.c
  * Extracted from board/amcc/sequoia/sdram.c by Larry Johnson <lrj@acm.org>.
  *
  * (C) Copyright 2006
diff --git a/cpu/ppc4xx/denali_spd_ddr2.c b/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
index 5858cb36a..72f76cd2f 100644
--- a/cpu/ppc4xx/denali_spd_ddr2.c
+++ b/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
@@ -1,12 +1,12 @@
 /*
- * cpu/ppc4xx/denali_spd_ddr2.c
+ * arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
  * This SPD SDRAM detection code supports AMCC PPC44x CPUs with a Denali-core
  * DDR2 controller, specifically the 440EPx/GRx.
  *
  * (C) Copyright 2007-2008
  * Larry Johnson, lrj@acm.org.
  *
- * Based primarily on cpu/ppc4xx/4xx_spd_ddr2.c, which is...
+ * Based primarily on arch/ppc/cpu/ppc4xx/4xx_spd_ddr2.c, which is...
  *
  * (C) Copyright 2007
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
diff --git a/cpu/ppc4xx/ecc.c b/arch/ppc/cpu/ppc4xx/ecc.c
index f10560545..f10560545 100644
--- a/cpu/ppc4xx/ecc.c
+++ b/arch/ppc/cpu/ppc4xx/ecc.c
diff --git a/cpu/ppc4xx/ecc.h b/arch/ppc/cpu/ppc4xx/ecc.h
index b2588919e..b2588919e 100644
--- a/cpu/ppc4xx/ecc.h
+++ b/arch/ppc/cpu/ppc4xx/ecc.h
diff --git a/cpu/ppc4xx/fdt.c b/arch/ppc/cpu/ppc4xx/fdt.c
index 15a184b5c..15a184b5c 100644
--- a/cpu/ppc4xx/fdt.c
+++ b/arch/ppc/cpu/ppc4xx/fdt.c
diff --git a/cpu/ppc4xx/gpio.c b/arch/ppc/cpu/ppc4xx/gpio.c
index c0d351a95..c0d351a95 100644
--- a/cpu/ppc4xx/gpio.c
+++ b/arch/ppc/cpu/ppc4xx/gpio.c
diff --git a/cpu/ppc4xx/interrupts.c b/arch/ppc/cpu/ppc4xx/interrupts.c
index 6db84210b..6db84210b 100644
--- a/cpu/ppc4xx/interrupts.c
+++ b/arch/ppc/cpu/ppc4xx/interrupts.c
diff --git a/cpu/ppc4xx/iop480_uart.c b/arch/ppc/cpu/ppc4xx/iop480_uart.c
index 0e3423f7a..0e3423f7a 100644
--- a/cpu/ppc4xx/iop480_uart.c
+++ b/arch/ppc/cpu/ppc4xx/iop480_uart.c
diff --git a/cpu/ppc4xx/kgdb.S b/arch/ppc/cpu/ppc4xx/kgdb.S
index 4227a4c15..4227a4c15 100644
--- a/cpu/ppc4xx/kgdb.S
+++ b/arch/ppc/cpu/ppc4xx/kgdb.S
diff --git a/cpu/ppc4xx/miiphy.c b/arch/ppc/cpu/ppc4xx/miiphy.c
index 22ed5c25e..22ed5c25e 100644
--- a/cpu/ppc4xx/miiphy.c
+++ b/arch/ppc/cpu/ppc4xx/miiphy.c
diff --git a/cpu/ppc4xx/reginfo.c b/arch/ppc/cpu/ppc4xx/reginfo.c
index a9756672c..a9756672c 100644
--- a/cpu/ppc4xx/reginfo.c
+++ b/arch/ppc/cpu/ppc4xx/reginfo.c
diff --git a/cpu/ppc4xx/resetvec.S b/arch/ppc/cpu/ppc4xx/resetvec.S
index b3308bd6a..b3308bd6a 100644
--- a/cpu/ppc4xx/resetvec.S
+++ b/arch/ppc/cpu/ppc4xx/resetvec.S
diff --git a/cpu/ppc4xx/sdram.c b/arch/ppc/cpu/ppc4xx/sdram.c
index 30c6e0e38..30c6e0e38 100644
--- a/cpu/ppc4xx/sdram.c
+++ b/arch/ppc/cpu/ppc4xx/sdram.c
diff --git a/cpu/ppc4xx/sdram.h b/arch/ppc/cpu/ppc4xx/sdram.h
index bea337653..bea337653 100644
--- a/cpu/ppc4xx/sdram.h
+++ b/arch/ppc/cpu/ppc4xx/sdram.h
diff --git a/cpu/ppc4xx/speed.c b/arch/ppc/cpu/ppc4xx/speed.c
index 906face03..906face03 100644
--- a/cpu/ppc4xx/speed.c
+++ b/arch/ppc/cpu/ppc4xx/speed.c
diff --git a/cpu/ppc4xx/start.S b/arch/ppc/cpu/ppc4xx/start.S
index 927c88c78..927c88c78 100644
--- a/cpu/ppc4xx/start.S
+++ b/arch/ppc/cpu/ppc4xx/start.S
diff --git a/cpu/ppc4xx/tlb.c b/arch/ppc/cpu/ppc4xx/tlb.c
index 24a9a9cc2..24a9a9cc2 100644
--- a/cpu/ppc4xx/tlb.c
+++ b/arch/ppc/cpu/ppc4xx/tlb.c
diff --git a/cpu/ppc4xx/traps.c b/arch/ppc/cpu/ppc4xx/traps.c
index 42e422157..42e422157 100644
--- a/cpu/ppc4xx/traps.c
+++ b/arch/ppc/cpu/ppc4xx/traps.c
diff --git a/cpu/ppc4xx/u-boot.lds b/arch/ppc/cpu/ppc4xx/u-boot.lds
index 2b47934a2..3704d8a69 100644
--- a/cpu/ppc4xx/u-boot.lds
+++ b/arch/ppc/cpu/ppc4xx/u-boot.lds
@@ -124,7 +124,7 @@ SECTIONS
 #ifdef CONFIG_440
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {
-    cpu/ppc4xx/start.o	(.bootpg)
+    arch/ppc/cpu/ppc4xx/start.o	(.bootpg)
 
     /*
      * PPC440 board need a board specific object with the
diff --git a/cpu/ppc4xx/uic.c b/arch/ppc/cpu/ppc4xx/uic.c
index 8b1b259fa..8b1b259fa 100644
--- a/cpu/ppc4xx/uic.c
+++ b/arch/ppc/cpu/ppc4xx/uic.c
diff --git a/cpu/ppc4xx/usb.c b/arch/ppc/cpu/ppc4xx/usb.c
index 592efe70a..592efe70a 100644
--- a/cpu/ppc4xx/usb.c
+++ b/arch/ppc/cpu/ppc4xx/usb.c
diff --git a/cpu/ppc4xx/usb_ohci.c b/arch/ppc/cpu/ppc4xx/usb_ohci.c
index a9edacd33..a9edacd33 100644
--- a/cpu/ppc4xx/usb_ohci.c
+++ b/arch/ppc/cpu/ppc4xx/usb_ohci.c
diff --git a/cpu/ppc4xx/usb_ohci.h b/arch/ppc/cpu/ppc4xx/usb_ohci.h
index 2c3dc4f99..2c3dc4f99 100644
--- a/cpu/ppc4xx/usb_ohci.h
+++ b/arch/ppc/cpu/ppc4xx/usb_ohci.h
diff --git a/cpu/ppc4xx/usbdev.c b/arch/ppc/cpu/ppc4xx/usbdev.c
index fe398afc0..fe398afc0 100644
--- a/cpu/ppc4xx/usbdev.c
+++ b/arch/ppc/cpu/ppc4xx/usbdev.c
diff --git a/cpu/ppc4xx/usbdev.h b/arch/ppc/cpu/ppc4xx/usbdev.h
index ef6a2da64..ef6a2da64 100644
--- a/cpu/ppc4xx/usbdev.h
+++ b/arch/ppc/cpu/ppc4xx/usbdev.h
diff --git a/cpu/ppc4xx/xilinx_irq.c b/arch/ppc/cpu/ppc4xx/xilinx_irq.c
index 71087771c..71087771c 100644
--- a/cpu/ppc4xx/xilinx_irq.c
+++ b/arch/ppc/cpu/ppc4xx/xilinx_irq.c
diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
index d3929ea89..e26792cc2 100644
--- a/board/LEOX/elpt860/u-boot.lds
+++ b/board/LEOX/elpt860/u-boot.lds
@@ -64,7 +64,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o			(.text)
+    arch/ppc/cpu/mpc8xx/start.o			(.text)
     common/dlmalloc.o			(.text)
     arch/ppc/lib/ppcstring.o			(.text)
     lib/vsprintf.o		(.text)
diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug
index f6c21f745..707ff7a6b 100644
--- a/board/LEOX/elpt860/u-boot.lds.debug
+++ b/board/LEOX/elpt860/u-boot.lds.debug
@@ -64,7 +64,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/MAI/AmigaOneG3SE/u-boot.lds b/board/MAI/AmigaOneG3SE/u-boot.lds
index 18510a8e7..1f55c6571 100644
--- a/board/MAI/AmigaOneG3SE/u-boot.lds
+++ b/board/MAI/AmigaOneG3SE/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
     common/env_embedded.o(.text)
diff --git a/board/Marvell/db64360/u-boot.lds b/board/Marvell/db64360/u-boot.lds
index d02133114..6dff003dc 100644
--- a/board/Marvell/db64360/u-boot.lds
+++ b/board/Marvell/db64360/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
diff --git a/board/Marvell/db64460/u-boot.lds b/board/Marvell/db64460/u-boot.lds
index d02133114..6dff003dc 100644
--- a/board/Marvell/db64460/u-boot.lds
+++ b/board/Marvell/db64460/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds
index 09d9470f7..f7de95dc8 100644
--- a/board/RPXClassic/u-boot.lds
+++ b/board/RPXClassic/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug
index f559df716..57cc30586 100644
--- a/board/RPXClassic/u-boot.lds.debug
+++ b/board/RPXClassic/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds
index 09d9470f7..f7de95dc8 100644
--- a/board/RPXlite/u-boot.lds
+++ b/board/RPXlite/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug
index f559df716..57cc30586 100644
--- a/board/RPXlite/u-boot.lds.debug
+++ b/board/RPXlite/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds
index a099cb9d5..a2db9a628 100644
--- a/board/RPXlite_dw/u-boot.lds
+++ b/board/RPXlite_dw/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug
index 3b61a4256..723f56291 100644
--- a/board/RPXlite_dw/u-boot.lds.debug
+++ b/board/RPXlite_dw/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
index 1132fd6eb..b323768fb 100644
--- a/board/RRvision/u-boot.lds
+++ b/board/RRvision/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/adder/u-boot.lds b/board/adder/u-boot.lds
index 397ee2f05..018bcf1a2 100644
--- a/board/adder/u-boot.lds
+++ b/board/adder/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt           : { *(.plt)		}
   .text          :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/board/amcc/acadia/u-boot-nand.lds b/board/amcc/acadia/u-boot-nand.lds
index 738caa0c5..bfca58271 100644
--- a/board/amcc/acadia/u-boot-nand.lds
+++ b/board/amcc/acadia/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
diff --git a/board/amcc/bamboo/u-boot-nand.lds b/board/amcc/bamboo/u-boot-nand.lds
index 738caa0c5..bfca58271 100644
--- a/board/amcc/bamboo/u-boot-nand.lds
+++ b/board/amcc/bamboo/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c
index 13a0daced..71a570191 100644
--- a/board/amcc/canyonlands/canyonlands.c
+++ b/board/amcc/canyonlands/canyonlands.c
@@ -42,7 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define BOARD_ARCHES		4
 
 /*
- * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
  * board specific values.
  */
 #if defined(CONFIG_ARCHES)
diff --git a/board/amcc/canyonlands/u-boot-nand.lds b/board/amcc/canyonlands/u-boot-nand.lds
index 47c6bd921..b04b05e38 100644
--- a/board/amcc/canyonlands/u-boot-nand.lds
+++ b/board/amcc/canyonlands/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
 
     /* Align to next NAND block */
     . = ALIGN(0x20000);
diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c
index 54e2a39aa..15291f96b 100644
--- a/board/amcc/katmai/katmai.c
+++ b/board/amcc/katmai/katmai.c
@@ -249,7 +249,7 @@ int checkboard (void)
 }
 
 /*
- * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
  * board specific values.
  */
 u32 ddr_wrdtr(u32 default_val) {
diff --git a/board/amcc/kilauea/u-boot-nand.lds b/board/amcc/kilauea/u-boot-nand.lds
index 738caa0c5..bfca58271 100644
--- a/board/amcc/kilauea/u-boot-nand.lds
+++ b/board/amcc/kilauea/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c
index 332d170d6..6542565f0 100644
--- a/board/amcc/luan/luan.c
+++ b/board/amcc/luan/luan.c
@@ -119,7 +119,7 @@ int checkboard(void)
 }
 
 /*
- * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
  * board specific values.
  */
 u32 ddr_clktr(u32 default_val) {
diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c
index bde471c2e..b5c7d6d50 100644
--- a/board/amcc/sequoia/sdram.c
+++ b/board/amcc/sequoia/sdram.c
@@ -40,7 +40,7 @@ extern int denali_wait_for_dlllock(void);
 extern void denali_core_search_data_eye(void);
 
 #if defined(CONFIG_NAND_SPL)
-/* Using cpu/ppc4xx/speed.c to calculate the bus frequency is too big
+/* Using arch/ppc/cpu/ppc4xx/speed.c to calculate the bus frequency is too big
  * for the 4k NAND boot image so define bus_frequency to 133MHz here
  * which is save for the refresh counter setup.
  */
diff --git a/board/amcc/sequoia/u-boot-nand.lds b/board/amcc/sequoia/u-boot-nand.lds
index fb629e0c5..8a71bfa44 100644
--- a/board/amcc/sequoia/u-boot-nand.lds
+++ b/board/amcc/sequoia/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
diff --git a/board/amcc/sequoia/u-boot-ram.lds b/board/amcc/sequoia/u-boot-ram.lds
index e22dbecbf..c6a321e40 100644
--- a/board/amcc/sequoia/u-boot-ram.lds
+++ b/board/amcc/sequoia/u-boot-ram.lds
@@ -50,7 +50,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
 
     *(.text)
     *(.got1)
diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c
index 8c65cfb6f..241f48449 100644
--- a/board/amcc/yucca/yucca.c
+++ b/board/amcc/yucca/yucca.c
@@ -555,7 +555,7 @@ int checkboard (void)
 }
 
 /*
- * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
  * board specific values.
  */
 static int ppc440spe_rev_a(void)
diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds
index 89ffc6d2d..faeefe8bd 100644
--- a/board/amirix/ap1000/u-boot.lds
+++ b/board/amirix/ap1000/u-boot.lds
@@ -55,14 +55,14 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
     board/amirix/ap1000/init.o	(.text)
-    cpu/ppc4xx/kgdb.o	(.text)
-    cpu/ppc4xx/traps.o	(.text)
-    cpu/ppc4xx/interrupts.o	(.text)
-    cpu/ppc4xx/4xx_uart.o	(.text)
-    cpu/ppc4xx/cpu_init.o	(.text)
-    cpu/ppc4xx/speed.o	(.text)
+    arch/ppc/cpu/ppc4xx/kgdb.o	(.text)
+    arch/ppc/cpu/ppc4xx/traps.o	(.text)
+    arch/ppc/cpu/ppc4xx/interrupts.o	(.text)
+    arch/ppc/cpu/ppc4xx/4xx_uart.o	(.text)
+    arch/ppc/cpu/ppc4xx/cpu_init.o	(.text)
+    arch/ppc/cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
     lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
index 51e95d555..5bd5a75c6 100644
--- a/board/c2mon/u-boot.lds
+++ b/board/c2mon/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug
index d55bf33b8..e62f6be5a 100644
--- a/board/c2mon/u-boot.lds.debug
+++ b/board/c2mon/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/cm5200/u-boot.lds b/board/cm5200/u-boot.lds
index 5887f774e..30a37d9fb 100644
--- a/board/cm5200/u-boot.lds
+++ b/board/cm5200/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc5xxx/start.o	(.text)
+    arch/ppc/cpu/mpc5xxx/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug
index f559df716..57cc30586 100644
--- a/board/cogent/u-boot.lds.debug
+++ b/board/cogent/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/csb272/csb272.c b/board/csb272/csb272.c
index d6d65cf45..5a00afe40 100644
--- a/board/csb272/csb272.c
+++ b/board/csb272/csb272.c
@@ -129,7 +129,7 @@ phys_size_t initdram (int board_type)
 	/*
 	 * ToDo: Move the asm init routine sdram_init() to this C file,
 	 * or even better use some common ppc4xx code available
-	 * in cpu/ppc4xx
+	 * in arch/ppc/cpu/ppc4xx
 	 */
 	sdram_init();
 
diff --git a/board/csb472/csb472.c b/board/csb472/csb472.c
index 20d34adfd..996a67b4e 100644
--- a/board/csb472/csb472.c
+++ b/board/csb472/csb472.c
@@ -97,7 +97,7 @@ phys_size_t initdram (int board_type)
 	/*
 	 * ToDo: Move the asm init routine sdram_init() to this C file,
 	 * or even better use some common ppc4xx code available
-	 * in cpu/ppc4xx
+	 * in arch/ppc/cpu/ppc4xx
 	 */
 	sdram_init();
 
diff --git a/board/eltec/bab7xx/u-boot.lds b/board/eltec/bab7xx/u-boot.lds
index d02133114..6dff003dc 100644
--- a/board/eltec/bab7xx/u-boot.lds
+++ b/board/eltec/bab7xx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
diff --git a/board/eltec/elppc/u-boot.lds b/board/eltec/elppc/u-boot.lds
index d02133114..6dff003dc 100644
--- a/board/eltec/elppc/u-boot.lds
+++ b/board/eltec/elppc/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
diff --git a/board/eltec/mhpc/u-boot.lds b/board/eltec/mhpc/u-boot.lds
index 5c847fbf8..dc370eacf 100644
--- a/board/eltec/mhpc/u-boot.lds
+++ b/board/eltec/mhpc/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/env_embedded.o(.text)
 
     *(.text)
diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug
index d55bf33b8..e62f6be5a 100644
--- a/board/eltec/mhpc/u-boot.lds.debug
+++ b/board/eltec/mhpc/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/emk/top860/u-boot.lds b/board/emk/top860/u-boot.lds
index 46dca96e6..3fb6d1269 100644
--- a/board/emk/top860/u-boot.lds
+++ b/board/emk/top860/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
 
     *(.text)
     *(.got1)
diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index 6ca72980e..3229a23a3 100644
--- a/board/emk/top860/u-boot.lds.debug
+++ b/board/emk/top860/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/ep88x/u-boot.lds b/board/ep88x/u-boot.lds
index 70b84e4c8..f9579a643 100644
--- a/board/ep88x/u-boot.lds
+++ b/board/ep88x/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt           : { *(.plt)		}
   .text          :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/board/eric/eric.c b/board/eric/eric.c
index cfcfa525a..96c0b8385 100644
--- a/board/eric/eric.c
+++ b/board/eric/eric.c
@@ -132,7 +132,7 @@ phys_size_t initdram (int board_type)
 	/*
 	 * ToDo: Move the asm init routine sdram_init() to this C file,
 	 * or even better use some common ppc4xx code available
-	 * in cpu/ppc4xx
+	 * in arch/ppc/cpu/ppc4xx
 	 */
 	sdram_init();
 
diff --git a/board/esd/cpci750/u-boot.lds b/board/esd/cpci750/u-boot.lds
index d02133114..6dff003dc 100644
--- a/board/esd/cpci750/u-boot.lds
+++ b/board/esd/cpci750/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
diff --git a/board/esd/dasa_sim/u-boot.lds b/board/esd/dasa_sim/u-boot.lds
index b044649eb..3d33d0f02 100644
--- a/board/esd/dasa_sim/u-boot.lds
+++ b/board/esd/dasa_sim/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/ppc4xx/start.o		(.text)
+    arch/ppc/cpu/ppc4xx/start.o		(.text)
 
     . = env_offset;
     common/env_embedded.o(.text)
diff --git a/board/esd/pmc440/u-boot-nand.lds b/board/esd/pmc440/u-boot-nand.lds
index fb629e0c5..8a71bfa44 100644
--- a/board/esd/pmc440/u-boot-nand.lds
+++ b/board/esd/pmc440/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);
diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds
index 848eacdb2..4490f19a1 100644
--- a/board/esteem192e/u-boot.lds
+++ b/board/esteem192e/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds
index d8112eb0a..94b13422a 100644
--- a/board/etx094/u-boot.lds
+++ b/board/etx094/u-boot.lds
@@ -55,12 +55,12 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
-    cpu/mpc8xx/traps.o	(.text)
-    cpu/mpc8xx/interrupts.o	(.text)
-    cpu/mpc8xx/serial.o	(.text)
-    cpu/mpc8xx/cpu_init.o	(.text)
-    cpu/mpc8xx/speed.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/traps.o	(.text)
+    arch/ppc/cpu/mpc8xx/interrupts.o	(.text)
+    arch/ppc/cpu/mpc8xx/serial.o	(.text)
+    arch/ppc/cpu/mpc8xx/cpu_init.o	(.text)
+    arch/ppc/cpu/mpc8xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
     lib/crc32.o		(.text)
     lib/zlib.o		(.text)
diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug
index 12f6ce765..458d4e076 100644
--- a/board/etx094/u-boot.lds.debug
+++ b/board/etx094/u-boot.lds.debug
@@ -55,13 +55,13 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
-    cpu/mpc8xx/traps.o	(.text)
-    cpu/mpc8xx/interrupts.o	(.text)
-    cpu/mpc8xx/cpu.o	(.text)
-    cpu/mpc8xx/cpu_init.o	(.text)
-    cpu/mpc8xx/speed.o	(.text)
-    cpu/mpc8xx/serial.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/traps.o	(.text)
+    arch/ppc/cpu/mpc8xx/interrupts.o	(.text)
+    arch/ppc/cpu/mpc8xx/cpu.o	(.text)
+    arch/ppc/cpu/mpc8xx/cpu_init.o	(.text)
+    arch/ppc/cpu/mpc8xx/speed.o	(.text)
+    arch/ppc/cpu/mpc8xx/serial.o	(.text)
     arch/ppc/lib/extable.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/string.o	(.text)
diff --git a/board/evb64260/u-boot.lds b/board/evb64260/u-boot.lds
index d02133114..6dff003dc 100644
--- a/board/evb64260/u-boot.lds
+++ b/board/evb64260/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
diff --git a/board/fads/u-boot.lds b/board/fads/u-boot.lds
index ce3e32e0d..d6476cdb7 100644
--- a/board/fads/u-boot.lds
+++ b/board/fads/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
 
     /*. = DEFINED(env_offset) ? env_offset : .;*/
     common/env_embedded.o	(.ppcenv)
diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug
index 4f179c7fa..61c0d68d7 100644
--- a/board/fads/u-boot.lds.debug
+++ b/board/fads/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/flagadm/u-boot.lds b/board/flagadm/u-boot.lds
index 877e82c84..fbfba6ec9 100644
--- a/board/flagadm/u-boot.lds
+++ b/board/flagadm/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
 
     *(.text)
     *(.got1)
diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug
index d55bf33b8..e62f6be5a 100644
--- a/board/flagadm/u-boot.lds.debug
+++ b/board/flagadm/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/freescale/mpc7448hpc2/u-boot.lds b/board/freescale/mpc7448hpc2/u-boot.lds
index 247779f6c..c4266cec5 100644
--- a/board/freescale/mpc7448hpc2/u-boot.lds
+++ b/board/freescale/mpc7448hpc2/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds
index 67847f106..1f9f8eb94 100644
--- a/board/freescale/mpc8610hpcd/u-boot.lds
+++ b/board/freescale/mpc8610hpcd/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
   .plt : { *(.plt) }
   .text :
   {
-    cpu/mpc86xx/start.o	(.text)
-    cpu/mpc86xx/traps.o (.text)
-    cpu/mpc86xx/interrupts.o (.text)
-    cpu/mpc86xx/cpu_init.o (.text)
-    cpu/mpc86xx/cpu.o (.text)
-    cpu/mpc86xx/speed.o (.text)
+    arch/ppc/cpu/mpc86xx/start.o	(.text)
+    arch/ppc/cpu/mpc86xx/traps.o (.text)
+    arch/ppc/cpu/mpc86xx/interrupts.o (.text)
+    arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
+    arch/ppc/cpu/mpc86xx/cpu.o (.text)
+    arch/ppc/cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds
index 20e03447f..d7c65ce21 100644
--- a/board/freescale/mpc8641hpcn/u-boot.lds
+++ b/board/freescale/mpc8641hpcn/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc86xx/start.o	(.text)
-    cpu/mpc86xx/traps.o (.text)
-    cpu/mpc86xx/interrupts.o (.text)
-    cpu/mpc86xx/cpu_init.o (.text)
-    cpu/mpc86xx/cpu.o (.text)
-    cpu/mpc86xx/speed.o (.text)
+    arch/ppc/cpu/mpc86xx/start.o	(.text)
+    arch/ppc/cpu/mpc86xx/traps.o (.text)
+    arch/ppc/cpu/mpc86xx/interrupts.o (.text)
+    arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
+    arch/ppc/cpu/mpc86xx/cpu.o (.text)
+    arch/ppc/cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
diff --git a/board/gen860t/ioport.c b/board/gen860t/ioport.c
index d8c3006a6..146573e1d 100644
--- a/board/gen860t/ioport.c
+++ b/board/gen860t/ioport.c
@@ -197,7 +197,7 @@ const mpc8xx_iop_conf_t iop_conf_tab[NUM_PORTS][PORT_BITS] = {
 
 /*
  * Configure the MPC8XX I/O ports per the ioport configuration table
- * (taken from ./cpu/mpc8260/cpu_init.c)
+ * (taken from ./arch/ppc/cpu/mpc8260/cpu_init.c)
  */
 void config_mpc8xx_ioports (volatile immap_t * immr)
 {
diff --git a/board/gen860t/u-boot-flashenv.lds b/board/gen860t/u-boot-flashenv.lds
index 7b83b25b6..0e129253e 100644
--- a/board/gen860t/u-boot-flashenv.lds
+++ b/board/gen860t/u-boot-flashenv.lds
@@ -55,7 +55,7 @@ SECTIONS
   .plt           : { *(.plt)		}
   .text :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     *(.text)
     *(.got1)
   }
diff --git a/board/gen860t/u-boot.lds b/board/gen860t/u-boot.lds
index 8f40b303b..d184379db 100644
--- a/board/gen860t/u-boot.lds
+++ b/board/gen860t/u-boot.lds
@@ -54,7 +54,7 @@ SECTIONS
   .plt           : { *(.plt)		}
   .text :
   {
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
     *(.text)
     *(.got1)
   }
diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 1bd1ba70c..22ada9ae1 100644
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug
index c0dd67f05..e5aa625b5 100644
--- a/board/genietv/u-boot.lds.debug
+++ b/board/genietv/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/gth/u-boot.lds b/board/gth/u-boot.lds
index f6175d9d5..0e68e1414 100644
--- a/board/gth/u-boot.lds
+++ b/board/gth/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o(.text)
+    arch/ppc/cpu/mpc8xx/start.o(.text)
     *(.text)
     common/env_embedded.o(.text)
     *(.got1)
diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index 1f6e7d6c9..23e3e3bc5 100644
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
-    cpu/mpc8xx/interrupts.o	(.text)
+    arch/ppc/cpu/mpc8xx/interrupts.o	(.text)
     arch/ppc/lib/time.o		(.text)
     arch/ppc/lib/ticks.o		(.text)
     arch/ppc/lib/cache.o		(.text)
diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug
index dc810beae..47e3927ec 100644
--- a/board/hermes/u-boot.lds.debug
+++ b/board/hermes/u-boot.lds.debug
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    cpu/mpc8xx/interrupts.o (.text)
+    arch/ppc/cpu/mpc8xx/interrupts.o (.text)
     arch/ppc/lib/time.o		(.text)
     arch/ppc/lib/ticks.o		(.text)
     . = env_offset;
diff --git a/board/hmi1001/config.mk b/board/hmi1001/config.mk
index 4fe18316e..aebf30411 100644
--- a/board/hmi1001/config.mk
+++ b/board/hmi1001/config.mk
@@ -39,4 +39,4 @@ TEXT_BASE = 0xFFF00000
 endif
 
 PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot-customlayout.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index 965716f71..7086ced34 100644
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8260/start.o	(.text)
+    arch/ppc/cpu/mpc8260/start.o	(.text)
 /*
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug
index f559df716..57cc30586 100644
--- a/board/hymod/u-boot.lds.debug
+++ b/board/hymod/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds
index d7d0fb3df..d6837005f 100644
--- a/board/icu862/u-boot.lds
+++ b/board/icu862/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
 /*
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug
index 282738bd5..b331d5afc 100644
--- a/board/icu862/u-boot.lds.debug
+++ b/board/icu862/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/inka4x0/config.mk b/board/inka4x0/config.mk
index fc70efeee..761efa1d1 100644
--- a/board/inka4x0/config.mk
+++ b/board/inka4x0/config.mk
@@ -39,4 +39,4 @@ TEXT_BASE = 0xFFE00000
 endif
 
 PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot-customlayout.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds
index bbc7139e5..d85604237 100644
--- a/board/ip860/u-boot.lds
+++ b/board/ip860/u-boot.lds
@@ -55,10 +55,10 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    cpu/mpc8xx/interrupts.o (.text)
+    arch/ppc/cpu/mpc8xx/interrupts.o (.text)
     arch/ppc/lib/time.o		(.text)
     arch/ppc/lib/ticks.o		(.text)
 /**
diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug
index fc8fe6cec..dd39b9ac7 100644
--- a/board/ip860/u-boot.lds.debug
+++ b/board/ip860/u-boot.lds.debug
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    cpu/mpc8xx/interrupts.o (.text)
+    arch/ppc/cpu/mpc8xx/interrupts.o (.text)
     arch/ppc/lib/time.o		(.text)
     arch/ppc/lib/ticks.o		(.text)
 /**
diff --git a/board/ivm/u-boot.lds b/board/ivm/u-boot.lds
index 8d7ff7011..767408b52 100644
--- a/board/ivm/u-boot.lds
+++ b/board/ivm/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/env_embedded.o(.text)
     *(.text)
     *(.got1)
diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug
index 037785e7d..5ec82f441 100644
--- a/board/ivm/u-boot.lds.debug
+++ b/board/ivm/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/keymile/common/keymile_hdlc_enet.c b/board/keymile/common/keymile_hdlc_enet.c
index 2e913adc5..ceddaf752 100644
--- a/board/keymile/common/keymile_hdlc_enet.c
+++ b/board/keymile/common/keymile_hdlc_enet.c
@@ -2,7 +2,7 @@
  * (C) Copyright 2008
  * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de.
  *
- * Based in part on cpu/mpc8260/ether_scc.c.
+ * Based in part on arch/ppc/cpu/mpc8260/ether_scc.c.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
diff --git a/board/keymile/km8xx/km8xx_hdlc_enet.c b/board/keymile/km8xx/km8xx_hdlc_enet.c
index 9b93131f0..543deafb9 100644
--- a/board/keymile/km8xx/km8xx_hdlc_enet.c
+++ b/board/keymile/km8xx/km8xx_hdlc_enet.c
@@ -2,7 +2,7 @@
  * (C) Copyright 2008
  * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de.
  *
- * Based in part on cpu/mpc8xx/scc.c.
+ * Based in part on arch/ppc/cpu/mpc8xx/scc.c.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds
index 759072df9..19936bd4b 100644
--- a/board/keymile/km8xx/u-boot.lds
+++ b/board/keymile/km8xx/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/keymile/mgcoge/mgcoge_hdlc_enet.c b/board/keymile/mgcoge/mgcoge_hdlc_enet.c
index 34f04f562..6b8e7eaf7 100644
--- a/board/keymile/mgcoge/mgcoge_hdlc_enet.c
+++ b/board/keymile/mgcoge/mgcoge_hdlc_enet.c
@@ -2,7 +2,7 @@
  * (C) Copyright 2008
  * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de.
  *
- * Based in part on cpu/mpc8260/ether_scc.c.
+ * Based in part on arch/ppc/cpu/mpc8260/ether_scc.c.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
diff --git a/board/korat/u-boot-F7FC.lds b/board/korat/u-boot-F7FC.lds
index cbad8668e..e48339453 100644
--- a/board/korat/u-boot-F7FC.lds
+++ b/board/korat/u-boot-F7FC.lds
@@ -33,7 +33,7 @@ SECTIONS
 
   .bootpg 0xF7FBF000 :
   {
-    cpu/ppc4xx/start.o	(.bootpg)
+    arch/ppc/cpu/ppc4xx/start.o	(.bootpg)
   } = 0xffff
 
   /* Read-only sections, merged into text segment: */
@@ -65,7 +65,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
 
     *(.text)
     *(.got1)
diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds
index e1233a748..18cecaf51 100644
--- a/board/kup/kup4k/u-boot.lds
+++ b/board/kup/kup4k/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
 /*
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug
index 3b61a4256..723f56291 100644
--- a/board/kup/kup4k/u-boot.lds.debug
+++ b/board/kup/kup4k/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds
index e1233a748..18cecaf51 100644
--- a/board/kup/kup4x/u-boot.lds
+++ b/board/kup/kup4x/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
 /*
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug
index 3b61a4256..723f56291 100644
--- a/board/kup/kup4x/u-boot.lds.debug
+++ b/board/kup/kup4x/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds
index 50bdfb457..160f5cf38 100644
--- a/board/lantec/u-boot.lds
+++ b/board/lantec/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug
index be06235c0..172482f88 100644
--- a/board/lantec/u-boot.lds.debug
+++ b/board/lantec/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/logicpd/zoom2/zoom2_serial.c b/board/logicpd/zoom2/zoom2_serial.c
index ba58e3934..cfbad1347 100644
--- a/board/logicpd/zoom2/zoom2_serial.c
+++ b/board/logicpd/zoom2/zoom2_serial.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  *
- * This file was adapted from cpu/mpc5xxx/serial.c
+ * This file was adapted from arch/ppc/cpu/mpc5xxx/serial.c
  *
  */
 
diff --git a/board/lwmon/u-boot.lds b/board/lwmon/u-boot.lds
index cc8ad7d3d..ff2f56640 100644
--- a/board/lwmon/u-boot.lds
+++ b/board/lwmon/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/env_embedded.o(.text)
     *(.text)
     *(.got1)
diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug
index 251ee9bbd..fcf2cbb96 100644
--- a/board/lwmon/u-boot.lds.debug
+++ b/board/lwmon/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/mbx8xx/u-boot.lds b/board/mbx8xx/u-boot.lds
index dc3e580fb..3572f1ad3 100644
--- a/board/mbx8xx/u-boot.lds
+++ b/board/mbx8xx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
 
     *(.text)
     *(.got1)
diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug
index 4f179c7fa..61c0d68d7 100644
--- a/board/mbx8xx/u-boot.lds.debug
+++ b/board/mbx8xx/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds
index e68cfb81a..e382283ea 100644
--- a/board/ml2/u-boot.lds
+++ b/board/ml2/u-boot.lds
@@ -55,14 +55,14 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
     board/ml2/init.o	(.text)
-    cpu/ppc4xx/kgdb.o	(.text)
-    cpu/ppc4xx/traps.o	(.text)
-    cpu/ppc4xx/interrupts.o	(.text)
-    cpu/ppc4xx/4xx_uart.o	(.text)
-    cpu/ppc4xx/cpu_init.o	(.text)
-    cpu/ppc4xx/speed.o	(.text)
+    arch/ppc/cpu/ppc4xx/kgdb.o	(.text)
+    arch/ppc/cpu/ppc4xx/traps.o	(.text)
+    arch/ppc/cpu/ppc4xx/interrupts.o	(.text)
+    arch/ppc/cpu/ppc4xx/4xx_uart.o	(.text)
+    arch/ppc/cpu/ppc4xx/cpu_init.o	(.text)
+    arch/ppc/cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
     lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index f6930b538..ed5492d45 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc824x/start.o		(.text)
+    arch/ppc/cpu/mpc824x/start.o		(.text)
     arch/ppc/lib/board.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/mousse/u-boot.lds.ram b/board/mousse/u-boot.lds.ram
index d048e52d3..d3169489b 100644
--- a/board/mousse/u-boot.lds.ram
+++ b/board/mousse/u-boot.lds.ram
@@ -37,7 +37,7 @@ SECTIONS
   PROVIDE(_f_init_rom = .);
 
   .init : {
-      cpu/mpc824x/start.o	(.text)
+      arch/ppc/cpu/mpc824x/start.o	(.text)
       *(.init)
   } > ram
   _init_size = SIZEOF(.init);
diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom
index 8355f335e..2721fdc6f 100644
--- a/board/mousse/u-boot.lds.rom
+++ b/board/mousse/u-boot.lds.rom
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc824x/start.o	(.text)
+    arch/ppc/cpu/mpc824x/start.o	(.text)
 	 common/board.o (.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/mucmc52/config.mk b/board/mucmc52/config.mk
index 90d9ce2c9..4e9ee73e6 100644
--- a/board/mucmc52/config.mk
+++ b/board/mucmc52/config.mk
@@ -42,4 +42,4 @@ TEXT_BASE = 0xFFF00000
 endif
 
 PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds
diff --git a/board/munices/u-boot.lds b/board/munices/u-boot.lds
index 8db7f26a5..2cd6d3c1a 100644
--- a/board/munices/u-boot.lds
+++ b/board/munices/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc5xxx/start.o	(.text)
+    arch/ppc/cpu/mpc5xxx/start.o	(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
diff --git a/board/nc650/u-boot.lds b/board/nc650/u-boot.lds
index 21fed6262..90ca165c4 100644
--- a/board/nc650/u-boot.lds
+++ b/board/nc650/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     *(.text)
     *(.got1)
   }
diff --git a/board/nc650/u-boot.lds.debug b/board/nc650/u-boot.lds.debug
index 5f8dc9d2c..1405b1730 100644
--- a/board/nc650/u-boot.lds.debug
+++ b/board/nc650/u-boot.lds.debug
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     *(.text)
     *(.got1)
   }
diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index 8f96b1de6..d6e2404f9 100644
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
   .plt		: { *(.plt)		}
   .text	:
   {
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug
index 139751177..ec479b153 100644
--- a/board/netphone/u-boot.lds.debug
+++ b/board/netphone/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt
index 0a54f9aee..0be51925c 100644
--- a/board/netstal/hcu5/README.txt
+++ b/board/netstal/hcu5/README.txt
@@ -83,11 +83,11 @@ System-LEDs ??? (Analog zu HCU4 ???)
 Startup sequence
 ----------------
 
-(cpu/ppc4xx/resetvec.S)
+(arch/ppc/cpu/ppc4xx/resetvec.S)
 depending on configs option
 call _start_440 _start_pci oder _start
 
-(cpu/ppc4xx/start.S)
+(arch/ppc/cpu/ppc4xx/start.S)
 
 _start_440:
 	initialize register like
@@ -136,7 +136,7 @@ _start:
 	 *  - board info struct
 	Save local variables to board info struct
 	call relocate_code() does not return
-	relocate_code: (cpu/ppc4xx/start.S)
+	relocate_code: (arch/ppc/cpu/ppc4xx/start.S)
 -------------------------------------------------------
 From now on our copy is in RAM and we will run from there,
 	starting with board_init_r
@@ -147,7 +147,7 @@ From now on our copy is in RAM and we will run from there,
 	flash_init: (board/netstal/hcu5/flash.c)
 		/* setup for u-boot erase, update */
 	setup bd flash info
-	cpu_init_r: (cpu/ppc4xx/cpu_init.c)
+	cpu_init_r: (arch/ppc/cpu/ppc4xx/cpu_init.c)
 	    peripheral chip select in using defines like
 	    CONFIG_SYS_EBC_PB0A, CONFIG_SYS_EBC_PB0C from hcu5.h
 	mem_malloc_init
@@ -161,7 +161,7 @@ From now on our copy is in RAM and we will run from there,
 Most of the HW specific code for the HCU5 may be found in
 include/configs/hcu5.h
 board/netstal/hcu5/*
-cpu/ppc4xx/*
+arch/ppc/cpu/ppc4xx/*
 arch/ppc/lib/*
 include/ppc440.h
 
diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index ff11ad0f6..c4df378c9 100644
--- a/board/netta/u-boot.lds
+++ b/board/netta/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
   .plt		: { *(.plt)		}
   .text	:
   {
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug
index 139751177..ec479b153 100644
--- a/board/netta/u-boot.lds.debug
+++ b/board/netta/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds
index ff11ad0f6..c4df378c9 100644
--- a/board/netta2/u-boot.lds
+++ b/board/netta2/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
   .plt		: { *(.plt)		}
   .text	:
   {
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug
index 139751177..ec479b153 100644
--- a/board/netta2/u-boot.lds.debug
+++ b/board/netta2/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds
index 70d5a6a0d..6683361ea 100644
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
   .plt		: { *(.plt)		}
   .text	:
   {
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug
index bc8f32e0f..cef1a428b 100644
--- a/board/netvia/u-boot.lds.debug
+++ b/board/netvia/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/nx823/u-boot.lds b/board/nx823/u-boot.lds
index 5c847fbf8..dc370eacf 100644
--- a/board/nx823/u-boot.lds
+++ b/board/nx823/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/env_embedded.o(.text)
 
     *(.text)
diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug
index d55bf33b8..e62f6be5a 100644
--- a/board/nx823/u-boot.lds.debug
+++ b/board/nx823/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/pcippc2/u-boot.lds b/board/pcippc2/u-boot.lds
index d11bb056f..b2be32812 100644
--- a/board/pcippc2/u-boot.lds
+++ b/board/pcippc2/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c
index ce1e61667..bed385c44 100644
--- a/board/pcs440ep/pcs440ep.c
+++ b/board/pcs440ep/pcs440ep.c
@@ -148,7 +148,7 @@ int board_early_init_f(void)
 	mtdcr(EBC0_CFGDATA, reg | 0x04000000);	/* Set ATC */
 
 	/*--------------------------------------------------------------------
-	 * GPIO's are alreay setup in cpu/ppc4xx/cpu_init.c
+	 * GPIO's are alreay setup in arch/ppc/cpu/ppc4xx/cpu_init.c
 	 * via define from board config file.
 	 *-------------------------------------------------------------------*/
 
diff --git a/board/ppmc7xx/u-boot.lds b/board/ppmc7xx/u-boot.lds
index 30e8972af..aae105716 100644
--- a/board/ppmc7xx/u-boot.lds
+++ b/board/ppmc7xx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
diff --git a/board/prodrive/p3mx/u-boot.lds b/board/prodrive/p3mx/u-boot.lds
index d02133114..6dff003dc 100644
--- a/board/prodrive/p3mx/u-boot.lds
+++ b/board/prodrive/p3mx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/74xx_7xx/start.o	(.text)
+    arch/ppc/cpu/74xx_7xx/start.o	(.text)
 
 /* store the environment in a seperate sector in the boot flash */
 /*    . = env_offset; */
diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds
index 09d9470f7..f7de95dc8 100644
--- a/board/quantum/u-boot.lds
+++ b/board/quantum/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug
index dcad81892..a2b7bc70d 100644
--- a/board/quantum/u-boot.lds.debug
+++ b/board/quantum/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/r360mpi/u-boot.lds b/board/r360mpi/u-boot.lds
index 9089f7d6b..4fc18fcf2 100644
--- a/board/r360mpi/u-boot.lds
+++ b/board/r360mpi/u-boot.lds
@@ -55,10 +55,10 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/cpu_init.o	(.text)
-    cpu/mpc8xx/interrupts.o	(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/cpu_init.o	(.text)
+    arch/ppc/cpu/mpc8xx/interrupts.o	(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
 /***
     . = env_offset;
     common/env_embedded.o	(.text)
diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index 15aca6c62..2161501ff 100644
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds
index 09d9470f7..f7de95dc8 100644
--- a/board/rmu/u-boot.lds
+++ b/board/rmu/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug
index dcad81892..a2b7bc70d 100644
--- a/board/rmu/u-boot.lds.debug
+++ b/board/rmu/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds
index 0d4a9efb7..0c51d4812 100644
--- a/board/rsdproto/u-boot.lds
+++ b/board/rsdproto/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8260/start.o	(.text)
+    arch/ppc/cpu/mpc8260/start.o	(.text)
     *(.text)
     *(.got1)
     /*. = env_offset; */
diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c
index dbc0cee75..007f875f0 100644
--- a/board/sandburst/common/ppc440gx_i2c.c
+++ b/board/sandburst/common/ppc440gx_i2c.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * Ported from cpu/ppc4xx/i2c.c by AS HARNOIS by
+ * Ported from arch/ppc/cpu/ppc4xx/i2c.c by AS HARNOIS by
  * Travis B. Sawyer
  * Sandburst Corporation.
  */
diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
index 34dce838f..c17439853 100644
--- a/board/sandburst/karef/u-boot.lds.debug
+++ b/board/sandburst/karef/u-boot.lds.debug
@@ -56,14 +56,14 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
     board/sandburst/karef/init.o (.text)
-    cpu/ppc4xx/kgdb.o	(.text)
-    cpu/ppc4xx/traps.o	(.text)
-    cpu/ppc4xx/interrupts.o	(.text)
-    cpu/ppc4xx/4xx_uart.o	(.text)
-    cpu/ppc4xx/cpu_init.o	(.text)
-    cpu/ppc4xx/speed.o	(.text)
+    arch/ppc/cpu/ppc4xx/kgdb.o	(.text)
+    arch/ppc/cpu/ppc4xx/traps.o	(.text)
+    arch/ppc/cpu/ppc4xx/interrupts.o	(.text)
+    arch/ppc/cpu/ppc4xx/4xx_uart.o	(.text)
+    arch/ppc/cpu/ppc4xx/cpu_init.o	(.text)
+    arch/ppc/cpu/ppc4xx/speed.o	(.text)
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug
index fa976c2e5..845841607 100644
--- a/board/sandburst/metrobox/u-boot.lds.debug
+++ b/board/sandburst/metrobox/u-boot.lds.debug
@@ -56,14 +56,14 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
     board/sandburst/metrobox/init.o (.text)
-    cpu/ppc4xx/kgdb.o	(.text)
-    cpu/ppc4xx/traps.o	(.text)
-    cpu/ppc4xx/interrupts.o	(.text)
-    cpu/ppc4xx/4xx_uart.o	(.text)
-    cpu/ppc4xx/cpu_init.o	(.text)
-    cpu/ppc4xx/speed.o	(.text)
+    arch/ppc/cpu/ppc4xx/kgdb.o	(.text)
+    arch/ppc/cpu/ppc4xx/traps.o	(.text)
+    arch/ppc/cpu/ppc4xx/interrupts.o	(.text)
+    arch/ppc/cpu/ppc4xx/4xx_uart.o	(.text)
+    arch/ppc/cpu/ppc4xx/cpu_init.o	(.text)
+    arch/ppc/cpu/ppc4xx/speed.o	(.text)
     drivers/net/4xx_enet.o	(.text)
     common/dlmalloc.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds
index 7f0412464..2f8730bf2 100644
--- a/board/sbc8641d/u-boot.lds
+++ b/board/sbc8641d/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc86xx/start.o	(.text)
-    cpu/mpc86xx/traps.o (.text)
-    cpu/mpc86xx/interrupts.o (.text)
-    cpu/mpc86xx/cpu_init.o (.text)
-    cpu/mpc86xx/cpu.o (.text)
-    cpu/mpc86xx/speed.o (.text)
+    arch/ppc/cpu/mpc86xx/start.o	(.text)
+    arch/ppc/cpu/mpc86xx/traps.o (.text)
+    arch/ppc/cpu/mpc86xx/interrupts.o (.text)
+    arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
+    arch/ppc/cpu/mpc86xx/cpu.o (.text)
+    arch/ppc/cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds
index fc7464eee..573fbee93 100644
--- a/board/sc3/u-boot.lds
+++ b/board/sc3/u-boot.lds
@@ -60,14 +60,14 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
     board/sc3/init.o	(.text)
-    cpu/ppc4xx/kgdb.o	(.text)
-    cpu/ppc4xx/traps.o	(.text)
-    cpu/ppc4xx/interrupts.o	(.text)
-    cpu/ppc4xx/4xx_uart.o	(.text)
-    cpu/ppc4xx/cpu_init.o	(.text)
-    cpu/ppc4xx/speed.o	(.text)
+    arch/ppc/cpu/ppc4xx/kgdb.o	(.text)
+    arch/ppc/cpu/ppc4xx/traps.o	(.text)
+    arch/ppc/cpu/ppc4xx/interrupts.o	(.text)
+    arch/ppc/cpu/ppc4xx/4xx_uart.o	(.text)
+    arch/ppc/cpu/ppc4xx/cpu_init.o	(.text)
+    arch/ppc/cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
     lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds
index 51e95d555..5bd5a75c6 100644
--- a/board/siemens/CCM/u-boot.lds
+++ b/board/siemens/CCM/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug
index 2a6abfab3..460a98321 100644
--- a/board/siemens/CCM/u-boot.lds.debug
+++ b/board/siemens/CCM/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds
index 877cf9ae0..904d45fcc 100644
--- a/board/siemens/IAD210/u-boot.lds
+++ b/board/siemens/IAD210/u-boot.lds
@@ -55,10 +55,10 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
-    cpu/mpc8xx/interrupts.o (.text)
+    arch/ppc/cpu/mpc8xx/interrupts.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 b/board/siemens/pcu_e/u-boot.lds
index cc8ad7d3d..ff2f56640 100644
--- a/board/siemens/pcu_e/u-boot.lds
+++ b/board/siemens/pcu_e/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/env_embedded.o(.text)
     *(.text)
     *(.got1)
diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug
index 251ee9bbd..fcf2cbb96 100644
--- a/board/siemens/pcu_e/u-boot.lds.debug
+++ b/board/siemens/pcu_e/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/sixnet/u-boot.lds b/board/sixnet/u-boot.lds
index dd632a44c..c3e7f501c 100644
--- a/board/sixnet/u-boot.lds
+++ b/board/sixnet/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/env_embedded.o(.text)
     *(.text)
     *(.got1)
diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds
index 271d74a5c..f2154c429 100644
--- a/board/snmc/qs850/u-boot.lds
+++ b/board/snmc/qs850/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-	cpu/mpc8xx/start.o		(.text)
-	cpu/mpc8xx/traps.o		(.text)
+	arch/ppc/cpu/mpc8xx/start.o		(.text)
+	arch/ppc/cpu/mpc8xx/traps.o		(.text)
 	common/dlmalloc.o		(.text)
 	arch/ppc/lib/ppcstring.o		(.text)
 	lib/vsprintf.o	(.text)
diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds
index 271d74a5c..f2154c429 100644
--- a/board/snmc/qs860t/u-boot.lds
+++ b/board/snmc/qs860t/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-	cpu/mpc8xx/start.o		(.text)
-	cpu/mpc8xx/traps.o		(.text)
+	arch/ppc/cpu/mpc8xx/start.o		(.text)
+	arch/ppc/cpu/mpc8xx/traps.o		(.text)
 	common/dlmalloc.o		(.text)
 	arch/ppc/lib/ppcstring.o		(.text)
 	lib/vsprintf.o	(.text)
diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds
index f95f695b1..c000746c5 100644
--- a/board/spc1920/u-boot.lds
+++ b/board/spc1920/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/spd8xx/u-boot.lds b/board/spd8xx/u-boot.lds
index 7b9455b25..c4d83574d 100644
--- a/board/spd8xx/u-boot.lds
+++ b/board/spd8xx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/env_embedded.o(.text)
     *(.text)
     *(.got1)
diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug
index 4f179c7fa..61c0d68d7 100644
--- a/board/spd8xx/u-boot.lds.debug
+++ b/board/spd8xx/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds
index ff11ad0f6..c4df378c9 100644
--- a/board/stx/stxxtc/u-boot.lds
+++ b/board/stx/stxxtc/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
   .plt		: { *(.plt)		}
   .text	:
   {
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/stx/stxxtc/u-boot.lds.debug b/board/stx/stxxtc/u-boot.lds.debug
index 139751177..ec479b153 100644
--- a/board/stx/stxxtc/u-boot.lds.debug
+++ b/board/stx/stxxtc/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
     common/dlmalloc.o		(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds
index 6de74887c..90270954e 100644
--- a/board/svm_sc8xx/u-boot.lds
+++ b/board/svm_sc8xx/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug
index dcad81892..a2b7bc70d 100644
--- a/board/svm_sc8xx/u-boot.lds.debug
+++ b/board/svm_sc8xx/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds
index ceaac0005..a2277c260 100644
--- a/board/tqc/tqm8xx/u-boot.lds
+++ b/board/tqc/tqm8xx/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug
index f559df716..57cc30586 100644
--- a/board/tqc/tqm8xx/u-boot.lds.debug
+++ b/board/tqc/tqm8xx/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds
index 960b2a582..f67b1d9c1 100644
--- a/board/uc100/u-boot.lds
+++ b/board/uc100/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/uc100/u-boot.lds.debug b/board/uc100/u-boot.lds.debug
index 116a97208..84b338a75 100644
--- a/board/uc100/u-boot.lds.debug
+++ b/board/uc100/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/uc101/config.mk b/board/uc101/config.mk
index 4fe18316e..aebf30411 100644
--- a/board/uc101/config.mk
+++ b/board/uc101/config.mk
@@ -39,4 +39,4 @@ TEXT_BASE = 0xFFF00000
 endif
 
 PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot-customlayout.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index 248f4887c..bc47060f2 100644
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o		(.text)
-    cpu/mpc8xx/traps.o		(.text)
+    arch/ppc/cpu/mpc8xx/start.o		(.text)
+    arch/ppc/cpu/mpc8xx/traps.o		(.text)
     common/dlmalloc.o		(.text)
     arch/ppc/lib/ppcstring.o		(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/w7o/w7o.c b/board/w7o/w7o.c
index a818808ba..96a12d73e 100644
--- a/board/w7o/w7o.c
+++ b/board/w7o/w7o.c
@@ -157,7 +157,7 @@ phys_size_t initdram (int board_type)
 	/*
 	 * ToDo: Move the asm init routine sdram_init() to this C file,
 	 * or even better use some common ppc4xx code available
-	 * in cpu/ppc4xx
+	 * in arch/ppc/cpu/ppc4xx
 	 */
 	sdram_init();
 
diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds
index 51e95d555..5bd5a75c6 100644
--- a/board/westel/amx860/u-boot.lds
+++ b/board/westel/amx860/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     arch/ppc/lib/ppcstring.o	(.text)
     lib/vsprintf.o	(.text)
diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug
index 282738bd5..b331d5afc 100644
--- a/board/westel/amx860/u-boot.lds.debug
+++ b/board/westel/amx860/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/mpc8xx/start.o	(.text)
+    arch/ppc/cpu/mpc8xx/start.o	(.text)
     common/dlmalloc.o	(.text)
     lib/vsprintf.o	(.text)
     lib/crc32.o		(.text)
diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug
index 555e1ac03..c3f6fefb4 100644
--- a/board/xes/xpedite1000/u-boot.lds.debug
+++ b/board/xes/xpedite1000/u-boot.lds.debug
@@ -55,14 +55,14 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within	*/
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-    cpu/ppc4xx/start.o	(.text)
+    arch/ppc/cpu/ppc4xx/start.o	(.text)
     board/xes/xpedite1000/init.o (.text)
-    cpu/ppc4xx/kgdb.o	(.text)
-    cpu/ppc4xx/traps.o	(.text)
-    cpu/ppc4xx/interrupts.o	(.text)
-    cpu/ppc4xx/4xx_uart.o	(.text)
-    cpu/ppc4xx/cpu_init.o	(.text)
-    cpu/ppc4xx/speed.o	(.text)
+    arch/ppc/cpu/ppc4xx/kgdb.o	(.text)
+    arch/ppc/cpu/ppc4xx/traps.o	(.text)
+    arch/ppc/cpu/ppc4xx/interrupts.o	(.text)
+    arch/ppc/cpu/ppc4xx/4xx_uart.o	(.text)
+    arch/ppc/cpu/ppc4xx/cpu_init.o	(.text)
+    arch/ppc/cpu/ppc4xx/speed.o	(.text)
     common/dlmalloc.o	(.text)
     lib/crc32.o		(.text)
     arch/ppc/lib/extable.o	(.text)
diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds
index 7f0412464..2f8730bf2 100644
--- a/board/xes/xpedite5170/u-boot.lds
+++ b/board/xes/xpedite5170/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc86xx/start.o	(.text)
-    cpu/mpc86xx/traps.o (.text)
-    cpu/mpc86xx/interrupts.o (.text)
-    cpu/mpc86xx/cpu_init.o (.text)
-    cpu/mpc86xx/cpu.o (.text)
-    cpu/mpc86xx/speed.o (.text)
+    arch/ppc/cpu/mpc86xx/start.o	(.text)
+    arch/ppc/cpu/mpc86xx/traps.o (.text)
+    arch/ppc/cpu/mpc86xx/interrupts.o (.text)
+    arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
+    arch/ppc/cpu/mpc86xx/cpu.o (.text)
+    arch/ppc/cpu/mpc86xx/speed.o (.text)
     common/dlmalloc.o (.text)
     lib/crc32.o (.text)
     arch/ppc/lib/extable.o (.text)
diff --git a/board/xilinx/ppc405-generic/u-boot-rom.lds b/board/xilinx/ppc405-generic/u-boot-rom.lds
index 02044e43d..8fafbd59c 100644
--- a/board/xilinx/ppc405-generic/u-boot-rom.lds
+++ b/board/xilinx/ppc405-generic/u-boot-rom.lds
@@ -33,7 +33,7 @@ SECTIONS
 
   .bootpg 0xFFFFF000 :
   {
-    cpu/ppc4xx/start.o	(.bootpg)
+    arch/ppc/cpu/ppc4xx/start.o	(.bootpg)
   } = 0xffff
 
   /* Read-only sections, merged into text segment: */
diff --git a/board/xilinx/ppc440-generic/u-boot-rom.lds b/board/xilinx/ppc440-generic/u-boot-rom.lds
index 57c809e4c..0cbed8ea5 100644
--- a/board/xilinx/ppc440-generic/u-boot-rom.lds
+++ b/board/xilinx/ppc440-generic/u-boot-rom.lds
@@ -33,7 +33,7 @@ SECTIONS
 
   .bootpg 0xFFFFF000 :
   {
-    cpu/ppc4xx/start.o	(.bootpg)
+    arch/ppc/cpu/ppc4xx/start.o	(.bootpg)
   } = 0xffff
 
   /* Read-only sections, merged into text segment: */
diff --git a/config.mk b/config.mk
index 85b524ead..73b5195cb 100644
--- a/config.mk
+++ b/config.mk
@@ -112,7 +112,12 @@ sinclude $(OBJTREE)/include/autoconf.mk
 
 # Some architecture config.mk files need to know what CPUDIR is set to,
 # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files.
-CPUDIR=cpu/$(CPU)
+# Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains
+# CPU-specific code.
+CPUDIR=arch/$(ARCH)/cpu/$(CPU)
+ifneq ($(SRCTREE)/$(CPUDIR),$(wildcard $(SRCTREE)/$(CPUDIR)))
+CPUDIR=arch/$(ARCH)/cpu
+endif
 
 sinclude $(TOPDIR)/arch/$(ARCH)/config.mk	# include architecture dependend rules
 sinclude $(TOPDIR)/$(CPUDIR)/config.mk		# include  CPU	specific rules
diff --git a/doc/README.PIP405 b/doc/README.PIP405
index d8b3f9c01..e8a654128 100644
--- a/doc/README.PIP405
+++ b/doc/README.PIP405
@@ -17,11 +17,11 @@ Changed files:
 				added console settings from environment
 - common/devices.c		added ISA keyboard init
 - common/main.c			corrected the read of bootdelay
-- cpu/ppc4xx/405gp_pci.c	excluded file from PIP405
-- cpu/ppc4xx/i2c.c		added 16bit read write I2C support
+- arch/ppc/cpu/ppc4xx/405gp_pci.c	excluded file from PIP405
+- arch/ppc/cpu/ppc4xx/i2c.c		added 16bit read write I2C support
 				added page write
-- cpu/ppc4xx/speed.c		added get_PCI_freq
-- cpu/ppc4xx/start.S		added CONFIG_IDENT_STRING
+- arch/ppc/cpu/ppc4xx/speed.c		added get_PCI_freq
+- arch/ppc/cpu/ppc4xx/start.S		added CONFIG_IDENT_STRING
 - disk/Makefile			added part_iso for CD support
 - disk/part.c			changed to work with block device description
 				added ISO CD support
@@ -275,7 +275,7 @@ Added the config variable CONFIG_IDENT_STRING which will be added to the
 "U_BOOT_VERSION __TIME__ DATE___ " String, to allows to identify intermidiate
 and custom versions.
 Changed files:
-- cpu/ppc4xx/start.s
+- arch/ppc/cpu/ppc4xx/start.s
 
 Firmware Image:
 ---------------
@@ -288,11 +288,11 @@ Changed files:
 
 Correct PCI Frequency for PPC405:
 ---------------------------------
-Added function (in cpu/ppc4xx/speed.c) to get the PCI frequency for PPC405 CPU.
+Added function (in arch/ppc/cpu/ppc4xx/speed.c) to get the PCI frequency for PPC405 CPU.
 The PCI Frequency will now be set correct in the board description in common/board.c.
 (was set to the busfreq before).
 Changed files:
-- cpu/ppc4xx/speed.c
+- arch/ppc/cpu/ppc4xx/speed.c
 - common/board.c
 
 I2C Stuff:
@@ -301,7 +301,7 @@ Added defined(CONFIG_PIP405) at several points in common/cmd_i2c.c.
 Added 16bit read/write support for I2C (PPC405), and page write to
 I2C EEPROM if defined CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE.
 Changed files:
-- cpu/ppc4xx/i2c.c
+- arch/ppc/cpu/ppc4xx/i2c.c
 - common/cmd_i2c.c
 
 Environment / Console:
diff --git a/doc/README.POST b/doc/README.POST
index a81e07926..0d5e20e97 100644
--- a/doc/README.POST
+++ b/doc/README.POST
@@ -713,7 +713,7 @@ use external loopback for testing. That will need appropriate
 reconfiguration of the physical interface chip.
 
 The test routines for the SCC ethernet tests will be located in
-cpu/mpc8xx/scc.c.
+arch/ppc/cpu/mpc8xx/scc.c.
 
 2.2.3.2. UART tests (SMC/SCC)
 
@@ -725,7 +725,7 @@ will be transmitted. These tests may be enhanced to make to perform
 test will be executed manually.
 
 The test routine for the SMC/SCC UART tests will be located in
-cpu/mpc8xx/serial.c.
+arch/ppc/cpu/mpc8xx/serial.c.
 
 2.2.3.3. USB test
 
diff --git a/doc/README.RPXlite b/doc/README.RPXlite
index c0238ae21..0aa4d1130 100644
--- a/doc/README.RPXlite
+++ b/doc/README.RPXlite
@@ -116,7 +116,7 @@
 	board/RPXLITE/RPXLITE.c		/* DRAM-related routines */
 	board/RPXLITE/flash.c		/* flash-related routines */
 	board/RPXLITE/config.mk		/* set text base address */
-	cpu/mpc8xx/serial.c			/* board specific register setting */
+	arch/ppc/cpu/mpc8xx/serial.c			/* board specific register setting */
 	include/config_RPXLITE.h	/* board specific registers */
 
 	See 'reg_config.txt' for register values in detail.
diff --git a/doc/README.TQM8260 b/doc/README.TQM8260
index b93a1cb94..e64e64a3e 100644
--- a/doc/README.TQM8260
+++ b/doc/README.TQM8260
@@ -14,10 +14,10 @@ The following common files have been modified by this project:
 
 MAKEALL			- TQM8260 entry added
 Makefile		- TQM8260_config entry added
-cpu/mpc8260/Makefile	- soft_i2c.o module added
-cpu/mpc8260/ether_scc.c	- TQM8260-specific definitions added, an obvious
+arch/ppc/cpu/mpc8260/Makefile	- soft_i2c.o module added
+arch/ppc/cpu/mpc8260/ether_scc.c	- TQM8260-specific definitions added, an obvious
 			  bug fixed (fcr -> scr)
-cpu/mpc8260/ether_fcc.c	- TQM8260-specific definitions added
+arch/ppc/cpu/mpc8260/ether_fcc.c	- TQM8260-specific definitions added
 include/flash.h		- added definitions for the AM29LV640D Flash chip
 
 
@@ -33,7 +33,7 @@ board/tqm8260/config.mk	  - config file
 board/tqm8260/flash.c	  - flash driver (for AM29LV640D)
 board/tqm8260/ppcboot.lds - linker script
 board/tqm8260/tqm8260.c	  - ioport and memory initialization
-cpu/mpc8260/soft_i2c.c	  - software i2c EEPROM driver
+arch/ppc/cpu/mpc8260/soft_i2c.c	  - software i2c EEPROM driver
 include/config_TQM8260.h  - main configuration file
 
 
diff --git a/doc/README.alaska8220 b/doc/README.alaska8220
index 279dac69f..9249cfb31 100644
--- a/doc/README.alaska8220
+++ b/doc/README.alaska8220
@@ -37,24 +37,24 @@ Added files:
 - board/alaska/config.mk    config make
 - board/alaska/u-boot.lds   Linker description
 
-- cpu/mpc8220/dma.h	    multi-channel dma header file
-- cpu/mpc8220/dramSetup.h   dram setup header file
-- cpu/mpc8220/fec.h	    MPC8220 FEC header file
-- cpu/mpc8220/cpu.c	    cpu specific code
-- cpu/mpc8220/cpu_init.c    Flexbus ChipSelect and Mux pins setup
-- cpu/mpc8220/dramSetup.c   MPC8220 DDR SDRAM setup
-- cpu/mpc8220/fec.c	    MPC8220 FEC driver
-- cpu/mpc8220/i2c.c	    MPC8220 I2C driver
-- cpu/mpc8220/interrupts.c  interrupt support (not enable)
-- cpu/mpc8220/loadtask.c    load dma
-- cpu/mpc8220/speed.c	    system, pci, flexbus, pev, and cpu clock
-- cpu/mpc8220/traps.c	    exception
-- cpu/mpc8220/uart.c	    MPC8220 UART driver
-- cpu/mpc8220/Makefile	    Makefile
-- cpu/mpc8220/config.mk	    config make
-- cpu/mpc8220/fec_dma_task.S MPC8220 FEC multi-channel dma program
-- cpu/mpc8220/io.S	    io functions
-- cpu/mpc8220/start.S	    start up
+- arch/ppc/cpu/mpc8220/dma.h	    multi-channel dma header file
+- arch/ppc/cpu/mpc8220/dramSetup.h   dram setup header file
+- arch/ppc/cpu/mpc8220/fec.h	    MPC8220 FEC header file
+- arch/ppc/cpu/mpc8220/cpu.c	    cpu specific code
+- arch/ppc/cpu/mpc8220/cpu_init.c    Flexbus ChipSelect and Mux pins setup
+- arch/ppc/cpu/mpc8220/dramSetup.c   MPC8220 DDR SDRAM setup
+- arch/ppc/cpu/mpc8220/fec.c	    MPC8220 FEC driver
+- arch/ppc/cpu/mpc8220/i2c.c	    MPC8220 I2C driver
+- arch/ppc/cpu/mpc8220/interrupts.c  interrupt support (not enable)
+- arch/ppc/cpu/mpc8220/loadtask.c    load dma
+- arch/ppc/cpu/mpc8220/speed.c	    system, pci, flexbus, pev, and cpu clock
+- arch/ppc/cpu/mpc8220/traps.c	    exception
+- arch/ppc/cpu/mpc8220/uart.c	    MPC8220 UART driver
+- arch/ppc/cpu/mpc8220/Makefile	    Makefile
+- arch/ppc/cpu/mpc8220/config.mk	    config make
+- arch/ppc/cpu/mpc8220/fec_dma_task.S MPC8220 FEC multi-channel dma program
+- arch/ppc/cpu/mpc8220/io.S	    io functions
+- arch/ppc/cpu/mpc8220/start.S	    start up
 
 - include/mpc8220.h
 
diff --git a/doc/README.bedbug b/doc/README.bedbug
index 2616acc65..4c1e6c4d5 100644
--- a/doc/README.bedbug
+++ b/doc/README.bedbug
@@ -18,15 +18,15 @@ can be easily implemented.
 ./common/board.c
 	Added call to initialize debugger on startup.
 
-./cpu/ppc4xx/Makefile
+./arch/ppc/cpu/ppc4xx/Makefile
 	Added bedbug_405.c to the Makefile.
 
-./cpu/ppc4xx/start.S
+./arch/ppc/cpu/ppc4xx/start.S
 	Added code to handle the debug exception (0x2000) on the 405.
 	Also added code to handle critical exceptions since the debug
 	is treated as critical on the 405.
 
-./cpu/ppc4xx/traps.c
+./arch/ppc/cpu/ppc4xx/traps.c
 	Added more detailed output for the program exception to tell
 	if it is an illegal instruction, privileged instruction or
 	a trap. Also added debug trap handler.
@@ -51,7 +51,7 @@ can be easily implemented.
 	hardware breakpoints and stepping through code.  These
 	routines are common to all PowerPC processors.
 
-./cpu/ppc4xx/bedbug_405.c
+./arch/ppc/cpu/ppc4xx/bedbug_405.c
 	AMCC  PPC405 specific debugger routines.
 
 
@@ -63,16 +63,16 @@ Changes:
 	common/cmd_bedbug.c
 		Added call to initialize 860 debugger.
 
-	cpu/mpc8xx/Makefile
+	arch/ppc/cpu/mpc8xx/Makefile
 		Added new file "bedbug_860.c" to the makefile
 
-	cpu/mpc8xx/start.S
+	arch/ppc/cpu/mpc8xx/start.S
 		Added handler for InstructionBreakpoint (0xfd00)
 
-	cpu/mpc8xx/traps.c
+	arch/ppc/cpu/mpc8xx/traps.c
 		Added new routine DebugException()
 
 New Files:
 
-	cpu/mpc8xx/bedbug_860.c
+	arch/ppc/cpu/mpc8xx/bedbug_860.c
 		CPU-specific routines for 860 debug registers.
diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx
index 2e121746d..26fb0c27d 100644
--- a/doc/README.mpc5xx
+++ b/doc/README.mpc5xx
@@ -25,7 +25,7 @@ Added or Changed Files:
 u-boot-0.2.0/common/cmd_boot.c
 u-boot-0.2.0/common/cmd_reginfo.c
 u-boot-0.2.0/common/environment.c
-u-boot-0.2.0/cpu/mpc5xx/*
+u-boot-0.2.0/arch/ppc/cpu/mpc5xx/*
 u-boot-0.2.0/include/cmd_reginfo.h
 u-boot-0.2.0/include/common.h
 u-boot-0.2.0/include/ppc_asm.tmpl
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index c4214d9a0..c1cc23bfc 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -47,7 +47,7 @@
 /*--------------------------------------------------------------------+
  * Fixed PHY (PHY-less) support for Ethernet Ports.
  *
- * Copied from cpu/ppc4xx/4xx_enet.c
+ * Copied from arch/ppc/cpu/ppc4xx/4xx_enet.c
  *--------------------------------------------------------------------*/
 
 /*
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index c4b36f06c..687ffe6ac 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006 Ben Warren, Qstreams Networks Inc.
- * With help from the common/soft_spi and cpu/mpc8260 drivers
+ * With help from the common/soft_spi and arch/ppc/cpu/mpc8260 drivers
  *
  * See file CREDITS for list of people who contributed to this
  * project.
diff --git a/examples/standalone/mem_to_mem_idma2intr.c b/examples/standalone/mem_to_mem_idma2intr.c
index 15779d0a1..eeff5f5f2 100644
--- a/examples/standalone/mem_to_mem_idma2intr.c
+++ b/examples/standalone/mem_to_mem_idma2intr.c
@@ -1,5 +1,5 @@
 /* The dpalloc function used and implemented in this file was derieved
- * from PPCBoot/U-Boot file "cpu/mpc8260/commproc.c".
+ * from PPCBoot/U-Boot file "arch/ppc/cpu/mpc8260/commproc.c".
  */
 
 /* Author: Arun Dharankar <ADharankar@ATTBI.Com>
diff --git a/include/configs/aria.h b/include/configs/aria.h
index f89fc570a..06763c5d9 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -190,7 +190,7 @@
 
 /*
  * Backward compatible definitions,
- * so we do not have to change cpu/mpc512x/fixed_sdram.c
+ * so we do not have to change arch/ppc/cpu/mpc512x/fixed_sdram.c
  */
 #define	CONFIG_SYS_DDRCMD_EM2		(CONFIG_SYS_MICRON_EMR2)
 #define CONFIG_SYS_DDRCMD_EM3		(CONFIG_SYS_MICRON_EMR3)
diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index 4be28b26a..44669ea44 100644
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -141,7 +141,7 @@
 
 #define CONFIG_SYS_FLASH_BASE		0xfe000000
 /*
- * The flash size is autoconfigured, but cpu/mpc5xxx/cpu_init.c needs this
+ * The flash size is autoconfigured, but arch/ppc/cpu/mpc5xxx/cpu_init.c needs this
  * variable defined
  */
 #define CONFIG_SYS_FLASH_SIZE		0x02000000
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index a79feec16..e5537da4a 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -230,7 +230,7 @@
  *       SDRAM Controller DDR autocalibration values and takes a lot longer
  *       to run than Method_B.
  * (See the Method_A and Method_B algorithm discription in the file:
- *	cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c)
+ *	arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c)
  * Define CONFIG_PPC4xx_DDR_METHOD_A to use DDR autocalibration Method_A
  *
  * DDR Autocalibration Method_B is the default.
diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index 16b464cf6..3958d09eb 100644
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -290,7 +290,7 @@
  * taken from the orignal Linkstation boot code
  *
  * Most of the low level configuration setttings are normally used
- * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation.
+ * in arch/ppc/cpu/mpc824x/cpu_init.c which is NOT used by this implementation.
  * Low level initialisation is done in board/linkstation/early_init.S
  * The values below are included for reference purpose only
  */
diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 403837e14..247218752 100644
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -233,7 +233,7 @@
  * Definitions for initial stack pointer and data area (in data cache)
  */
 /* use on chip memory (OCM) for temperary stack until sdram is tested */
-/* see ./cpu/ppc4xx/start.S */
+/* see ./arch/ppc/cpu/ppc4xx/start.S */
 #define CONFIG_SYS_TEMP_STACK_OCM	1
 
 /* On Chip Memory location */
@@ -251,7 +251,7 @@
  * Taken from PPCBoot board/icecube/icecube.h
  */
 
-/* see ./cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */
+/* see ./arch/ppc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */
 #define CONFIG_SYS_EBC_PB0AP		0x04002480
 /* AMD NOR flash - this corresponds to FLASH_BASE so may be correct */
 #define CONFIG_SYS_EBC_PB0CR		0xFFC5A000
@@ -269,7 +269,7 @@
  *
  * Taken in part from PPCBoot board/icecube/icecube.h
  */
-/* see ./cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */
+/* see ./arch/ppc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */
 #define CONFIG_SYS_GPIO0_OSRH		0x55555550
 #define CONFIG_SYS_GPIO0_OSRL		0x00000110
 #define CONFIG_SYS_GPIO0_ISR1H		0x00000000
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index d00f2480c..7423663a2 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -456,7 +456,7 @@
  * - internal SRAM (OCM=On Chip Memory) is placed to CONFIG_SYS_OCM_DATA_ADDR
  * - Stackpointer will be located to
  *   (CONFIG_SYS_INIT_RAM_ADDR&0xFFFF0000) | (CONFIG_SYS_INIT_SP_OFFSET&0x0000FFFF)
- *   in cpu/ppc4xx/start.S
+ *   in arch/ppc/cpu/ppc4xx/start.S
  */
 
 #undef CONFIG_SYS_INIT_DCACHE_CS
@@ -495,7 +495,7 @@
 #define BOOTFLAG_WARM	0x02		/* Software reboot			*/
 
 /* ################################################################################### */
-/* These defines will be used in cpu/ppc4xx/cpu_init.c to setup external chip selects  */
+/* These defines will be used in arch/ppc/cpu/ppc4xx/cpu_init.c to setup external chip selects  */
 /* They are currently undefined cause they are initiaized in board/solidcard3/init.S   */
 
 /* This chip select accesses the boot device */
diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile
index f37425eba..fce4582c2 100644
--- a/nand_spl/board/amcc/acadia/Makefile
+++ b/nand_spl/board/amcc/acadia/Makefile
@@ -68,11 +68,11 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # from cpu directory
 $(obj)cache.S:
 	@rm -f $(obj)cache.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/cache.S $(obj)cache.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/cache.S $(obj)cache.S
 
 $(obj)gpio.c:
 	@rm -f $(obj)gpio.c
-	ln -s $(SRCTREE)/cpu/ppc4xx/gpio.c $(obj)gpio.c
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/gpio.c $(obj)gpio.c
 
 $(obj)ndfc.c:
 	@rm -f $(obj)ndfc.c
@@ -80,11 +80,11 @@ $(obj)ndfc.c:
 
 $(obj)resetvec.S:
 	@rm -f $(obj)resetvec.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
 
 $(obj)start.S:
 	@rm -f $(obj)start.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
 
 # from board directory
 $(obj)memory.c:
diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile
index 5fcf2905a..48fde1d1d 100644
--- a/nand_spl/board/amcc/bamboo/Makefile
+++ b/nand_spl/board/amcc/bamboo/Makefile
@@ -66,11 +66,11 @@ $(obj)ndfc.c:
 
 $(obj)resetvec.S:
 	@rm -f $(obj)resetvec.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
 
 $(obj)start.S:
 	@rm -f $(obj)start.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
 
 # from board directory
 $(obj)init.S:
diff --git a/nand_spl/board/amcc/canyonlands/Makefile b/nand_spl/board/amcc/canyonlands/Makefile
index f77e45944..0012a9c99 100644
--- a/nand_spl/board/amcc/canyonlands/Makefile
+++ b/nand_spl/board/amcc/canyonlands/Makefile
@@ -71,11 +71,11 @@ $(obj)ndfc.c:
 
 $(obj)resetvec.S:
 	@rm -f $(obj)resetvec.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
 
 $(obj)start.S:
 	@rm -f $(obj)start.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
 
 # from board directory
 $(obj)init.S:
diff --git a/nand_spl/board/amcc/kilauea/Makefile b/nand_spl/board/amcc/kilauea/Makefile
index bc2174401..de4980a55 100644
--- a/nand_spl/board/amcc/kilauea/Makefile
+++ b/nand_spl/board/amcc/kilauea/Makefile
@@ -62,15 +62,15 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # from cpu directory
 $(obj)44x_spd_ddr2.c: $(obj)ecc.h
 	@rm -f $(obj)44x_spd_ddr2.c
-	ln -s $(SRCTREE)/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c
 
 $(obj)cache.S:
 	@rm -f $(obj)cache.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/cache.S $(obj)cache.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/cache.S $(obj)cache.S
 
 $(obj)ecc.h:
 	@rm -f $(obj)ecc.h
-	ln -s $(SRCTREE)/cpu/ppc4xx/ecc.h $(obj)ecc.h
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/ecc.h $(obj)ecc.h
 
 $(obj)ndfc.c:
 	@rm -f $(obj)ndfc.c
@@ -78,11 +78,11 @@ $(obj)ndfc.c:
 
 $(obj)resetvec.S:
 	@rm -f $(obj)resetvec.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
 
 $(obj)start.S:
 	@rm -f $(obj)start.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
 
 # from nand_spl directory
 $(obj)nand_boot.c:
diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile
index 54ea7c7e5..e6f96fd3b 100644
--- a/nand_spl/board/amcc/sequoia/Makefile
+++ b/nand_spl/board/amcc/sequoia/Makefile
@@ -62,7 +62,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # from cpu directory
 $(obj)denali_data_eye.c:
 	@rm -f $(obj)denali_data_eye.c
-	ln -s $(SRCTREE)/cpu/ppc4xx/denali_data_eye.c $(obj)denali_data_eye.c
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/denali_data_eye.c $(obj)denali_data_eye.c
 
 $(obj)ndfc.c:
 	@rm -f $(obj)ndfc.c
@@ -70,11 +70,11 @@ $(obj)ndfc.c:
 
 $(obj)resetvec.S:
 	@rm -f $(obj)resetvec.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
 
 $(obj)start.S:
 	@rm -f $(obj)start.S
-	ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+	ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
 
 # from board directory
 $(obj)init.S:
diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile
index ee1dc4b29..a23176c78 100644
--- a/nand_spl/board/freescale/mpc8313erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8313erdb/Makefile
@@ -65,7 +65,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # create symbolic links for common files
 
 $(obj)start.S:
-	ln -sf $(SRCTREE)/cpu/mpc83xx/start.S $(obj)start.S
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $(obj)start.S
 
 $(obj)nand_boot_fsl_elbc.c:
 	ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \
@@ -81,7 +81,7 @@ $(obj)ns16550.c:
 	ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
 
 $(obj)nand_init.c:
-	ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
 
 $(obj)cache.c:
 	ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index ee1dc4b29..a23176c78 100644
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -65,7 +65,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # create symbolic links for common files
 
 $(obj)start.S:
-	ln -sf $(SRCTREE)/cpu/mpc83xx/start.S $(obj)start.S
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $(obj)start.S
 
 $(obj)nand_boot_fsl_elbc.c:
 	ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \
@@ -81,7 +81,7 @@ $(obj)ns16550.c:
 	ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
 
 $(obj)nand_init.c:
-	ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
 
 $(obj)cache.c:
 	ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index ff8b8be6a..7f75afcb5 100644
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -68,11 +68,11 @@ $(obj)cache.c:
 
 $(obj)cpu_init_early.c:
 	@rm -f $(obj)cpu_init_early.c
-	ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
 
 $(obj)cpu_init_nand.c:
 	@rm -f $(obj)cpu_init_nand.c
-	ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
 
 $(obj)fsl_law.c:
 	@rm -f $(obj)fsl_law.c
@@ -97,15 +97,15 @@ $(obj)resetvec.S:
 
 $(obj)fixed_ivor.S:
 	@rm -f $(obj)fixed_ivor.S
-	ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
 
 $(obj)start.S: $(obj)fixed_ivor.S
 	@rm -f $(obj)start.S
-	ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S
 
 $(obj)tlb.c:
 	@rm -f $(obj)tlb.c
-	ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c
 
 $(obj)tlb_table.c:
 	@rm -f $(obj)tlb_table.c
diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index ff8b8be6a..7f75afcb5 100644
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -68,11 +68,11 @@ $(obj)cache.c:
 
 $(obj)cpu_init_early.c:
 	@rm -f $(obj)cpu_init_early.c
-	ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
 
 $(obj)cpu_init_nand.c:
 	@rm -f $(obj)cpu_init_nand.c
-	ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
 
 $(obj)fsl_law.c:
 	@rm -f $(obj)fsl_law.c
@@ -97,15 +97,15 @@ $(obj)resetvec.S:
 
 $(obj)fixed_ivor.S:
 	@rm -f $(obj)fixed_ivor.S
-	ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
 
 $(obj)start.S: $(obj)fixed_ivor.S
 	@rm -f $(obj)start.S
-	ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S
 
 $(obj)tlb.c:
 	@rm -f $(obj)tlb.c
-	ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c
 
 $(obj)tlb_table.c:
 	@rm -f $(obj)tlb_table.c
diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index ff8b8be6a..7f75afcb5 100644
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -68,11 +68,11 @@ $(obj)cache.c:
 
 $(obj)cpu_init_early.c:
 	@rm -f $(obj)cpu_init_early.c
-	ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
 
 $(obj)cpu_init_nand.c:
 	@rm -f $(obj)cpu_init_nand.c
-	ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
 
 $(obj)fsl_law.c:
 	@rm -f $(obj)fsl_law.c
@@ -97,15 +97,15 @@ $(obj)resetvec.S:
 
 $(obj)fixed_ivor.S:
 	@rm -f $(obj)fixed_ivor.S
-	ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
 
 $(obj)start.S: $(obj)fixed_ivor.S
 	@rm -f $(obj)start.S
-	ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S
 
 $(obj)tlb.c:
 	@rm -f $(obj)tlb.c
-	ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c
+	ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c
 
 $(obj)tlb_table.c:
 	@rm -f $(obj)tlb_table.c
diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index 48c22f84b..3ad6250db 100644
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -66,7 +66,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 
 $(obj)start.S:
 	@rm -f $@
-	ln -s $(SRCTREE)/cpu/mpc83xx/start.S $@
+	ln -s $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $@
 
 $(obj)nand_boot_fsl_elbc.c:
 	@rm -f $@
@@ -86,7 +86,7 @@ $(obj)ns16550.c:
 
 $(obj)nand_init.c:
 	@rm -f $@
-	ln -s $(SRCTREE)/cpu/mpc83xx/nand_init.c $@
+	ln -s $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $@
 
 $(obj)cache.c:
 	@rm -f $@
diff --git a/post/cpu/ppc4xx/spr.c b/post/cpu/ppc4xx/spr.c
index ecb87b53a..6ff5c79aa 100644
--- a/post/cpu/ppc4xx/spr.c
+++ b/post/cpu/ppc4xx/spr.c
@@ -69,7 +69,7 @@ static struct {
 
 	/* Additional Special-Purpose Registers.
 	 * The values must match the initialization
-	 * values from cpu/ppc4xx/start.S
+	 * values from arch/ppc/cpu/ppc4xx/start.S
 	 */
 	{0x30,	"PID",		0x00000000,	0x00000000},
 	{0x3a,	"CSRR0",	0x00000000,	0x00000000},