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

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

150 files changed, 247 insertions, 247 deletions

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: */