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

Signed-off-by: Peter Tyser <[email protected]>
jadonk · Apr 13, 2010 · 8d1f268 · 8d1f268
1 parent 819833a
commit 8d1f268
Show file tree

Hide file tree

Showing 442 changed files with 392 additions and 387 deletions.
diff --git 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
@@ -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 → arch/ppc/cpu/74xx_7xx/Makefile b/cpu/74xx_7xx/Makefile → arch/ppc/cpu/74xx_7xx/Makefile
diff --git a/cpu/74xx_7xx/cache.S → arch/ppc/cpu/74xx_7xx/cache.S b/cpu/74xx_7xx/cache.S → arch/ppc/cpu/74xx_7xx/cache.S
diff --git a/cpu/74xx_7xx/config.mk → arch/ppc/cpu/74xx_7xx/config.mk b/cpu/74xx_7xx/config.mk → arch/ppc/cpu/74xx_7xx/config.mk
diff --git a/cpu/74xx_7xx/cpu.c → arch/ppc/cpu/74xx_7xx/cpu.c b/cpu/74xx_7xx/cpu.c → arch/ppc/cpu/74xx_7xx/cpu.c
diff --git a/cpu/74xx_7xx/cpu_init.c → arch/ppc/cpu/74xx_7xx/cpu_init.c b/cpu/74xx_7xx/cpu_init.c → arch/ppc/cpu/74xx_7xx/cpu_init.c
diff --git a/cpu/74xx_7xx/interrupts.c → arch/ppc/cpu/74xx_7xx/interrupts.c b/cpu/74xx_7xx/interrupts.c → arch/ppc/cpu/74xx_7xx/interrupts.c
diff --git a/cpu/74xx_7xx/io.S → arch/ppc/cpu/74xx_7xx/io.S b/cpu/74xx_7xx/io.S → arch/ppc/cpu/74xx_7xx/io.S
diff --git a/cpu/74xx_7xx/kgdb.S → arch/ppc/cpu/74xx_7xx/kgdb.S b/cpu/74xx_7xx/kgdb.S → arch/ppc/cpu/74xx_7xx/kgdb.S
diff --git a/cpu/74xx_7xx/speed.c → arch/ppc/cpu/74xx_7xx/speed.c b/cpu/74xx_7xx/speed.c → arch/ppc/cpu/74xx_7xx/speed.c
diff --git a/cpu/74xx_7xx/start.S → arch/ppc/cpu/74xx_7xx/start.S b/cpu/74xx_7xx/start.S → arch/ppc/cpu/74xx_7xx/start.S
diff --git a/cpu/74xx_7xx/traps.c → arch/ppc/cpu/74xx_7xx/traps.c b/cpu/74xx_7xx/traps.c → arch/ppc/cpu/74xx_7xx/traps.c
diff --git a/cpu/mpc512x/Makefile → arch/ppc/cpu/mpc512x/Makefile b/cpu/mpc512x/Makefile → 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 → arch/ppc/cpu/mpc512x/asm-offsets.h b/cpu/mpc512x/asm-offsets.h → 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 → arch/ppc/cpu/mpc512x/config.mk b/cpu/mpc512x/config.mk → 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 → arch/ppc/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c → arch/ppc/cpu/mpc512x/cpu.c
diff --git a/cpu/mpc512x/cpu_init.c → arch/ppc/cpu/mpc512x/cpu_init.c b/cpu/mpc512x/cpu_init.c → arch/ppc/cpu/mpc512x/cpu_init.c
diff --git a/cpu/mpc512x/diu.c → arch/ppc/cpu/mpc512x/diu.c b/cpu/mpc512x/diu.c → 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 → arch/ppc/cpu/mpc512x/fixed_sdram.c b/cpu/mpc512x/fixed_sdram.c → arch/ppc/cpu/mpc512x/fixed_sdram.c
diff --git a/cpu/mpc512x/i2c.c → arch/ppc/cpu/mpc512x/i2c.c b/cpu/mpc512x/i2c.c → arch/ppc/cpu/mpc512x/i2c.c
diff --git a/cpu/mpc512x/ide.c → arch/ppc/cpu/mpc512x/ide.c b/cpu/mpc512x/ide.c → arch/ppc/cpu/mpc512x/ide.c
diff --git a/cpu/mpc512x/iim.c → arch/ppc/cpu/mpc512x/iim.c b/cpu/mpc512x/iim.c → arch/ppc/cpu/mpc512x/iim.c
diff --git a/cpu/mpc512x/interrupts.c → arch/ppc/cpu/mpc512x/interrupts.c b/cpu/mpc512x/interrupts.c → arch/ppc/cpu/mpc512x/interrupts.c
diff --git a/cpu/mpc512x/iopin.c → arch/ppc/cpu/mpc512x/iopin.c b/cpu/mpc512x/iopin.c → arch/ppc/cpu/mpc512x/iopin.c
diff --git a/cpu/mpc512x/pci.c → arch/ppc/cpu/mpc512x/pci.c b/cpu/mpc512x/pci.c → arch/ppc/cpu/mpc512x/pci.c
diff --git a/cpu/mpc512x/serial.c → arch/ppc/cpu/mpc512x/serial.c b/cpu/mpc512x/serial.c → arch/ppc/cpu/mpc512x/serial.c
diff --git a/cpu/mpc512x/speed.c → arch/ppc/cpu/mpc512x/speed.c b/cpu/mpc512x/speed.c → arch/ppc/cpu/mpc512x/speed.c
diff --git a/cpu/mpc512x/start.S → arch/ppc/cpu/mpc512x/start.S b/cpu/mpc512x/start.S → arch/ppc/cpu/mpc512x/start.S
diff --git a/cpu/mpc512x/traps.c → arch/ppc/cpu/mpc512x/traps.c b/cpu/mpc512x/traps.c → arch/ppc/cpu/mpc512x/traps.c
diff --git a/cpu/mpc512x/u-boot.lds → arch/ppc/cpu/mpc512x/u-boot.lds b/cpu/mpc512x/u-boot.lds → 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 → arch/ppc/cpu/mpc5xx/Makefile b/cpu/mpc5xx/Makefile → 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 → arch/ppc/cpu/mpc5xx/config.mk b/cpu/mpc5xx/config.mk → 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 → arch/ppc/cpu/mpc5xx/cpu.c b/cpu/mpc5xx/cpu.c → arch/ppc/cpu/mpc5xx/cpu.c
diff --git a/cpu/mpc5xx/cpu_init.c → arch/ppc/cpu/mpc5xx/cpu_init.c b/cpu/mpc5xx/cpu_init.c → arch/ppc/cpu/mpc5xx/cpu_init.c
diff --git a/cpu/mpc5xx/interrupts.c → arch/ppc/cpu/mpc5xx/interrupts.c b/cpu/mpc5xx/interrupts.c → arch/ppc/cpu/mpc5xx/interrupts.c
diff --git a/cpu/mpc5xx/serial.c → arch/ppc/cpu/mpc5xx/serial.c b/cpu/mpc5xx/serial.c → arch/ppc/cpu/mpc5xx/serial.c
diff --git a/cpu/mpc5xx/speed.c → arch/ppc/cpu/mpc5xx/speed.c b/cpu/mpc5xx/speed.c → arch/ppc/cpu/mpc5xx/speed.c
diff --git a/cpu/mpc5xx/spi.c → arch/ppc/cpu/mpc5xx/spi.c b/cpu/mpc5xx/spi.c → arch/ppc/cpu/mpc5xx/spi.c
diff --git a/cpu/mpc5xx/start.S → arch/ppc/cpu/mpc5xx/start.S b/cpu/mpc5xx/start.S → arch/ppc/cpu/mpc5xx/start.S
diff --git a/cpu/mpc5xx/traps.c → arch/ppc/cpu/mpc5xx/traps.c b/cpu/mpc5xx/traps.c → arch/ppc/cpu/mpc5xx/traps.c
diff --git a/cpu/mpc5xx/u-boot.lds → arch/ppc/cpu/mpc5xx/u-boot.lds b/cpu/mpc5xx/u-boot.lds → 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 → arch/ppc/cpu/mpc5xxx/Makefile b/cpu/mpc5xxx/Makefile → arch/ppc/cpu/mpc5xxx/Makefile
diff --git a/cpu/mpc5xxx/config.mk → arch/ppc/cpu/mpc5xxx/config.mk b/cpu/mpc5xxx/config.mk → 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 → arch/ppc/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c → arch/ppc/cpu/mpc5xxx/cpu.c
diff --git a/cpu/mpc5xxx/cpu_init.c → arch/ppc/cpu/mpc5xxx/cpu_init.c b/cpu/mpc5xxx/cpu_init.c → arch/ppc/cpu/mpc5xxx/cpu_init.c
diff --git a/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S → .../mpc5xxx/firmware_sc_task_bestcomm.impl.S b/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S → .../mpc5xxx/firmware_sc_task_bestcomm.impl.S
diff --git a/cpu/mpc5xxx/i2c.c → arch/ppc/cpu/mpc5xxx/i2c.c b/cpu/mpc5xxx/i2c.c → arch/ppc/cpu/mpc5xxx/i2c.c
diff --git a/cpu/mpc5xxx/ide.c → arch/ppc/cpu/mpc5xxx/ide.c b/cpu/mpc5xxx/ide.c → arch/ppc/cpu/mpc5xxx/ide.c
diff --git a/cpu/mpc5xxx/interrupts.c → arch/ppc/cpu/mpc5xxx/interrupts.c b/cpu/mpc5xxx/interrupts.c → arch/ppc/cpu/mpc5xxx/interrupts.c
diff --git a/cpu/mpc5xxx/io.S → arch/ppc/cpu/mpc5xxx/io.S b/cpu/mpc5xxx/io.S → arch/ppc/cpu/mpc5xxx/io.S
diff --git a/cpu/mpc5xxx/loadtask.c → arch/ppc/cpu/mpc5xxx/loadtask.c b/cpu/mpc5xxx/loadtask.c → arch/ppc/cpu/mpc5xxx/loadtask.c
diff --git a/cpu/mpc5xxx/pci_mpc5200.c → arch/ppc/cpu/mpc5xxx/pci_mpc5200.c b/cpu/mpc5xxx/pci_mpc5200.c → arch/ppc/cpu/mpc5xxx/pci_mpc5200.c
diff --git a/cpu/mpc5xxx/serial.c → arch/ppc/cpu/mpc5xxx/serial.c b/cpu/mpc5xxx/serial.c → arch/ppc/cpu/mpc5xxx/serial.c
diff --git a/cpu/mpc5xxx/speed.c → arch/ppc/cpu/mpc5xxx/speed.c b/cpu/mpc5xxx/speed.c → arch/ppc/cpu/mpc5xxx/speed.c
diff --git a/cpu/mpc5xxx/start.S → arch/ppc/cpu/mpc5xxx/start.S b/cpu/mpc5xxx/start.S → arch/ppc/cpu/mpc5xxx/start.S
diff --git a/cpu/mpc5xxx/traps.c → arch/ppc/cpu/mpc5xxx/traps.c b/cpu/mpc5xxx/traps.c → arch/ppc/cpu/mpc5xxx/traps.c
diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds → arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds → 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 → arch/ppc/cpu/mpc5xxx/u-boot.lds b/cpu/mpc5xxx/u-boot.lds → 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 → arch/ppc/cpu/mpc5xxx/usb.c b/cpu/mpc5xxx/usb.c → arch/ppc/cpu/mpc5xxx/usb.c
diff --git a/cpu/mpc5xxx/usb_ohci.c → arch/ppc/cpu/mpc5xxx/usb_ohci.c b/cpu/mpc5xxx/usb_ohci.c → arch/ppc/cpu/mpc5xxx/usb_ohci.c
diff --git a/cpu/mpc5xxx/usb_ohci.h → arch/ppc/cpu/mpc5xxx/usb_ohci.h b/cpu/mpc5xxx/usb_ohci.h → arch/ppc/cpu/mpc5xxx/usb_ohci.h
diff --git a/cpu/mpc8220/Makefile → arch/ppc/cpu/mpc8220/Makefile b/cpu/mpc8220/Makefile → arch/ppc/cpu/mpc8220/Makefile
diff --git a/cpu/mpc8220/config.mk → arch/ppc/cpu/mpc8220/config.mk b/cpu/mpc8220/config.mk → 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 → arch/ppc/cpu/mpc8220/cpu.c b/cpu/mpc8220/cpu.c → arch/ppc/cpu/mpc8220/cpu.c
diff --git a/cpu/mpc8220/cpu_init.c → arch/ppc/cpu/mpc8220/cpu_init.c b/cpu/mpc8220/cpu_init.c → arch/ppc/cpu/mpc8220/cpu_init.c
diff --git a/cpu/mpc8220/dma.h → arch/ppc/cpu/mpc8220/dma.h b/cpu/mpc8220/dma.h → arch/ppc/cpu/mpc8220/dma.h
diff --git a/cpu/mpc8220/dramSetup.c → arch/ppc/cpu/mpc8220/dramSetup.c b/cpu/mpc8220/dramSetup.c → arch/ppc/cpu/mpc8220/dramSetup.c
diff --git a/cpu/mpc8220/dramSetup.h → arch/ppc/cpu/mpc8220/dramSetup.h b/cpu/mpc8220/dramSetup.h → arch/ppc/cpu/mpc8220/dramSetup.h
diff --git a/cpu/mpc8220/fec.c → arch/ppc/cpu/mpc8220/fec.c b/cpu/mpc8220/fec.c → arch/ppc/cpu/mpc8220/fec.c
diff --git a/cpu/mpc8220/fec.h → arch/ppc/cpu/mpc8220/fec.h b/cpu/mpc8220/fec.h → arch/ppc/cpu/mpc8220/fec.h
diff --git a/cpu/mpc8220/fec_dma_tasks.S → arch/ppc/cpu/mpc8220/fec_dma_tasks.S b/cpu/mpc8220/fec_dma_tasks.S → arch/ppc/cpu/mpc8220/fec_dma_tasks.S
diff --git a/cpu/mpc8220/i2c.c → arch/ppc/cpu/mpc8220/i2c.c b/cpu/mpc8220/i2c.c → arch/ppc/cpu/mpc8220/i2c.c
diff --git a/cpu/mpc8220/i2cCore.c → arch/ppc/cpu/mpc8220/i2cCore.c b/cpu/mpc8220/i2cCore.c → arch/ppc/cpu/mpc8220/i2cCore.c
diff --git a/cpu/mpc8220/i2cCore.h → arch/ppc/cpu/mpc8220/i2cCore.h b/cpu/mpc8220/i2cCore.h → arch/ppc/cpu/mpc8220/i2cCore.h
diff --git a/cpu/mpc8220/interrupts.c → arch/ppc/cpu/mpc8220/interrupts.c b/cpu/mpc8220/interrupts.c → arch/ppc/cpu/mpc8220/interrupts.c
diff --git a/cpu/mpc8220/io.S → arch/ppc/cpu/mpc8220/io.S b/cpu/mpc8220/io.S → arch/ppc/cpu/mpc8220/io.S
diff --git a/cpu/mpc8220/loadtask.c → arch/ppc/cpu/mpc8220/loadtask.c b/cpu/mpc8220/loadtask.c → arch/ppc/cpu/mpc8220/loadtask.c
diff --git a/cpu/mpc8220/pci.c → arch/ppc/cpu/mpc8220/pci.c b/cpu/mpc8220/pci.c → arch/ppc/cpu/mpc8220/pci.c
diff --git a/cpu/mpc8220/speed.c → arch/ppc/cpu/mpc8220/speed.c b/cpu/mpc8220/speed.c → arch/ppc/cpu/mpc8220/speed.c
diff --git a/cpu/mpc8220/start.S → arch/ppc/cpu/mpc8220/start.S b/cpu/mpc8220/start.S → arch/ppc/cpu/mpc8220/start.S
diff --git a/cpu/mpc8220/traps.c → arch/ppc/cpu/mpc8220/traps.c b/cpu/mpc8220/traps.c → arch/ppc/cpu/mpc8220/traps.c
diff --git a/cpu/mpc8220/u-boot.lds → arch/ppc/cpu/mpc8220/u-boot.lds b/cpu/mpc8220/u-boot.lds → 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 → arch/ppc/cpu/mpc8220/uart.c b/cpu/mpc8220/uart.c → arch/ppc/cpu/mpc8220/uart.c
diff --git a/cpu/mpc824x/.gitignore → arch/ppc/cpu/mpc824x/.gitignore b/cpu/mpc824x/.gitignore → arch/ppc/cpu/mpc824x/.gitignore
diff --git a/cpu/mpc824x/Makefile → arch/ppc/cpu/mpc824x/Makefile b/cpu/mpc824x/Makefile → arch/ppc/cpu/mpc824x/Makefile
diff --git a/cpu/mpc824x/config.mk → arch/ppc/cpu/mpc824x/config.mk b/cpu/mpc824x/config.mk → 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 → arch/ppc/cpu/mpc824x/cpu.c b/cpu/mpc824x/cpu.c → arch/ppc/cpu/mpc824x/cpu.c
diff --git a/cpu/mpc824x/cpu_init.c → arch/ppc/cpu/mpc824x/cpu_init.c b/cpu/mpc824x/cpu_init.c → arch/ppc/cpu/mpc824x/cpu_init.c
diff --git a/cpu/mpc824x/drivers/epic.h → arch/ppc/cpu/mpc824x/drivers/epic.h b/cpu/mpc824x/drivers/epic.h → arch/ppc/cpu/mpc824x/drivers/epic.h
diff --git a/cpu/mpc824x/drivers/epic/README → arch/ppc/cpu/mpc824x/drivers/epic/README b/cpu/mpc824x/drivers/epic/README → arch/ppc/cpu/mpc824x/drivers/epic/README
diff --git a/cpu/mpc824x/drivers/epic/epic.h → arch/ppc/cpu/mpc824x/drivers/epic/epic.h b/cpu/mpc824x/drivers/epic/epic.h → arch/ppc/cpu/mpc824x/drivers/epic/epic.h
diff --git a/cpu/mpc824x/drivers/epic/epic1.c → arch/ppc/cpu/mpc824x/drivers/epic/epic1.c b/cpu/mpc824x/drivers/epic/epic1.c → arch/ppc/cpu/mpc824x/drivers/epic/epic1.c
diff --git a/cpu/mpc824x/drivers/epic/epic2.S → arch/ppc/cpu/mpc824x/drivers/epic/epic2.S b/cpu/mpc824x/drivers/epic/epic2.S → arch/ppc/cpu/mpc824x/drivers/epic/epic2.S
diff --git a/cpu/mpc824x/drivers/epic/epicutil.S → arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S b/cpu/mpc824x/drivers/epic/epicutil.S → arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S
diff --git a/cpu/mpc824x/drivers/errors.h → arch/ppc/cpu/mpc824x/drivers/errors.h b/cpu/mpc824x/drivers/errors.h → arch/ppc/cpu/mpc824x/drivers/errors.h
diff --git a/cpu/mpc824x/drivers/i2c/i2c.c → arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c b/cpu/mpc824x/drivers/i2c/i2c.c → arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c
diff --git a/cpu/mpc824x/drivers/i2c_export.h → arch/ppc/cpu/mpc824x/drivers/i2c_export.h b/cpu/mpc824x/drivers/i2c_export.h → arch/ppc/cpu/mpc824x/drivers/i2c_export.h
diff --git a/cpu/mpc824x/interrupts.c → arch/ppc/cpu/mpc824x/interrupts.c b/cpu/mpc824x/interrupts.c → arch/ppc/cpu/mpc824x/interrupts.c
diff --git a/cpu/mpc824x/pci.c → arch/ppc/cpu/mpc824x/pci.c b/cpu/mpc824x/pci.c → arch/ppc/cpu/mpc824x/pci.c
diff --git a/cpu/mpc824x/speed.c → arch/ppc/cpu/mpc824x/speed.c b/cpu/mpc824x/speed.c → arch/ppc/cpu/mpc824x/speed.c
diff --git a/cpu/mpc824x/start.S → arch/ppc/cpu/mpc824x/start.S b/cpu/mpc824x/start.S → arch/ppc/cpu/mpc824x/start.S
diff --git a/cpu/mpc824x/traps.c → arch/ppc/cpu/mpc824x/traps.c b/cpu/mpc824x/traps.c → arch/ppc/cpu/mpc824x/traps.c
diff --git a/cpu/mpc824x/u-boot.lds → arch/ppc/cpu/mpc824x/u-boot.lds b/cpu/mpc824x/u-boot.lds → arch/ppc/cpu/mpc824x/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc824x/start.o		(.text)
+    arch/ppc/cpu/mpc824x/start.o		(.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/cpu/mpc8260/Makefile → arch/ppc/cpu/mpc8260/Makefile b/cpu/mpc8260/Makefile → arch/ppc/cpu/mpc8260/Makefile
diff --git a/cpu/mpc8260/bedbug_603e.c → arch/ppc/cpu/mpc8260/bedbug_603e.c b/cpu/mpc8260/bedbug_603e.c → arch/ppc/cpu/mpc8260/bedbug_603e.c
diff --git a/cpu/mpc8260/commproc.c → arch/ppc/cpu/mpc8260/commproc.c b/cpu/mpc8260/commproc.c → arch/ppc/cpu/mpc8260/commproc.c
diff --git a/cpu/mpc8260/config.mk → arch/ppc/cpu/mpc8260/config.mk b/cpu/mpc8260/config.mk → 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 → arch/ppc/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c → arch/ppc/cpu/mpc8260/cpu.c
diff --git a/cpu/mpc8260/cpu_init.c → arch/ppc/cpu/mpc8260/cpu_init.c b/cpu/mpc8260/cpu_init.c → arch/ppc/cpu/mpc8260/cpu_init.c
diff --git a/cpu/mpc8260/ether_fcc.c → arch/ppc/cpu/mpc8260/ether_fcc.c b/cpu/mpc8260/ether_fcc.c → arch/ppc/cpu/mpc8260/ether_fcc.c
diff --git a/cpu/mpc8260/ether_scc.c → arch/ppc/cpu/mpc8260/ether_scc.c b/cpu/mpc8260/ether_scc.c → arch/ppc/cpu/mpc8260/ether_scc.c
diff --git a/cpu/mpc8260/i2c.c → arch/ppc/cpu/mpc8260/i2c.c b/cpu/mpc8260/i2c.c → arch/ppc/cpu/mpc8260/i2c.c
diff --git a/cpu/mpc8260/interrupts.c → arch/ppc/cpu/mpc8260/interrupts.c b/cpu/mpc8260/interrupts.c → arch/ppc/cpu/mpc8260/interrupts.c
diff --git a/cpu/mpc8260/kgdb.S → arch/ppc/cpu/mpc8260/kgdb.S b/cpu/mpc8260/kgdb.S → arch/ppc/cpu/mpc8260/kgdb.S
diff --git a/cpu/mpc8260/pci.c → arch/ppc/cpu/mpc8260/pci.c b/cpu/mpc8260/pci.c → arch/ppc/cpu/mpc8260/pci.c
diff --git a/cpu/mpc8260/serial_scc.c → arch/ppc/cpu/mpc8260/serial_scc.c b/cpu/mpc8260/serial_scc.c → arch/ppc/cpu/mpc8260/serial_scc.c
diff --git a/cpu/mpc8260/serial_smc.c → arch/ppc/cpu/mpc8260/serial_smc.c b/cpu/mpc8260/serial_smc.c → arch/ppc/cpu/mpc8260/serial_smc.c
diff --git a/cpu/mpc8260/speed.c → arch/ppc/cpu/mpc8260/speed.c b/cpu/mpc8260/speed.c → arch/ppc/cpu/mpc8260/speed.c
diff --git a/cpu/mpc8260/speed.h → arch/ppc/cpu/mpc8260/speed.h b/cpu/mpc8260/speed.h → arch/ppc/cpu/mpc8260/speed.h
diff --git a/cpu/mpc8260/spi.c → arch/ppc/cpu/mpc8260/spi.c b/cpu/mpc8260/spi.c → arch/ppc/cpu/mpc8260/spi.c
diff --git a/cpu/mpc8260/start.S → arch/ppc/cpu/mpc8260/start.S b/cpu/mpc8260/start.S → arch/ppc/cpu/mpc8260/start.S
diff --git a/cpu/mpc8260/traps.c → arch/ppc/cpu/mpc8260/traps.c b/cpu/mpc8260/traps.c → arch/ppc/cpu/mpc8260/traps.c
diff --git a/cpu/mpc8260/u-boot.lds → arch/ppc/cpu/mpc8260/u-boot.lds b/cpu/mpc8260/u-boot.lds → arch/ppc/cpu/mpc8260/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)
     . = ALIGN(16);

diff --git a/cpu/mpc83xx/Makefile → arch/ppc/cpu/mpc83xx/Makefile b/cpu/mpc83xx/Makefile → arch/ppc/cpu/mpc83xx/Makefile
diff --git a/cpu/mpc83xx/config.mk → arch/ppc/cpu/mpc83xx/config.mk b/cpu/mpc83xx/config.mk → 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 → arch/ppc/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c → arch/ppc/cpu/mpc83xx/cpu.c
diff --git a/cpu/mpc83xx/cpu_init.c → arch/ppc/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c → arch/ppc/cpu/mpc83xx/cpu_init.c
diff --git a/cpu/mpc83xx/ecc.c → arch/ppc/cpu/mpc83xx/ecc.c b/cpu/mpc83xx/ecc.c → arch/ppc/cpu/mpc83xx/ecc.c
diff --git a/cpu/mpc83xx/fdt.c → arch/ppc/cpu/mpc83xx/fdt.c b/cpu/mpc83xx/fdt.c → arch/ppc/cpu/mpc83xx/fdt.c
diff --git a/cpu/mpc83xx/interrupts.c → arch/ppc/cpu/mpc83xx/interrupts.c b/cpu/mpc83xx/interrupts.c → arch/ppc/cpu/mpc83xx/interrupts.c
diff --git a/cpu/mpc83xx/nand_init.c → arch/ppc/cpu/mpc83xx/nand_init.c b/cpu/mpc83xx/nand_init.c → arch/ppc/cpu/mpc83xx/nand_init.c
diff --git a/cpu/mpc83xx/pci.c → arch/ppc/cpu/mpc83xx/pci.c b/cpu/mpc83xx/pci.c → arch/ppc/cpu/mpc83xx/pci.c
diff --git a/cpu/mpc83xx/pcie.c → arch/ppc/cpu/mpc83xx/pcie.c b/cpu/mpc83xx/pcie.c → arch/ppc/cpu/mpc83xx/pcie.c
diff --git a/cpu/mpc83xx/qe_io.c → arch/ppc/cpu/mpc83xx/qe_io.c b/cpu/mpc83xx/qe_io.c → arch/ppc/cpu/mpc83xx/qe_io.c
diff --git a/cpu/mpc83xx/serdes.c → arch/ppc/cpu/mpc83xx/serdes.c b/cpu/mpc83xx/serdes.c → arch/ppc/cpu/mpc83xx/serdes.c
diff --git a/cpu/mpc83xx/spd_sdram.c → arch/ppc/cpu/mpc83xx/spd_sdram.c b/cpu/mpc83xx/spd_sdram.c → arch/ppc/cpu/mpc83xx/spd_sdram.c
diff --git a/cpu/mpc83xx/speed.c → arch/ppc/cpu/mpc83xx/speed.c b/cpu/mpc83xx/speed.c → arch/ppc/cpu/mpc83xx/speed.c
diff --git a/cpu/mpc83xx/start.S → arch/ppc/cpu/mpc83xx/start.S b/cpu/mpc83xx/start.S → arch/ppc/cpu/mpc83xx/start.S
diff --git a/cpu/mpc83xx/traps.c → arch/ppc/cpu/mpc83xx/traps.c b/cpu/mpc83xx/traps.c → arch/ppc/cpu/mpc83xx/traps.c
diff --git a/cpu/mpc83xx/u-boot.lds → arch/ppc/cpu/mpc83xx/u-boot.lds b/cpu/mpc83xx/u-boot.lds → 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 → arch/ppc/cpu/mpc85xx/Makefile b/cpu/mpc85xx/Makefile → arch/ppc/cpu/mpc85xx/Makefile
diff --git a/cpu/mpc85xx/commproc.c → arch/ppc/cpu/mpc85xx/commproc.c b/cpu/mpc85xx/commproc.c → arch/ppc/cpu/mpc85xx/commproc.c
diff --git a/cpu/mpc85xx/config.mk → arch/ppc/cpu/mpc85xx/config.mk b/cpu/mpc85xx/config.mk → 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 → arch/ppc/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c → arch/ppc/cpu/mpc85xx/cpu.c
diff --git a/cpu/mpc85xx/cpu_init.c → arch/ppc/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c → arch/ppc/cpu/mpc85xx/cpu_init.c
diff --git a/cpu/mpc85xx/cpu_init_early.c → arch/ppc/cpu/mpc85xx/cpu_init_early.c b/cpu/mpc85xx/cpu_init_early.c → arch/ppc/cpu/mpc85xx/cpu_init_early.c
diff --git a/cpu/mpc85xx/cpu_init_nand.c → arch/ppc/cpu/mpc85xx/cpu_init_nand.c b/cpu/mpc85xx/cpu_init_nand.c → arch/ppc/cpu/mpc85xx/cpu_init_nand.c
diff --git a/cpu/mpc85xx/ddr-gen1.c → arch/ppc/cpu/mpc85xx/ddr-gen1.c b/cpu/mpc85xx/ddr-gen1.c → arch/ppc/cpu/mpc85xx/ddr-gen1.c
diff --git a/cpu/mpc85xx/ddr-gen2.c → arch/ppc/cpu/mpc85xx/ddr-gen2.c b/cpu/mpc85xx/ddr-gen2.c → arch/ppc/cpu/mpc85xx/ddr-gen2.c
diff --git a/cpu/mpc85xx/ddr-gen3.c → arch/ppc/cpu/mpc85xx/ddr-gen3.c b/cpu/mpc85xx/ddr-gen3.c → arch/ppc/cpu/mpc85xx/ddr-gen3.c
diff --git a/cpu/mpc85xx/ether_fcc.c → arch/ppc/cpu/mpc85xx/ether_fcc.c b/cpu/mpc85xx/ether_fcc.c → arch/ppc/cpu/mpc85xx/ether_fcc.c
diff --git a/cpu/mpc85xx/fdt.c → arch/ppc/cpu/mpc85xx/fdt.c b/cpu/mpc85xx/fdt.c → arch/ppc/cpu/mpc85xx/fdt.c
diff --git a/cpu/mpc85xx/fixed_ivor.S → arch/ppc/cpu/mpc85xx/fixed_ivor.S b/cpu/mpc85xx/fixed_ivor.S → arch/ppc/cpu/mpc85xx/fixed_ivor.S
diff --git a/cpu/mpc85xx/interrupts.c → arch/ppc/cpu/mpc85xx/interrupts.c b/cpu/mpc85xx/interrupts.c → arch/ppc/cpu/mpc85xx/interrupts.c
diff --git a/cpu/mpc85xx/mp.c → arch/ppc/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c → arch/ppc/cpu/mpc85xx/mp.c
diff --git a/cpu/mpc85xx/mp.h → arch/ppc/cpu/mpc85xx/mp.h b/cpu/mpc85xx/mp.h → arch/ppc/cpu/mpc85xx/mp.h
diff --git a/cpu/mpc85xx/mpc8536_serdes.c → arch/ppc/cpu/mpc85xx/mpc8536_serdes.c b/cpu/mpc85xx/mpc8536_serdes.c → arch/ppc/cpu/mpc85xx/mpc8536_serdes.c
diff --git a/cpu/mpc85xx/pci.c → arch/ppc/cpu/mpc85xx/pci.c b/cpu/mpc85xx/pci.c → arch/ppc/cpu/mpc85xx/pci.c
diff --git a/cpu/mpc85xx/qe_io.c → arch/ppc/cpu/mpc85xx/qe_io.c b/cpu/mpc85xx/qe_io.c → arch/ppc/cpu/mpc85xx/qe_io.c
diff --git a/cpu/mpc85xx/release.S → arch/ppc/cpu/mpc85xx/release.S b/cpu/mpc85xx/release.S → arch/ppc/cpu/mpc85xx/release.S
diff --git a/cpu/mpc85xx/resetvec.S → arch/ppc/cpu/mpc85xx/resetvec.S b/cpu/mpc85xx/resetvec.S → arch/ppc/cpu/mpc85xx/resetvec.S
diff --git a/cpu/mpc85xx/serial_scc.c → arch/ppc/cpu/mpc85xx/serial_scc.c b/cpu/mpc85xx/serial_scc.c → arch/ppc/cpu/mpc85xx/serial_scc.c
diff --git a/cpu/mpc85xx/speed.c → arch/ppc/cpu/mpc85xx/speed.c b/cpu/mpc85xx/speed.c → arch/ppc/cpu/mpc85xx/speed.c
diff --git a/cpu/mpc85xx/start.S → arch/ppc/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S → arch/ppc/cpu/mpc85xx/start.S
diff --git a/cpu/mpc85xx/tlb.c → arch/ppc/cpu/mpc85xx/tlb.c b/cpu/mpc85xx/tlb.c → arch/ppc/cpu/mpc85xx/tlb.c
diff --git a/cpu/mpc85xx/traps.c → arch/ppc/cpu/mpc85xx/traps.c b/cpu/mpc85xx/traps.c → arch/ppc/cpu/mpc85xx/traps.c
diff --git a/cpu/mpc85xx/u-boot-nand.lds → arch/ppc/cpu/mpc85xx/u-boot-nand.lds b/cpu/mpc85xx/u-boot-nand.lds → 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 → arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds b/cpu/mpc85xx/u-boot-nand_spl.lds → arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds
diff --git a/cpu/mpc85xx/u-boot.lds → arch/ppc/cpu/mpc85xx/u-boot.lds b/cpu/mpc85xx/u-boot.lds → 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 → arch/ppc/cpu/mpc86xx/Makefile b/cpu/mpc86xx/Makefile → arch/ppc/cpu/mpc86xx/Makefile
diff --git a/cpu/mpc86xx/cache.S → arch/ppc/cpu/mpc86xx/cache.S b/cpu/mpc86xx/cache.S → arch/ppc/cpu/mpc86xx/cache.S
diff --git a/cpu/mpc86xx/config.mk → arch/ppc/cpu/mpc86xx/config.mk b/cpu/mpc86xx/config.mk → arch/ppc/cpu/mpc86xx/config.mk
diff --git a/cpu/mpc86xx/cpu.c → arch/ppc/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c → arch/ppc/cpu/mpc86xx/cpu.c
diff --git a/cpu/mpc86xx/cpu_init.c → arch/ppc/cpu/mpc86xx/cpu_init.c b/cpu/mpc86xx/cpu_init.c → arch/ppc/cpu/mpc86xx/cpu_init.c
diff --git a/cpu/mpc86xx/ddr-8641.c → arch/ppc/cpu/mpc86xx/ddr-8641.c b/cpu/mpc86xx/ddr-8641.c → arch/ppc/cpu/mpc86xx/ddr-8641.c
diff --git a/cpu/mpc86xx/fdt.c → arch/ppc/cpu/mpc86xx/fdt.c b/cpu/mpc86xx/fdt.c → arch/ppc/cpu/mpc86xx/fdt.c
diff --git a/cpu/mpc86xx/interrupts.c → arch/ppc/cpu/mpc86xx/interrupts.c b/cpu/mpc86xx/interrupts.c → arch/ppc/cpu/mpc86xx/interrupts.c
diff --git a/cpu/mpc86xx/mp.c → arch/ppc/cpu/mpc86xx/mp.c b/cpu/mpc86xx/mp.c → arch/ppc/cpu/mpc86xx/mp.c
diff --git a/cpu/mpc86xx/release.S → arch/ppc/cpu/mpc86xx/release.S b/cpu/mpc86xx/release.S → arch/ppc/cpu/mpc86xx/release.S
diff --git a/cpu/mpc86xx/speed.c → arch/ppc/cpu/mpc86xx/speed.c b/cpu/mpc86xx/speed.c → arch/ppc/cpu/mpc86xx/speed.c
diff --git a/cpu/mpc86xx/start.S → arch/ppc/cpu/mpc86xx/start.S b/cpu/mpc86xx/start.S → arch/ppc/cpu/mpc86xx/start.S
diff --git a/cpu/mpc86xx/traps.c → arch/ppc/cpu/mpc86xx/traps.c b/cpu/mpc86xx/traps.c → arch/ppc/cpu/mpc86xx/traps.c
diff --git a/cpu/mpc8xx/Makefile → arch/ppc/cpu/mpc8xx/Makefile b/cpu/mpc8xx/Makefile → arch/ppc/cpu/mpc8xx/Makefile
diff --git a/cpu/mpc8xx/bedbug_860.c → arch/ppc/cpu/mpc8xx/bedbug_860.c b/cpu/mpc8xx/bedbug_860.c → arch/ppc/cpu/mpc8xx/bedbug_860.c
diff --git a/cpu/mpc8xx/commproc.c → arch/ppc/cpu/mpc8xx/commproc.c b/cpu/mpc8xx/commproc.c → arch/ppc/cpu/mpc8xx/commproc.c
diff --git a/cpu/mpc8xx/config.mk → arch/ppc/cpu/mpc8xx/config.mk b/cpu/mpc8xx/config.mk → arch/ppc/cpu/mpc8xx/config.mk
diff --git a/cpu/mpc8xx/cpu.c → arch/ppc/cpu/mpc8xx/cpu.c b/cpu/mpc8xx/cpu.c → arch/ppc/cpu/mpc8xx/cpu.c
diff --git a/cpu/mpc8xx/cpu_init.c → arch/ppc/cpu/mpc8xx/cpu_init.c b/cpu/mpc8xx/cpu_init.c → arch/ppc/cpu/mpc8xx/cpu_init.c
diff --git a/cpu/mpc8xx/fdt.c → arch/ppc/cpu/mpc8xx/fdt.c b/cpu/mpc8xx/fdt.c → arch/ppc/cpu/mpc8xx/fdt.c
diff --git a/cpu/mpc8xx/fec.c → arch/ppc/cpu/mpc8xx/fec.c b/cpu/mpc8xx/fec.c → arch/ppc/cpu/mpc8xx/fec.c
diff --git a/cpu/mpc8xx/fec.h → arch/ppc/cpu/mpc8xx/fec.h b/cpu/mpc8xx/fec.h → arch/ppc/cpu/mpc8xx/fec.h
diff --git a/cpu/mpc8xx/i2c.c → arch/ppc/cpu/mpc8xx/i2c.c b/cpu/mpc8xx/i2c.c → arch/ppc/cpu/mpc8xx/i2c.c
diff --git a/cpu/mpc8xx/interrupts.c → arch/ppc/cpu/mpc8xx/interrupts.c b/cpu/mpc8xx/interrupts.c → arch/ppc/cpu/mpc8xx/interrupts.c
diff --git a/cpu/mpc8xx/kgdb.S → arch/ppc/cpu/mpc8xx/kgdb.S b/cpu/mpc8xx/kgdb.S → arch/ppc/cpu/mpc8xx/kgdb.S
diff --git a/cpu/mpc8xx/lcd.c → arch/ppc/cpu/mpc8xx/lcd.c b/cpu/mpc8xx/lcd.c → arch/ppc/cpu/mpc8xx/lcd.c
diff --git a/cpu/mpc8xx/plprcr_write.S → arch/ppc/cpu/mpc8xx/plprcr_write.S b/cpu/mpc8xx/plprcr_write.S → arch/ppc/cpu/mpc8xx/plprcr_write.S
diff --git a/cpu/mpc8xx/scc.c → arch/ppc/cpu/mpc8xx/scc.c b/cpu/mpc8xx/scc.c → arch/ppc/cpu/mpc8xx/scc.c
diff --git a/cpu/mpc8xx/serial.c → arch/ppc/cpu/mpc8xx/serial.c b/cpu/mpc8xx/serial.c → arch/ppc/cpu/mpc8xx/serial.c
diff --git a/cpu/mpc8xx/speed.c → arch/ppc/cpu/mpc8xx/speed.c b/cpu/mpc8xx/speed.c → arch/ppc/cpu/mpc8xx/speed.c
diff --git a/cpu/mpc8xx/spi.c → arch/ppc/cpu/mpc8xx/spi.c b/cpu/mpc8xx/spi.c → arch/ppc/cpu/mpc8xx/spi.c
diff --git a/cpu/mpc8xx/start.S → arch/ppc/cpu/mpc8xx/start.S b/cpu/mpc8xx/start.S → arch/ppc/cpu/mpc8xx/start.S
diff --git a/cpu/mpc8xx/traps.c → arch/ppc/cpu/mpc8xx/traps.c b/cpu/mpc8xx/traps.c → arch/ppc/cpu/mpc8xx/traps.c
diff --git a/cpu/mpc8xx/upatch.c → arch/ppc/cpu/mpc8xx/upatch.c b/cpu/mpc8xx/upatch.c → arch/ppc/cpu/mpc8xx/upatch.c
diff --git a/cpu/mpc8xx/video.c → arch/ppc/cpu/mpc8xx/video.c b/cpu/mpc8xx/video.c → arch/ppc/cpu/mpc8xx/video.c
diff --git a/cpu/mpc8xx/wlkbd.c → arch/ppc/cpu/mpc8xx/wlkbd.c b/cpu/mpc8xx/wlkbd.c → arch/ppc/cpu/mpc8xx/wlkbd.c
diff --git a/cpu/mpc8xxx/Makefile → arch/ppc/cpu/mpc8xxx/Makefile b/cpu/mpc8xxx/Makefile → arch/ppc/cpu/mpc8xxx/Makefile
diff --git a/cpu/mpc8xxx/cpu.c → arch/ppc/cpu/mpc8xxx/cpu.c b/cpu/mpc8xxx/cpu.c → 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 → arch/ppc/cpu/mpc8xxx/ddr/Makefile b/cpu/mpc8xxx/ddr/Makefile → arch/ppc/cpu/mpc8xxx/ddr/Makefile
diff --git a/cpu/mpc8xxx/ddr/common_timing_params.h → ...pc/cpu/mpc8xxx/ddr/common_timing_params.h b/cpu/mpc8xxx/ddr/common_timing_params.h → ...pc/cpu/mpc8xxx/ddr/common_timing_params.h
diff --git a/cpu/mpc8xxx/ddr/ctrl_regs.c → arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c b/cpu/mpc8xxx/ddr/ctrl_regs.c → arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c
diff --git a/cpu/mpc8xxx/ddr/ddr.h → arch/ppc/cpu/mpc8xxx/ddr/ddr.h b/cpu/mpc8xxx/ddr/ddr.h → arch/ppc/cpu/mpc8xxx/ddr/ddr.h
diff --git a/cpu/mpc8xxx/ddr/ddr1_dimm_params.c → arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c b/cpu/mpc8xxx/ddr/ddr1_dimm_params.c → arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
diff --git a/cpu/mpc8xxx/ddr/ddr2_dimm_params.c → arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c b/cpu/mpc8xxx/ddr/ddr2_dimm_params.c → arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
diff --git a/cpu/mpc8xxx/ddr/ddr3_dimm_params.c → arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c b/cpu/mpc8xxx/ddr/ddr3_dimm_params.c → arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
diff --git a/cpu/mpc8xxx/ddr/lc_common_dimm_params.c → ...c/cpu/mpc8xxx/ddr/lc_common_dimm_params.c b/cpu/mpc8xxx/ddr/lc_common_dimm_params.c → ...c/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
diff --git a/cpu/mpc8xxx/ddr/main.c → arch/ppc/cpu/mpc8xxx/ddr/main.c b/cpu/mpc8xxx/ddr/main.c → arch/ppc/cpu/mpc8xxx/ddr/main.c
diff --git a/cpu/mpc8xxx/ddr/options.c → arch/ppc/cpu/mpc8xxx/ddr/options.c b/cpu/mpc8xxx/ddr/options.c → arch/ppc/cpu/mpc8xxx/ddr/options.c
diff --git a/cpu/mpc8xxx/ddr/util.c → arch/ppc/cpu/mpc8xxx/ddr/util.c b/cpu/mpc8xxx/ddr/util.c → arch/ppc/cpu/mpc8xxx/ddr/util.c
diff --git a/cpu/mpc8xxx/fdt.c → arch/ppc/cpu/mpc8xxx/fdt.c b/cpu/mpc8xxx/fdt.c → 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 → arch/ppc/cpu/mpc8xxx/pci_cfg.c b/cpu/mpc8xxx/pci_cfg.c → arch/ppc/cpu/mpc8xxx/pci_cfg.c
diff --git a/cpu/ppc4xx/40x_spd_sdram.c → arch/ppc/cpu/ppc4xx/40x_spd_sdram.c b/cpu/ppc4xx/40x_spd_sdram.c → 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 → arch/ppc/cpu/ppc4xx/44x_spd_ddr.c b/cpu/ppc4xx/44x_spd_ddr.c → 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 → arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c b/cpu/ppc4xx/44x_spd_ddr2.c → 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 → arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c → 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 → arch/ppc/cpu/ppc4xx/4xx_pci.c b/cpu/ppc4xx/4xx_pci.c → arch/ppc/cpu/ppc4xx/4xx_pci.c
diff --git a/cpu/ppc4xx/4xx_pcie.c → arch/ppc/cpu/ppc4xx/4xx_pcie.c b/cpu/ppc4xx/4xx_pcie.c → arch/ppc/cpu/ppc4xx/4xx_pcie.c
diff --git a/cpu/ppc4xx/4xx_uart.c → arch/ppc/cpu/ppc4xx/4xx_uart.c b/cpu/ppc4xx/4xx_uart.c → arch/ppc/cpu/ppc4xx/4xx_uart.c
diff --git a/cpu/ppc4xx/Makefile → arch/ppc/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile → arch/ppc/cpu/ppc4xx/Makefile
diff --git a/cpu/ppc4xx/bedbug_405.c → arch/ppc/cpu/ppc4xx/bedbug_405.c b/cpu/ppc4xx/bedbug_405.c → arch/ppc/cpu/ppc4xx/bedbug_405.c
diff --git a/cpu/ppc4xx/cache.S → arch/ppc/cpu/ppc4xx/cache.S b/cpu/ppc4xx/cache.S → arch/ppc/cpu/ppc4xx/cache.S
diff --git a/cpu/ppc4xx/cmd_chip_config.c → arch/ppc/cpu/ppc4xx/cmd_chip_config.c b/cpu/ppc4xx/cmd_chip_config.c → arch/ppc/cpu/ppc4xx/cmd_chip_config.c
diff --git a/cpu/ppc4xx/commproc.c → arch/ppc/cpu/ppc4xx/commproc.c b/cpu/ppc4xx/commproc.c → arch/ppc/cpu/ppc4xx/commproc.c
diff --git a/cpu/ppc4xx/config.mk → arch/ppc/cpu/ppc4xx/config.mk b/cpu/ppc4xx/config.mk → 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 → arch/ppc/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c → arch/ppc/cpu/ppc4xx/cpu.c
diff --git a/cpu/ppc4xx/cpu_init.c → arch/ppc/cpu/ppc4xx/cpu_init.c b/cpu/ppc4xx/cpu_init.c → arch/ppc/cpu/ppc4xx/cpu_init.c
diff --git a/cpu/ppc4xx/dcr.S → arch/ppc/cpu/ppc4xx/dcr.S b/cpu/ppc4xx/dcr.S → arch/ppc/cpu/ppc4xx/dcr.S
diff --git a/cpu/ppc4xx/denali_data_eye.c → arch/ppc/cpu/ppc4xx/denali_data_eye.c b/cpu/ppc4xx/denali_data_eye.c → 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 <[email protected]>.
  *
  * (C) Copyright 2006

diff --git a/cpu/ppc4xx/denali_spd_ddr2.c → arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c b/cpu/ppc4xx/denali_spd_ddr2.c → 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, [email protected].
  *
- * 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, [email protected].

diff --git a/cpu/ppc4xx/ecc.c → arch/ppc/cpu/ppc4xx/ecc.c b/cpu/ppc4xx/ecc.c → arch/ppc/cpu/ppc4xx/ecc.c
diff --git a/cpu/ppc4xx/ecc.h → arch/ppc/cpu/ppc4xx/ecc.h b/cpu/ppc4xx/ecc.h → arch/ppc/cpu/ppc4xx/ecc.h
diff --git a/cpu/ppc4xx/fdt.c → arch/ppc/cpu/ppc4xx/fdt.c b/cpu/ppc4xx/fdt.c → arch/ppc/cpu/ppc4xx/fdt.c
diff --git a/cpu/ppc4xx/gpio.c → arch/ppc/cpu/ppc4xx/gpio.c b/cpu/ppc4xx/gpio.c → arch/ppc/cpu/ppc4xx/gpio.c
diff --git a/cpu/ppc4xx/interrupts.c → arch/ppc/cpu/ppc4xx/interrupts.c b/cpu/ppc4xx/interrupts.c → arch/ppc/cpu/ppc4xx/interrupts.c
diff --git a/cpu/ppc4xx/iop480_uart.c → arch/ppc/cpu/ppc4xx/iop480_uart.c b/cpu/ppc4xx/iop480_uart.c → arch/ppc/cpu/ppc4xx/iop480_uart.c
diff --git a/cpu/ppc4xx/kgdb.S → arch/ppc/cpu/ppc4xx/kgdb.S b/cpu/ppc4xx/kgdb.S → arch/ppc/cpu/ppc4xx/kgdb.S
diff --git a/cpu/ppc4xx/miiphy.c → arch/ppc/cpu/ppc4xx/miiphy.c b/cpu/ppc4xx/miiphy.c → arch/ppc/cpu/ppc4xx/miiphy.c
diff --git a/cpu/ppc4xx/reginfo.c → arch/ppc/cpu/ppc4xx/reginfo.c b/cpu/ppc4xx/reginfo.c → arch/ppc/cpu/ppc4xx/reginfo.c
diff --git a/cpu/ppc4xx/resetvec.S → arch/ppc/cpu/ppc4xx/resetvec.S b/cpu/ppc4xx/resetvec.S → arch/ppc/cpu/ppc4xx/resetvec.S
diff --git a/cpu/ppc4xx/sdram.c → arch/ppc/cpu/ppc4xx/sdram.c b/cpu/ppc4xx/sdram.c → arch/ppc/cpu/ppc4xx/sdram.c
diff --git a/cpu/ppc4xx/sdram.h → arch/ppc/cpu/ppc4xx/sdram.h b/cpu/ppc4xx/sdram.h → arch/ppc/cpu/ppc4xx/sdram.h
diff --git a/cpu/ppc4xx/speed.c → arch/ppc/cpu/ppc4xx/speed.c b/cpu/ppc4xx/speed.c → arch/ppc/cpu/ppc4xx/speed.c
diff --git a/cpu/ppc4xx/start.S → arch/ppc/cpu/ppc4xx/start.S b/cpu/ppc4xx/start.S → arch/ppc/cpu/ppc4xx/start.S
diff --git a/cpu/ppc4xx/tlb.c → arch/ppc/cpu/ppc4xx/tlb.c b/cpu/ppc4xx/tlb.c → arch/ppc/cpu/ppc4xx/tlb.c
diff --git a/cpu/ppc4xx/traps.c → arch/ppc/cpu/ppc4xx/traps.c b/cpu/ppc4xx/traps.c → arch/ppc/cpu/ppc4xx/traps.c
diff --git a/cpu/ppc4xx/u-boot.lds → arch/ppc/cpu/ppc4xx/u-boot.lds b/cpu/ppc4xx/u-boot.lds → 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 → arch/ppc/cpu/ppc4xx/uic.c b/cpu/ppc4xx/uic.c → arch/ppc/cpu/ppc4xx/uic.c
diff --git a/cpu/ppc4xx/usb.c → arch/ppc/cpu/ppc4xx/usb.c b/cpu/ppc4xx/usb.c → arch/ppc/cpu/ppc4xx/usb.c
diff --git a/cpu/ppc4xx/usb_ohci.c → arch/ppc/cpu/ppc4xx/usb_ohci.c b/cpu/ppc4xx/usb_ohci.c → arch/ppc/cpu/ppc4xx/usb_ohci.c
diff --git a/cpu/ppc4xx/usb_ohci.h → arch/ppc/cpu/ppc4xx/usb_ohci.h b/cpu/ppc4xx/usb_ohci.h → arch/ppc/cpu/ppc4xx/usb_ohci.h
diff --git a/cpu/ppc4xx/usbdev.c → arch/ppc/cpu/ppc4xx/usbdev.c b/cpu/ppc4xx/usbdev.c → arch/ppc/cpu/ppc4xx/usbdev.c
diff --git a/cpu/ppc4xx/usbdev.h → arch/ppc/cpu/ppc4xx/usbdev.h b/cpu/ppc4xx/usbdev.h → arch/ppc/cpu/ppc4xx/usbdev.h
diff --git a/cpu/ppc4xx/xilinx_irq.c → arch/ppc/cpu/ppc4xx/xilinx_irq.c b/cpu/ppc4xx/xilinx_irq.c → arch/ppc/cpu/ppc4xx/xilinx_irq.c
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)