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

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

diff --git a/Makefile b/Makefile
index fdd781a86577a751433fa1bd3fd1ef83e1111e1d..ddfe73c063fa76e3655da0eef46ae8183a407d7f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -227,12 +227,12 @@ LIBS += drivers/qe/qe.a
 endif
 ifeq ($(CPU),mpc85xx)
 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)
 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
 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)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
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
        @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
        @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f

diff --git a/README b/README
index e1d58bdf06cdea9bf054976c12f4cc5a0eedad24..d5ccdc552209194fda07bd7cd38eaa4c842fa0a4 100644 (file)
--- 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).
 
                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.
                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)
   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
 
 - CONFIG_PCI_DISABLE_PCIE:
                Disable PCI-Express on systems where it is supported but not

diff --git a/cpu/74xx_7xx/Makefile b/arch/ppc/cpu/74xx_7xx/Makefile
similarity index 100%
rename from cpu/74xx_7xx/Makefile
rename to arch/ppc/cpu/74xx_7xx/Makefile

diff --git a/cpu/74xx_7xx/cache.S b/arch/ppc/cpu/74xx_7xx/cache.S
similarity index 100%
rename from cpu/74xx_7xx/cache.S
rename to arch/ppc/cpu/74xx_7xx/cache.S

diff --git a/cpu/74xx_7xx/config.mk b/arch/ppc/cpu/74xx_7xx/config.mk
similarity index 100%
rename from cpu/74xx_7xx/config.mk
rename to arch/ppc/cpu/74xx_7xx/config.mk

diff --git a/cpu/74xx_7xx/cpu.c b/arch/ppc/cpu/74xx_7xx/cpu.c
similarity index 100%
rename from cpu/74xx_7xx/cpu.c
rename to arch/ppc/cpu/74xx_7xx/cpu.c

diff --git a/cpu/74xx_7xx/cpu_init.c b/arch/ppc/cpu/74xx_7xx/cpu_init.c
similarity index 100%
rename from cpu/74xx_7xx/cpu_init.c
rename to arch/ppc/cpu/74xx_7xx/cpu_init.c

diff --git a/cpu/74xx_7xx/interrupts.c b/arch/ppc/cpu/74xx_7xx/interrupts.c
similarity index 100%
rename from cpu/74xx_7xx/interrupts.c
rename to arch/ppc/cpu/74xx_7xx/interrupts.c

diff --git a/cpu/74xx_7xx/io.S b/arch/ppc/cpu/74xx_7xx/io.S
similarity index 100%
rename from cpu/74xx_7xx/io.S
rename to arch/ppc/cpu/74xx_7xx/io.S

diff --git a/cpu/74xx_7xx/kgdb.S b/arch/ppc/cpu/74xx_7xx/kgdb.S
similarity index 100%
rename from cpu/74xx_7xx/kgdb.S
rename to arch/ppc/cpu/74xx_7xx/kgdb.S

diff --git a/cpu/74xx_7xx/speed.c b/arch/ppc/cpu/74xx_7xx/speed.c
similarity index 100%
rename from cpu/74xx_7xx/speed.c
rename to arch/ppc/cpu/74xx_7xx/speed.c

diff --git a/cpu/74xx_7xx/start.S b/arch/ppc/cpu/74xx_7xx/start.S
similarity index 100%
rename from cpu/74xx_7xx/start.S
rename to arch/ppc/cpu/74xx_7xx/start.S

diff --git a/cpu/74xx_7xx/traps.c b/arch/ppc/cpu/74xx_7xx/traps.c
similarity index 100%
rename from cpu/74xx_7xx/traps.c
rename to arch/ppc/cpu/74xx_7xx/traps.c

diff --git a/cpu/mpc512x/Makefile b/arch/ppc/cpu/mpc512x/Makefile
similarity index 91%
rename from cpu/mpc512x/Makefile
rename to arch/ppc/cpu/mpc512x/Makefile
index 427db7ae0461e290c6c448ea34d1df3433e755fe..1719c66e8d6ee527ed3e271fb8ccded2bc2928d9 100644 (file)
--- a/cpu/mpc512x/Makefile
+++ b/arch/ppc/cpu/mpc512x/Makefile
@@ -37,8 +37,8 @@ COBJS-y += iopin.o
 COBJS-y += serial.o
 COBJS-y += speed.o
 COBJS-${CONFIG_FSL_DIU_FB} += diu.o
 COBJS-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
 COBJS-${CONFIG_CMD_IDE} += ide.o
 COBJS-${CONFIG_IIM} += iim.o
 COBJS-$(CONFIG_PCI) += pci.o

diff --git a/cpu/mpc512x/asm-offsets.h b/arch/ppc/cpu/mpc512x/asm-offsets.h
similarity index 88%
rename from cpu/mpc512x/asm-offsets.h
rename to arch/ppc/cpu/mpc512x/asm-offsets.h
index 4b147783fb3a14363775f8b9c4650da042d017fa..5873fe05ec5307a0e436a25755280199023d5262 100644 (file)
--- a/cpu/mpc512x/asm-offsets.h
+++ b/arch/ppc/cpu/mpc512x/asm-offsets.h
@@ -1,5 +1,5 @@
 /*
 /*

- * needed for cpu/mpc512x/start.S
+ * needed for arch/ppc/cpu/mpc512x/start.S

  *
  * These should be auto-generated
  */
  *
  * These should be auto-generated
  */

diff --git a/cpu/mpc512x/config.mk b/arch/ppc/cpu/mpc512x/config.mk
similarity index 95%
rename from cpu/mpc512x/config.mk
rename to arch/ppc/cpu/mpc512x/config.mk
index fb0a563e6f1a046c0364b78835c41bac1e46fa3c..b6727dcd216cc60e4e721a6f7a7bbefed0c3d6b6 100644 (file)
--- a/cpu/mpc512x/config.mk
+++ b/arch/ppc/cpu/mpc512x/config.mk
@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \
 
 # Use default linker script.
 # A board port can override this setting in board/*/config.mk
 
 # Use default linker script.
 # A board port can override this setting in board/*/config.mk

-LDSCRIPT := $(SRCTREE)/cpu/mpc512x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc512x/u-boot.lds

diff --git a/cpu/mpc512x/cpu.c b/arch/ppc/cpu/mpc512x/cpu.c
similarity index 100%
rename from cpu/mpc512x/cpu.c
rename to arch/ppc/cpu/mpc512x/cpu.c

diff --git a/cpu/mpc512x/cpu_init.c b/arch/ppc/cpu/mpc512x/cpu_init.c
similarity index 100%
rename from cpu/mpc512x/cpu_init.c
rename to arch/ppc/cpu/mpc512x/cpu_init.c

diff --git a/cpu/mpc512x/diu.c b/arch/ppc/cpu/mpc512x/diu.c
similarity index 98%
rename from cpu/mpc512x/diu.c
rename to arch/ppc/cpu/mpc512x/diu.c
index c2453c68d148ac46534218e8d47ce13533a072e8..93611615f1b1a3528b94724a0dd1019f4b9122b2 100644 (file)
--- a/cpu/mpc512x/diu.c
+++ b/arch/ppc/cpu/mpc512x/diu.c
@@ -27,7 +27,7 @@
 #include <command.h>
 #include <asm/io.h>
 
 #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>
 
 #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
 #include <stdio_dev.h>

diff --git a/cpu/mpc512x/fixed_sdram.c b/arch/ppc/cpu/mpc512x/fixed_sdram.c
similarity index 100%
rename from cpu/mpc512x/fixed_sdram.c
rename to arch/ppc/cpu/mpc512x/fixed_sdram.c

diff --git a/cpu/mpc512x/i2c.c b/arch/ppc/cpu/mpc512x/i2c.c
similarity index 100%
rename from cpu/mpc512x/i2c.c
rename to arch/ppc/cpu/mpc512x/i2c.c

diff --git a/cpu/mpc512x/ide.c b/arch/ppc/cpu/mpc512x/ide.c
similarity index 100%
rename from cpu/mpc512x/ide.c
rename to arch/ppc/cpu/mpc512x/ide.c

diff --git a/cpu/mpc512x/iim.c b/arch/ppc/cpu/mpc512x/iim.c
similarity index 100%
rename from cpu/mpc512x/iim.c
rename to arch/ppc/cpu/mpc512x/iim.c

diff --git a/cpu/mpc512x/interrupts.c b/arch/ppc/cpu/mpc512x/interrupts.c
similarity index 100%
rename from cpu/mpc512x/interrupts.c
rename to arch/ppc/cpu/mpc512x/interrupts.c

diff --git a/cpu/mpc512x/iopin.c b/arch/ppc/cpu/mpc512x/iopin.c
similarity index 100%
rename from cpu/mpc512x/iopin.c
rename to arch/ppc/cpu/mpc512x/iopin.c

diff --git a/cpu/mpc512x/pci.c b/arch/ppc/cpu/mpc512x/pci.c
similarity index 100%
rename from cpu/mpc512x/pci.c
rename to arch/ppc/cpu/mpc512x/pci.c

diff --git a/cpu/mpc512x/serial.c b/arch/ppc/cpu/mpc512x/serial.c
similarity index 100%
rename from cpu/mpc512x/serial.c
rename to arch/ppc/cpu/mpc512x/serial.c

diff --git a/cpu/mpc512x/speed.c b/arch/ppc/cpu/mpc512x/speed.c
similarity index 100%
rename from cpu/mpc512x/speed.c
rename to arch/ppc/cpu/mpc512x/speed.c

diff --git a/cpu/mpc512x/start.S b/arch/ppc/cpu/mpc512x/start.S
similarity index 100%
rename from cpu/mpc512x/start.S
rename to arch/ppc/cpu/mpc512x/start.S

diff --git a/cpu/mpc512x/traps.c b/arch/ppc/cpu/mpc512x/traps.c
similarity index 100%
rename from cpu/mpc512x/traps.c
rename to arch/ppc/cpu/mpc512x/traps.c

diff --git a/cpu/mpc512x/u-boot.lds b/arch/ppc/cpu/mpc512x/u-boot.lds
similarity index 98%
rename from cpu/mpc512x/u-boot.lds
rename to arch/ppc/cpu/mpc512x/u-boot.lds
index 2e260eb2afef1d6d2f4e07805cbaaacab375fc1c..fbc2026d530e22195951acbd5e37d4d27771a68b 100644 (file)
--- a/cpu/mpc512x/u-boot.lds
+++ b/arch/ppc/cpu/mpc512x/u-boot.lds
@@ -49,7 +49,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc512x/start.o        (.text)
+    arch/ppc/cpu/mpc512x/start.o       (.text)

     *(.text)
     *(.got1)
     . = ALIGN(16);
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/cpu/mpc5xx/Makefile b/arch/ppc/cpu/mpc5xx/Makefile
similarity index 94%
rename from cpu/mpc5xx/Makefile
rename to arch/ppc/cpu/mpc5xx/Makefile
index 8aab0189d7971c4d548407da2c765681bf7a578c..f2ebb9a1234837db983b861ae95371477dbda8fc 100644 (file)
--- a/cpu/mpc5xx/Makefile
+++ b/arch/ppc/cpu/mpc5xx/Makefile
@@ -25,11 +25,11 @@
 #
 
 #
 #
 
 #

-# File:                        cpu/mpc5xx/Makefile
+# File:                        arch/ppc/cpu/mpc5xx/Makefile

 #
 # Discription:         Makefile to build mpc5xx cpu configuration.
 #                      Will include top config.mk which itselfs
 #
 # Discription:         Makefile to build mpc5xx cpu configuration.
 #                      Will include top config.mk which itselfs

-#                      uses the definitions made in cpu/mpc5xx/config.mk
+#                      uses the definitions made in arch/ppc/cpu/mpc5xx/config.mk

 #
 
 
 #
 
 

diff --git a/cpu/mpc5xx/config.mk b/arch/ppc/cpu/mpc5xx/config.mk
similarity index 95%
rename from cpu/mpc5xx/config.mk
rename to arch/ppc/cpu/mpc5xx/config.mk
index 78549249bd7670e7006243ed7d6b162ecbc632cd..e0b0ce1fd5c9129e7b135f87b076084fe06a3407 100644 (file)
--- a/cpu/mpc5xx/config.mk
+++ b/arch/ppc/cpu/mpc5xx/config.mk
@@ -33,4 +33,4 @@ PLATFORM_RELFLAGS +=  -fPIC -meabi
 PLATFORM_CPPFLAGS +=   -DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
 PLATFORM_CPPFLAGS +=   -DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk

-LDSCRIPT := $(SRCTREE)/cpu/mpc5xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xx/u-boot.lds

diff --git a/cpu/mpc5xx/cpu.c b/arch/ppc/cpu/mpc5xx/cpu.c
similarity index 100%
rename from cpu/mpc5xx/cpu.c
rename to arch/ppc/cpu/mpc5xx/cpu.c

diff --git a/cpu/mpc5xx/cpu_init.c b/arch/ppc/cpu/mpc5xx/cpu_init.c
similarity index 100%
rename from cpu/mpc5xx/cpu_init.c
rename to arch/ppc/cpu/mpc5xx/cpu_init.c

diff --git a/cpu/mpc5xx/interrupts.c b/arch/ppc/cpu/mpc5xx/interrupts.c
similarity index 100%
rename from cpu/mpc5xx/interrupts.c
rename to arch/ppc/cpu/mpc5xx/interrupts.c

diff --git a/cpu/mpc5xx/serial.c b/arch/ppc/cpu/mpc5xx/serial.c
similarity index 100%
rename from cpu/mpc5xx/serial.c
rename to arch/ppc/cpu/mpc5xx/serial.c

diff --git a/cpu/mpc5xx/speed.c b/arch/ppc/cpu/mpc5xx/speed.c
similarity index 100%
rename from cpu/mpc5xx/speed.c
rename to arch/ppc/cpu/mpc5xx/speed.c

diff --git a/cpu/mpc5xx/spi.c b/arch/ppc/cpu/mpc5xx/spi.c
similarity index 100%
rename from cpu/mpc5xx/spi.c
rename to arch/ppc/cpu/mpc5xx/spi.c

diff --git a/cpu/mpc5xx/start.S b/arch/ppc/cpu/mpc5xx/start.S
similarity index 100%
rename from cpu/mpc5xx/start.S
rename to arch/ppc/cpu/mpc5xx/start.S

diff --git a/cpu/mpc5xx/traps.c b/arch/ppc/cpu/mpc5xx/traps.c
similarity index 100%
rename from cpu/mpc5xx/traps.c
rename to arch/ppc/cpu/mpc5xx/traps.c

diff --git a/cpu/mpc5xx/u-boot.lds b/arch/ppc/cpu/mpc5xx/u-boot.lds
similarity index 98%
rename from cpu/mpc5xx/u-boot.lds
rename to arch/ppc/cpu/mpc5xx/u-boot.lds
index deeb06ae26de7fb26f93b6f47e3e53b2c36b1360..55190c72d9f118776be211e1106744a53bebc574 100644 (file)
--- a/cpu/mpc5xx/u-boot.lds
+++ b/arch/ppc/cpu/mpc5xx/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within */
     /* the sector layout of our flash chips!   XXX FIXME XXX   */
 
     /* 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)
 
     *(.text)
     *(.got1)

diff --git a/cpu/mpc5xxx/Makefile b/arch/ppc/cpu/mpc5xxx/Makefile
similarity index 100%
rename from cpu/mpc5xxx/Makefile
rename to arch/ppc/cpu/mpc5xxx/Makefile

diff --git a/cpu/mpc5xxx/config.mk b/arch/ppc/cpu/mpc5xxx/config.mk
similarity index 95%
rename from cpu/mpc5xxx/config.mk
rename to arch/ppc/cpu/mpc5xxx/config.mk
index 5e82f67ea9edf96149248a051b53a33ead67b2ee..9a64cb623dd14f160e52a8c725470b88e7610737 100644 (file)
--- a/cpu/mpc5xxx/config.mk
+++ b/arch/ppc/cpu/mpc5xxx/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 \
                     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
                     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk

-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds

diff --git a/cpu/mpc5xxx/cpu.c b/arch/ppc/cpu/mpc5xxx/cpu.c
similarity index 100%
rename from cpu/mpc5xxx/cpu.c
rename to arch/ppc/cpu/mpc5xxx/cpu.c

diff --git a/cpu/mpc5xxx/cpu_init.c b/arch/ppc/cpu/mpc5xxx/cpu_init.c
similarity index 100%
rename from cpu/mpc5xxx/cpu_init.c
rename to arch/ppc/cpu/mpc5xxx/cpu_init.c

diff --git a/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S b/arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
similarity index 100%
rename from cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
rename to arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S

diff --git a/cpu/mpc5xxx/i2c.c b/arch/ppc/cpu/mpc5xxx/i2c.c
similarity index 100%
rename from cpu/mpc5xxx/i2c.c
rename to arch/ppc/cpu/mpc5xxx/i2c.c

diff --git a/cpu/mpc5xxx/ide.c b/arch/ppc/cpu/mpc5xxx/ide.c
similarity index 100%
rename from cpu/mpc5xxx/ide.c
rename to arch/ppc/cpu/mpc5xxx/ide.c

diff --git a/cpu/mpc5xxx/interrupts.c b/arch/ppc/cpu/mpc5xxx/interrupts.c
similarity index 100%
rename from cpu/mpc5xxx/interrupts.c
rename to arch/ppc/cpu/mpc5xxx/interrupts.c

diff --git a/cpu/mpc5xxx/io.S b/arch/ppc/cpu/mpc5xxx/io.S
similarity index 100%
rename from cpu/mpc5xxx/io.S
rename to arch/ppc/cpu/mpc5xxx/io.S

diff --git a/cpu/mpc5xxx/loadtask.c b/arch/ppc/cpu/mpc5xxx/loadtask.c
similarity index 100%
rename from cpu/mpc5xxx/loadtask.c
rename to arch/ppc/cpu/mpc5xxx/loadtask.c

diff --git a/cpu/mpc5xxx/pci_mpc5200.c b/arch/ppc/cpu/mpc5xxx/pci_mpc5200.c
similarity index 100%
rename from cpu/mpc5xxx/pci_mpc5200.c
rename to arch/ppc/cpu/mpc5xxx/pci_mpc5200.c

diff --git a/cpu/mpc5xxx/serial.c b/arch/ppc/cpu/mpc5xxx/serial.c
similarity index 100%
rename from cpu/mpc5xxx/serial.c
rename to arch/ppc/cpu/mpc5xxx/serial.c

diff --git a/cpu/mpc5xxx/speed.c b/arch/ppc/cpu/mpc5xxx/speed.c
similarity index 100%
rename from cpu/mpc5xxx/speed.c
rename to arch/ppc/cpu/mpc5xxx/speed.c

diff --git a/cpu/mpc5xxx/start.S b/arch/ppc/cpu/mpc5xxx/start.S
similarity index 100%
rename from cpu/mpc5xxx/start.S
rename to arch/ppc/cpu/mpc5xxx/start.S

diff --git a/cpu/mpc5xxx/traps.c b/arch/ppc/cpu/mpc5xxx/traps.c
similarity index 100%
rename from cpu/mpc5xxx/traps.c
rename to arch/ppc/cpu/mpc5xxx/traps.c

diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
similarity index 97%
rename from cpu/mpc5xxx/u-boot-customlayout.lds
rename to arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
index 6c80139f272036c84c352129601c9851766534e6..81ebde987f7ce20f6fb8a1f9731818b69ec15d85 100644 (file)
--- a/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -55,8 +55,8 @@ SECTIONS
     /* WARNING - the following is hand-optimized to fit within  */
     /* the sector layout of our flash chips!    XXX FIXME XXX   */
 
     /* 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)
     lib/crc32.o         (.text)
     arch/ppc/lib/cache.o             (.text)
     arch/ppc/lib/time.o              (.text)

diff --git a/cpu/mpc5xxx/u-boot.lds b/arch/ppc/cpu/mpc5xxx/u-boot.lds
similarity index 98%
rename from cpu/mpc5xxx/u-boot.lds
rename to arch/ppc/cpu/mpc5xxx/u-boot.lds
index 7fe1e95129648c8d95f4974c5130e5770f844d98..64ef481297cfbce374a57cbccff17efbcd29bdea 100644 (file)
--- a/cpu/mpc5xxx/u-boot.lds
+++ b/arch/ppc/cpu/mpc5xxx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc5xxx/start.o        (.text)
+    arch/ppc/cpu/mpc5xxx/start.o       (.text)

     *(.text)
     *(.got1)
     . = ALIGN(16);
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/cpu/mpc5xxx/usb.c b/arch/ppc/cpu/mpc5xxx/usb.c
similarity index 100%
rename from cpu/mpc5xxx/usb.c
rename to arch/ppc/cpu/mpc5xxx/usb.c

diff --git a/cpu/mpc5xxx/usb_ohci.c b/arch/ppc/cpu/mpc5xxx/usb_ohci.c
similarity index 100%
rename from cpu/mpc5xxx/usb_ohci.c
rename to arch/ppc/cpu/mpc5xxx/usb_ohci.c

diff --git a/cpu/mpc5xxx/usb_ohci.h b/arch/ppc/cpu/mpc5xxx/usb_ohci.h
similarity index 100%
rename from cpu/mpc5xxx/usb_ohci.h
rename to arch/ppc/cpu/mpc5xxx/usb_ohci.h

diff --git a/cpu/mpc8220/Makefile b/arch/ppc/cpu/mpc8220/Makefile
similarity index 100%
rename from cpu/mpc8220/Makefile
rename to arch/ppc/cpu/mpc8220/Makefile

diff --git a/cpu/mpc8220/config.mk b/arch/ppc/cpu/mpc8220/config.mk
similarity index 95%
rename from cpu/mpc8220/config.mk
rename to arch/ppc/cpu/mpc8220/config.mk
index 3ce40c0dbeb4e3e86521bfb2fa8f9169c0fae680..e2ebf38bd5e941ee5bedbb67242ead111ea19a9d 100644 (file)
--- a/cpu/mpc8220/config.mk
+++ b/arch/ppc/cpu/mpc8220/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 \
                     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
                     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk

-LDSCRIPT := $(SRCTREE)/cpu/mpc8220/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8220/u-boot.lds

diff --git a/cpu/mpc8220/cpu.c b/arch/ppc/cpu/mpc8220/cpu.c
similarity index 100%
rename from cpu/mpc8220/cpu.c
rename to arch/ppc/cpu/mpc8220/cpu.c

diff --git a/cpu/mpc8220/cpu_init.c b/arch/ppc/cpu/mpc8220/cpu_init.c
similarity index 100%
rename from cpu/mpc8220/cpu_init.c
rename to arch/ppc/cpu/mpc8220/cpu_init.c

diff --git a/cpu/mpc8220/dma.h b/arch/ppc/cpu/mpc8220/dma.h
similarity index 100%
rename from cpu/mpc8220/dma.h
rename to arch/ppc/cpu/mpc8220/dma.h

diff --git a/cpu/mpc8220/dramSetup.c b/arch/ppc/cpu/mpc8220/dramSetup.c
similarity index 100%
rename from cpu/mpc8220/dramSetup.c
rename to arch/ppc/cpu/mpc8220/dramSetup.c

diff --git a/cpu/mpc8220/dramSetup.h b/arch/ppc/cpu/mpc8220/dramSetup.h
similarity index 100%
rename from cpu/mpc8220/dramSetup.h
rename to arch/ppc/cpu/mpc8220/dramSetup.h

diff --git a/cpu/mpc8220/fec.c b/arch/ppc/cpu/mpc8220/fec.c
similarity index 100%
rename from cpu/mpc8220/fec.c
rename to arch/ppc/cpu/mpc8220/fec.c

diff --git a/cpu/mpc8220/fec.h b/arch/ppc/cpu/mpc8220/fec.h
similarity index 100%
rename from cpu/mpc8220/fec.h
rename to arch/ppc/cpu/mpc8220/fec.h

diff --git a/cpu/mpc8220/fec_dma_tasks.S b/arch/ppc/cpu/mpc8220/fec_dma_tasks.S
similarity index 100%
rename from cpu/mpc8220/fec_dma_tasks.S
rename to arch/ppc/cpu/mpc8220/fec_dma_tasks.S

diff --git a/cpu/mpc8220/i2c.c b/arch/ppc/cpu/mpc8220/i2c.c
similarity index 100%
rename from cpu/mpc8220/i2c.c
rename to arch/ppc/cpu/mpc8220/i2c.c

diff --git a/cpu/mpc8220/i2cCore.c b/arch/ppc/cpu/mpc8220/i2cCore.c
similarity index 100%
rename from cpu/mpc8220/i2cCore.c
rename to arch/ppc/cpu/mpc8220/i2cCore.c

diff --git a/cpu/mpc8220/i2cCore.h b/arch/ppc/cpu/mpc8220/i2cCore.h
similarity index 100%
rename from cpu/mpc8220/i2cCore.h
rename to arch/ppc/cpu/mpc8220/i2cCore.h

diff --git a/cpu/mpc8220/interrupts.c b/arch/ppc/cpu/mpc8220/interrupts.c
similarity index 100%
rename from cpu/mpc8220/interrupts.c
rename to arch/ppc/cpu/mpc8220/interrupts.c

diff --git a/cpu/mpc8220/io.S b/arch/ppc/cpu/mpc8220/io.S
similarity index 100%
rename from cpu/mpc8220/io.S
rename to arch/ppc/cpu/mpc8220/io.S

diff --git a/cpu/mpc8220/loadtask.c b/arch/ppc/cpu/mpc8220/loadtask.c
similarity index 100%
rename from cpu/mpc8220/loadtask.c
rename to arch/ppc/cpu/mpc8220/loadtask.c

diff --git a/cpu/mpc8220/pci.c b/arch/ppc/cpu/mpc8220/pci.c
similarity index 100%
rename from cpu/mpc8220/pci.c
rename to arch/ppc/cpu/mpc8220/pci.c

diff --git a/cpu/mpc8220/speed.c b/arch/ppc/cpu/mpc8220/speed.c
similarity index 100%
rename from cpu/mpc8220/speed.c
rename to arch/ppc/cpu/mpc8220/speed.c

diff --git a/cpu/mpc8220/start.S b/arch/ppc/cpu/mpc8220/start.S
similarity index 100%
rename from cpu/mpc8220/start.S
rename to arch/ppc/cpu/mpc8220/start.S

diff --git a/cpu/mpc8220/traps.c b/arch/ppc/cpu/mpc8220/traps.c
similarity index 100%
rename from cpu/mpc8220/traps.c
rename to arch/ppc/cpu/mpc8220/traps.c

diff --git a/cpu/mpc8220/u-boot.lds b/arch/ppc/cpu/mpc8220/u-boot.lds
similarity index 98%
rename from cpu/mpc8220/u-boot.lds
rename to arch/ppc/cpu/mpc8220/u-boot.lds
index 4400e60c8fa32d7bda10b45bdb5aa2e1d8cae4d2..8c5d3071f985fa0e395b6e4eafb20a29a12a7c75 100644 (file)
--- a/cpu/mpc8220/u-boot.lds
+++ b/arch/ppc/cpu/mpc8220/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8220/start.o        (.text)
+    arch/ppc/cpu/mpc8220/start.o       (.text)

     *(.text)
     *(.got1)
     . = ALIGN(16);
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/cpu/mpc8220/uart.c b/arch/ppc/cpu/mpc8220/uart.c
similarity index 100%
rename from cpu/mpc8220/uart.c
rename to arch/ppc/cpu/mpc8220/uart.c

diff --git a/cpu/mpc824x/.gitignore b/arch/ppc/cpu/mpc824x/.gitignore
similarity index 100%
rename from cpu/mpc824x/.gitignore
rename to arch/ppc/cpu/mpc824x/.gitignore

diff --git a/cpu/mpc824x/Makefile b/arch/ppc/cpu/mpc824x/Makefile
similarity index 100%
rename from cpu/mpc824x/Makefile
rename to arch/ppc/cpu/mpc824x/Makefile

diff --git a/cpu/mpc824x/config.mk b/arch/ppc/cpu/mpc824x/config.mk
similarity index 95%
rename from cpu/mpc824x/config.mk
rename to arch/ppc/cpu/mpc824x/config.mk
index 940474bbd977a5c5a3584a244180aa2b754017c0..31ecd20d9f344e468389480b84145aec1affe316 100644 (file)
--- a/cpu/mpc824x/config.mk
+++ b/arch/ppc/cpu/mpc824x/config.mk
@@ -26,4 +26,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi
 PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
 PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk

-LDSCRIPT := $(SRCTREE)/cpu/mpc824x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc824x/u-boot.lds

diff --git a/cpu/mpc824x/cpu.c b/arch/ppc/cpu/mpc824x/cpu.c
similarity index 100%
rename from cpu/mpc824x/cpu.c
rename to arch/ppc/cpu/mpc824x/cpu.c

diff --git a/cpu/mpc824x/cpu_init.c b/arch/ppc/cpu/mpc824x/cpu_init.c
similarity index 100%
rename from cpu/mpc824x/cpu_init.c
rename to arch/ppc/cpu/mpc824x/cpu_init.c

diff --git a/cpu/mpc824x/drivers/epic.h b/arch/ppc/cpu/mpc824x/drivers/epic.h
similarity index 100%
rename from cpu/mpc824x/drivers/epic.h
rename to arch/ppc/cpu/mpc824x/drivers/epic.h

diff --git a/cpu/mpc824x/drivers/epic/README b/arch/ppc/cpu/mpc824x/drivers/epic/README
similarity index 100%
rename from cpu/mpc824x/drivers/epic/README
rename to arch/ppc/cpu/mpc824x/drivers/epic/README

diff --git a/cpu/mpc824x/drivers/epic/epic.h b/arch/ppc/cpu/mpc824x/drivers/epic/epic.h
similarity index 100%
rename from cpu/mpc824x/drivers/epic/epic.h
rename to arch/ppc/cpu/mpc824x/drivers/epic/epic.h

diff --git a/cpu/mpc824x/drivers/epic/epic1.c b/arch/ppc/cpu/mpc824x/drivers/epic/epic1.c
similarity index 100%
rename from cpu/mpc824x/drivers/epic/epic1.c
rename to arch/ppc/cpu/mpc824x/drivers/epic/epic1.c

diff --git a/cpu/mpc824x/drivers/epic/epic2.S b/arch/ppc/cpu/mpc824x/drivers/epic/epic2.S
similarity index 100%
rename from cpu/mpc824x/drivers/epic/epic2.S
rename to arch/ppc/cpu/mpc824x/drivers/epic/epic2.S

diff --git a/cpu/mpc824x/drivers/epic/epicutil.S b/arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S
similarity index 100%
rename from cpu/mpc824x/drivers/epic/epicutil.S
rename to arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S

diff --git a/cpu/mpc824x/drivers/errors.h b/arch/ppc/cpu/mpc824x/drivers/errors.h
similarity index 100%
rename from cpu/mpc824x/drivers/errors.h
rename to arch/ppc/cpu/mpc824x/drivers/errors.h

diff --git a/cpu/mpc824x/drivers/i2c/i2c.c b/arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c
similarity index 100%
rename from cpu/mpc824x/drivers/i2c/i2c.c
rename to arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c

diff --git a/cpu/mpc824x/drivers/i2c_export.h b/arch/ppc/cpu/mpc824x/drivers/i2c_export.h
similarity index 100%
rename from cpu/mpc824x/drivers/i2c_export.h
rename to arch/ppc/cpu/mpc824x/drivers/i2c_export.h

diff --git a/cpu/mpc824x/interrupts.c b/arch/ppc/cpu/mpc824x/interrupts.c
similarity index 100%
rename from cpu/mpc824x/interrupts.c
rename to arch/ppc/cpu/mpc824x/interrupts.c

diff --git a/cpu/mpc824x/pci.c b/arch/ppc/cpu/mpc824x/pci.c
similarity index 100%
rename from cpu/mpc824x/pci.c
rename to arch/ppc/cpu/mpc824x/pci.c

diff --git a/cpu/mpc824x/speed.c b/arch/ppc/cpu/mpc824x/speed.c
similarity index 100%
rename from cpu/mpc824x/speed.c
rename to arch/ppc/cpu/mpc824x/speed.c

diff --git a/cpu/mpc824x/start.S b/arch/ppc/cpu/mpc824x/start.S
similarity index 100%
rename from cpu/mpc824x/start.S
rename to arch/ppc/cpu/mpc824x/start.S

diff --git a/cpu/mpc824x/traps.c b/arch/ppc/cpu/mpc824x/traps.c
similarity index 100%
rename from cpu/mpc824x/traps.c
rename to arch/ppc/cpu/mpc824x/traps.c

diff --git a/cpu/mpc824x/u-boot.lds b/arch/ppc/cpu/mpc824x/u-boot.lds
similarity index 98%
rename from cpu/mpc824x/u-boot.lds
rename to arch/ppc/cpu/mpc824x/u-boot.lds
index 0eac48f2cdd9f14512ebcce4b4b846654ea07a71..8a6d5084ecb57cff2d2133d56279a087d4f9fd85 100644 (file)
--- a/cpu/mpc824x/u-boot.lds
+++ b/arch/ppc/cpu/mpc824x/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc824x/start.o                (.text)
+    arch/ppc/cpu/mpc824x/start.o               (.text)

     *(.text)
     *(.got1)
     . = ALIGN(16);
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/cpu/mpc8260/Makefile b/arch/ppc/cpu/mpc8260/Makefile
similarity index 100%
rename from cpu/mpc8260/Makefile
rename to arch/ppc/cpu/mpc8260/Makefile

diff --git a/cpu/mpc8260/bedbug_603e.c b/arch/ppc/cpu/mpc8260/bedbug_603e.c
similarity index 100%
rename from cpu/mpc8260/bedbug_603e.c
rename to arch/ppc/cpu/mpc8260/bedbug_603e.c

diff --git a/cpu/mpc8260/commproc.c b/arch/ppc/cpu/mpc8260/commproc.c
similarity index 100%
rename from cpu/mpc8260/commproc.c
rename to arch/ppc/cpu/mpc8260/commproc.c

diff --git a/cpu/mpc8260/config.mk b/arch/ppc/cpu/mpc8260/config.mk
similarity index 95%
rename from cpu/mpc8260/config.mk
rename to arch/ppc/cpu/mpc8260/config.mk
index 39d81eef8b095ab484843a6a878ed01f606d179e..51bb9faf25f5db06a6606dfaddc811bdd8016625 100644 (file)
--- a/cpu/mpc8260/config.mk
+++ b/arch/ppc/cpu/mpc8260/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 \
                     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk
                     -mstring -mcpu=603e -mmultiple
 
 # Use default linker script.  Board port can override in board/*/config.mk

-LDSCRIPT := $(SRCTREE)/cpu/mpc8260/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8260/u-boot.lds

diff --git a/cpu/mpc8260/cpu.c b/arch/ppc/cpu/mpc8260/cpu.c
similarity index 100%
rename from cpu/mpc8260/cpu.c
rename to arch/ppc/cpu/mpc8260/cpu.c

diff --git a/cpu/mpc8260/cpu_init.c b/arch/ppc/cpu/mpc8260/cpu_init.c
similarity index 100%
rename from cpu/mpc8260/cpu_init.c
rename to arch/ppc/cpu/mpc8260/cpu_init.c

diff --git a/cpu/mpc8260/ether_fcc.c b/arch/ppc/cpu/mpc8260/ether_fcc.c
similarity index 100%
rename from cpu/mpc8260/ether_fcc.c
rename to arch/ppc/cpu/mpc8260/ether_fcc.c

diff --git a/cpu/mpc8260/ether_scc.c b/arch/ppc/cpu/mpc8260/ether_scc.c
similarity index 100%
rename from cpu/mpc8260/ether_scc.c
rename to arch/ppc/cpu/mpc8260/ether_scc.c

diff --git a/cpu/mpc8260/i2c.c b/arch/ppc/cpu/mpc8260/i2c.c
similarity index 100%
rename from cpu/mpc8260/i2c.c
rename to arch/ppc/cpu/mpc8260/i2c.c

diff --git a/cpu/mpc8260/interrupts.c b/arch/ppc/cpu/mpc8260/interrupts.c
similarity index 100%
rename from cpu/mpc8260/interrupts.c
rename to arch/ppc/cpu/mpc8260/interrupts.c

diff --git a/cpu/mpc8260/kgdb.S b/arch/ppc/cpu/mpc8260/kgdb.S
similarity index 100%
rename from cpu/mpc8260/kgdb.S
rename to arch/ppc/cpu/mpc8260/kgdb.S

diff --git a/cpu/mpc8260/pci.c b/arch/ppc/cpu/mpc8260/pci.c
similarity index 100%
rename from cpu/mpc8260/pci.c
rename to arch/ppc/cpu/mpc8260/pci.c

diff --git a/cpu/mpc8260/serial_scc.c b/arch/ppc/cpu/mpc8260/serial_scc.c
similarity index 100%
rename from cpu/mpc8260/serial_scc.c
rename to arch/ppc/cpu/mpc8260/serial_scc.c

diff --git a/cpu/mpc8260/serial_smc.c b/arch/ppc/cpu/mpc8260/serial_smc.c
similarity index 100%
rename from cpu/mpc8260/serial_smc.c
rename to arch/ppc/cpu/mpc8260/serial_smc.c

diff --git a/cpu/mpc8260/speed.c b/arch/ppc/cpu/mpc8260/speed.c
similarity index 100%
rename from cpu/mpc8260/speed.c
rename to arch/ppc/cpu/mpc8260/speed.c

diff --git a/cpu/mpc8260/speed.h b/arch/ppc/cpu/mpc8260/speed.h
similarity index 100%
rename from cpu/mpc8260/speed.h
rename to arch/ppc/cpu/mpc8260/speed.h

diff --git a/cpu/mpc8260/spi.c b/arch/ppc/cpu/mpc8260/spi.c
similarity index 100%
rename from cpu/mpc8260/spi.c
rename to arch/ppc/cpu/mpc8260/spi.c

diff --git a/cpu/mpc8260/start.S b/arch/ppc/cpu/mpc8260/start.S
similarity index 100%
rename from cpu/mpc8260/start.S
rename to arch/ppc/cpu/mpc8260/start.S

diff --git a/cpu/mpc8260/traps.c b/arch/ppc/cpu/mpc8260/traps.c
similarity index 100%
rename from cpu/mpc8260/traps.c
rename to arch/ppc/cpu/mpc8260/traps.c

diff --git a/cpu/mpc8260/u-boot.lds b/arch/ppc/cpu/mpc8260/u-boot.lds
similarity index 98%
rename from cpu/mpc8260/u-boot.lds
rename to arch/ppc/cpu/mpc8260/u-boot.lds
index c777cf9da9874dcbb9aceffafec51fa3a04b2a9f..988784416f1f4114ccebc23a05eed6be1c763158 100644 (file)
--- a/cpu/mpc8260/u-boot.lds
+++ b/arch/ppc/cpu/mpc8260/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8260/start.o                (.text)
+    arch/ppc/cpu/mpc8260/start.o               (.text)

     *(.text)
     *(.got1)
     . = ALIGN(16);
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/cpu/mpc83xx/Makefile b/arch/ppc/cpu/mpc83xx/Makefile
similarity index 100%
rename from cpu/mpc83xx/Makefile
rename to arch/ppc/cpu/mpc83xx/Makefile

diff --git a/cpu/mpc83xx/config.mk b/arch/ppc/cpu/mpc83xx/config.mk
similarity index 94%
rename from cpu/mpc83xx/config.mk
rename to arch/ppc/cpu/mpc83xx/config.mk
index e80919bc28b30458db147c9daafda049ee55141a..8596f6a5e78a0a876b2f5e109bf2c8d91bd77633 100644 (file)
--- a/cpu/mpc83xx/config.mk
+++ b/arch/ppc/cpu/mpc83xx/config.mk
@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC83xx -DCONFIG_E300 \
                        -ffixed-r2 -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk
                        -ffixed-r2 -msoft-float
 
 # Use default linker script.  Board port can override in board/*/config.mk

-LDSCRIPT := $(SRCTREE)/cpu/mpc83xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc83xx/u-boot.lds

diff --git a/cpu/mpc83xx/cpu.c b/arch/ppc/cpu/mpc83xx/cpu.c
similarity index 100%
rename from cpu/mpc83xx/cpu.c
rename to arch/ppc/cpu/mpc83xx/cpu.c

diff --git a/cpu/mpc83xx/cpu_init.c b/arch/ppc/cpu/mpc83xx/cpu_init.c
similarity index 100%
rename from cpu/mpc83xx/cpu_init.c
rename to arch/ppc/cpu/mpc83xx/cpu_init.c

diff --git a/cpu/mpc83xx/ecc.c b/arch/ppc/cpu/mpc83xx/ecc.c
similarity index 100%
rename from cpu/mpc83xx/ecc.c
rename to arch/ppc/cpu/mpc83xx/ecc.c

diff --git a/cpu/mpc83xx/fdt.c b/arch/ppc/cpu/mpc83xx/fdt.c
similarity index 100%
rename from cpu/mpc83xx/fdt.c
rename to arch/ppc/cpu/mpc83xx/fdt.c

diff --git a/cpu/mpc83xx/interrupts.c b/arch/ppc/cpu/mpc83xx/interrupts.c
similarity index 100%
rename from cpu/mpc83xx/interrupts.c
rename to arch/ppc/cpu/mpc83xx/interrupts.c

diff --git a/cpu/mpc83xx/nand_init.c b/arch/ppc/cpu/mpc83xx/nand_init.c
similarity index 100%
rename from cpu/mpc83xx/nand_init.c
rename to arch/ppc/cpu/mpc83xx/nand_init.c

diff --git a/cpu/mpc83xx/pci.c b/arch/ppc/cpu/mpc83xx/pci.c
similarity index 100%
rename from cpu/mpc83xx/pci.c
rename to arch/ppc/cpu/mpc83xx/pci.c

diff --git a/cpu/mpc83xx/pcie.c b/arch/ppc/cpu/mpc83xx/pcie.c
similarity index 100%
rename from cpu/mpc83xx/pcie.c
rename to arch/ppc/cpu/mpc83xx/pcie.c

diff --git a/cpu/mpc83xx/qe_io.c b/arch/ppc/cpu/mpc83xx/qe_io.c
similarity index 100%
rename from cpu/mpc83xx/qe_io.c
rename to arch/ppc/cpu/mpc83xx/qe_io.c

diff --git a/cpu/mpc83xx/serdes.c b/arch/ppc/cpu/mpc83xx/serdes.c
similarity index 100%
rename from cpu/mpc83xx/serdes.c
rename to arch/ppc/cpu/mpc83xx/serdes.c

diff --git a/cpu/mpc83xx/spd_sdram.c b/arch/ppc/cpu/mpc83xx/spd_sdram.c
similarity index 100%
rename from cpu/mpc83xx/spd_sdram.c
rename to arch/ppc/cpu/mpc83xx/spd_sdram.c

diff --git a/cpu/mpc83xx/speed.c b/arch/ppc/cpu/mpc83xx/speed.c
similarity index 100%
rename from cpu/mpc83xx/speed.c
rename to arch/ppc/cpu/mpc83xx/speed.c

diff --git a/cpu/mpc83xx/start.S b/arch/ppc/cpu/mpc83xx/start.S
similarity index 100%
rename from cpu/mpc83xx/start.S
rename to arch/ppc/cpu/mpc83xx/start.S

diff --git a/cpu/mpc83xx/traps.c b/arch/ppc/cpu/mpc83xx/traps.c
similarity index 100%
rename from cpu/mpc83xx/traps.c
rename to arch/ppc/cpu/mpc83xx/traps.c

diff --git a/cpu/mpc83xx/u-boot.lds b/arch/ppc/cpu/mpc83xx/u-boot.lds
similarity index 98%
rename from cpu/mpc83xx/u-boot.lds
rename to arch/ppc/cpu/mpc83xx/u-boot.lds
index c84d4b02226234d43121b9602414666b3b52d723..157cef676e14d3cf0b6cc7eb781745735e1ab9c0 100644 (file)
--- a/cpu/mpc83xx/u-boot.lds
+++ b/arch/ppc/cpu/mpc83xx/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc83xx/start.o        (.text)
+    arch/ppc/cpu/mpc83xx/start.o       (.text)

     *(.text)
     *(.got1)
     . = ALIGN(16);
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/cpu/mpc85xx/Makefile b/arch/ppc/cpu/mpc85xx/Makefile
similarity index 100%
rename from cpu/mpc85xx/Makefile
rename to arch/ppc/cpu/mpc85xx/Makefile

diff --git a/cpu/mpc85xx/commproc.c b/arch/ppc/cpu/mpc85xx/commproc.c
similarity index 100%
rename from cpu/mpc85xx/commproc.c
rename to arch/ppc/cpu/mpc85xx/commproc.c

diff --git a/cpu/mpc85xx/config.mk b/arch/ppc/cpu/mpc85xx/config.mk
similarity index 95%
rename from cpu/mpc85xx/config.mk
rename to arch/ppc/cpu/mpc85xx/config.mk
index 408184ad1551cf539216d253e6da4785833bc314..ffb813dc39fef72349b61198e8052f0a312a7008 100644 (file)
--- a/cpu/mpc85xx/config.mk
+++ b/arch/ppc/cpu/mpc85xx/config.mk
@@ -32,4 +32,4 @@ PLATFORM_CPPFLAGS +=$(call cc-option,-mspe=yes)
 PLATFORM_CPPFLAGS +=$(call cc-option,-mno-spe)
 
 # Use default linker script.  Board port can override in board/*/config.mk
 PLATFORM_CPPFLAGS +=$(call cc-option,-mno-spe)
 
 # Use default linker script.  Board port can override in board/*/config.mk

-LDSCRIPT := $(SRCTREE)/cpu/mpc85xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc85xx/u-boot.lds

diff --git a/cpu/mpc85xx/cpu.c b/arch/ppc/cpu/mpc85xx/cpu.c
similarity index 100%
rename from cpu/mpc85xx/cpu.c
rename to arch/ppc/cpu/mpc85xx/cpu.c

diff --git a/cpu/mpc85xx/cpu_init.c b/arch/ppc/cpu/mpc85xx/cpu_init.c
similarity index 100%
rename from cpu/mpc85xx/cpu_init.c
rename to arch/ppc/cpu/mpc85xx/cpu_init.c

diff --git a/cpu/mpc85xx/cpu_init_early.c b/arch/ppc/cpu/mpc85xx/cpu_init_early.c
similarity index 100%
rename from cpu/mpc85xx/cpu_init_early.c
rename to arch/ppc/cpu/mpc85xx/cpu_init_early.c

diff --git a/cpu/mpc85xx/cpu_init_nand.c b/arch/ppc/cpu/mpc85xx/cpu_init_nand.c
similarity index 100%
rename from cpu/mpc85xx/cpu_init_nand.c
rename to arch/ppc/cpu/mpc85xx/cpu_init_nand.c

diff --git a/cpu/mpc85xx/ddr-gen1.c b/arch/ppc/cpu/mpc85xx/ddr-gen1.c
similarity index 100%
rename from cpu/mpc85xx/ddr-gen1.c
rename to arch/ppc/cpu/mpc85xx/ddr-gen1.c

diff --git a/cpu/mpc85xx/ddr-gen2.c b/arch/ppc/cpu/mpc85xx/ddr-gen2.c
similarity index 100%
rename from cpu/mpc85xx/ddr-gen2.c
rename to arch/ppc/cpu/mpc85xx/ddr-gen2.c

diff --git a/cpu/mpc85xx/ddr-gen3.c b/arch/ppc/cpu/mpc85xx/ddr-gen3.c
similarity index 100%
rename from cpu/mpc85xx/ddr-gen3.c
rename to arch/ppc/cpu/mpc85xx/ddr-gen3.c

diff --git a/cpu/mpc85xx/ether_fcc.c b/arch/ppc/cpu/mpc85xx/ether_fcc.c
similarity index 100%
rename from cpu/mpc85xx/ether_fcc.c
rename to arch/ppc/cpu/mpc85xx/ether_fcc.c

diff --git a/cpu/mpc85xx/fdt.c b/arch/ppc/cpu/mpc85xx/fdt.c
similarity index 100%
rename from cpu/mpc85xx/fdt.c
rename to arch/ppc/cpu/mpc85xx/fdt.c

diff --git a/cpu/mpc85xx/fixed_ivor.S b/arch/ppc/cpu/mpc85xx/fixed_ivor.S
similarity index 100%
rename from cpu/mpc85xx/fixed_ivor.S
rename to arch/ppc/cpu/mpc85xx/fixed_ivor.S

diff --git a/cpu/mpc85xx/interrupts.c b/arch/ppc/cpu/mpc85xx/interrupts.c
similarity index 100%
rename from cpu/mpc85xx/interrupts.c
rename to arch/ppc/cpu/mpc85xx/interrupts.c

diff --git a/cpu/mpc85xx/mp.c b/arch/ppc/cpu/mpc85xx/mp.c
similarity index 100%
rename from cpu/mpc85xx/mp.c
rename to arch/ppc/cpu/mpc85xx/mp.c

diff --git a/cpu/mpc85xx/mp.h b/arch/ppc/cpu/mpc85xx/mp.h
similarity index 100%
rename from cpu/mpc85xx/mp.h
rename to arch/ppc/cpu/mpc85xx/mp.h

diff --git a/cpu/mpc85xx/mpc8536_serdes.c b/arch/ppc/cpu/mpc85xx/mpc8536_serdes.c
similarity index 100%
rename from cpu/mpc85xx/mpc8536_serdes.c
rename to arch/ppc/cpu/mpc85xx/mpc8536_serdes.c

diff --git a/cpu/mpc85xx/pci.c b/arch/ppc/cpu/mpc85xx/pci.c
similarity index 100%
rename from cpu/mpc85xx/pci.c
rename to arch/ppc/cpu/mpc85xx/pci.c

diff --git a/cpu/mpc85xx/qe_io.c b/arch/ppc/cpu/mpc85xx/qe_io.c
similarity index 100%
rename from cpu/mpc85xx/qe_io.c
rename to arch/ppc/cpu/mpc85xx/qe_io.c

diff --git a/cpu/mpc85xx/release.S b/arch/ppc/cpu/mpc85xx/release.S
similarity index 100%
rename from cpu/mpc85xx/release.S
rename to arch/ppc/cpu/mpc85xx/release.S

diff --git a/cpu/mpc85xx/resetvec.S b/arch/ppc/cpu/mpc85xx/resetvec.S
similarity index 100%
rename from cpu/mpc85xx/resetvec.S
rename to arch/ppc/cpu/mpc85xx/resetvec.S

diff --git a/cpu/mpc85xx/serial_scc.c b/arch/ppc/cpu/mpc85xx/serial_scc.c
similarity index 100%
rename from cpu/mpc85xx/serial_scc.c
rename to arch/ppc/cpu/mpc85xx/serial_scc.c

diff --git a/cpu/mpc85xx/speed.c b/arch/ppc/cpu/mpc85xx/speed.c
similarity index 100%
rename from cpu/mpc85xx/speed.c
rename to arch/ppc/cpu/mpc85xx/speed.c

diff --git a/cpu/mpc85xx/start.S b/arch/ppc/cpu/mpc85xx/start.S
similarity index 100%
rename from cpu/mpc85xx/start.S
rename to arch/ppc/cpu/mpc85xx/start.S

diff --git a/cpu/mpc85xx/tlb.c b/arch/ppc/cpu/mpc85xx/tlb.c
similarity index 100%
rename from cpu/mpc85xx/tlb.c
rename to arch/ppc/cpu/mpc85xx/tlb.c

diff --git a/cpu/mpc85xx/traps.c b/arch/ppc/cpu/mpc85xx/traps.c
similarity index 100%
rename from cpu/mpc85xx/traps.c
rename to arch/ppc/cpu/mpc85xx/traps.c

diff --git a/cpu/mpc85xx/u-boot-nand.lds b/arch/ppc/cpu/mpc85xx/u-boot-nand.lds
similarity index 98%
rename from cpu/mpc85xx/u-boot-nand.lds
rename to arch/ppc/cpu/mpc85xx/u-boot-nand.lds
index b4c63e2a2a21f1de297dfcc4c73443d2f8588cb8..b9240f22a73f911055119ae2705c03874b62fb8c 100644 (file)
--- a/cpu/mpc85xx/u-boot-nand.lds
+++ b/arch/ppc/cpu/mpc85xx/u-boot-nand.lds
@@ -117,7 +117,7 @@ SECTIONS
 
   .bootpg ADDR(.text) - 0x1000 :
   {
 
   .bootpg ADDR(.text) - 0x1000 :
   {

-    cpu/mpc85xx/start.o        (.bootpg)
+    arch/ppc/cpu/mpc85xx/start.o       (.bootpg)

   } :text = 0xffff
 
   . = ADDR(.text) + 0x80000;
   } :text = 0xffff
 
   . = ADDR(.text) + 0x80000;

diff --git a/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds
similarity index 100%
rename from cpu/mpc85xx/u-boot-nand_spl.lds
rename to arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds

diff --git a/cpu/mpc85xx/u-boot.lds b/arch/ppc/cpu/mpc85xx/u-boot.lds
similarity index 98%
rename from cpu/mpc85xx/u-boot.lds
rename to arch/ppc/cpu/mpc85xx/u-boot.lds
index 183dce9514dc4fef2105d5385fcbe8a853f76e17..9698bf405aea6e775eec13d4e30d2fa9ef76d3ae 100644 (file)
--- a/cpu/mpc85xx/u-boot.lds
+++ b/arch/ppc/cpu/mpc85xx/u-boot.lds
@@ -121,7 +121,7 @@ SECTIONS
 
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {
 
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {

-    cpu/mpc85xx/start.o        (.bootpg)
+    arch/ppc/cpu/mpc85xx/start.o       (.bootpg)

   } :text = 0xffff
 
   .resetvec RESET_VECTOR_ADDRESS :
   } :text = 0xffff
 
   .resetvec RESET_VECTOR_ADDRESS :

diff --git a/cpu/mpc86xx/Makefile b/arch/ppc/cpu/mpc86xx/Makefile
similarity index 100%
rename from cpu/mpc86xx/Makefile
rename to arch/ppc/cpu/mpc86xx/Makefile

diff --git a/cpu/mpc86xx/cache.S b/arch/ppc/cpu/mpc86xx/cache.S
similarity index 100%
rename from cpu/mpc86xx/cache.S
rename to arch/ppc/cpu/mpc86xx/cache.S

diff --git a/cpu/mpc86xx/config.mk b/arch/ppc/cpu/mpc86xx/config.mk
similarity index 100%
rename from cpu/mpc86xx/config.mk
rename to arch/ppc/cpu/mpc86xx/config.mk

diff --git a/cpu/mpc86xx/cpu.c b/arch/ppc/cpu/mpc86xx/cpu.c
similarity index 100%
rename from cpu/mpc86xx/cpu.c
rename to arch/ppc/cpu/mpc86xx/cpu.c

diff --git a/cpu/mpc86xx/cpu_init.c b/arch/ppc/cpu/mpc86xx/cpu_init.c
similarity index 100%
rename from cpu/mpc86xx/cpu_init.c
rename to arch/ppc/cpu/mpc86xx/cpu_init.c

diff --git a/cpu/mpc86xx/ddr-8641.c b/arch/ppc/cpu/mpc86xx/ddr-8641.c
similarity index 100%
rename from cpu/mpc86xx/ddr-8641.c
rename to arch/ppc/cpu/mpc86xx/ddr-8641.c

diff --git a/cpu/mpc86xx/fdt.c b/arch/ppc/cpu/mpc86xx/fdt.c
similarity index 100%
rename from cpu/mpc86xx/fdt.c
rename to arch/ppc/cpu/mpc86xx/fdt.c

diff --git a/cpu/mpc86xx/interrupts.c b/arch/ppc/cpu/mpc86xx/interrupts.c
similarity index 100%
rename from cpu/mpc86xx/interrupts.c
rename to arch/ppc/cpu/mpc86xx/interrupts.c

diff --git a/cpu/mpc86xx/mp.c b/arch/ppc/cpu/mpc86xx/mp.c
similarity index 100%
rename from cpu/mpc86xx/mp.c
rename to arch/ppc/cpu/mpc86xx/mp.c

diff --git a/cpu/mpc86xx/release.S b/arch/ppc/cpu/mpc86xx/release.S
similarity index 100%
rename from cpu/mpc86xx/release.S
rename to arch/ppc/cpu/mpc86xx/release.S

diff --git a/cpu/mpc86xx/speed.c b/arch/ppc/cpu/mpc86xx/speed.c
similarity index 100%
rename from cpu/mpc86xx/speed.c
rename to arch/ppc/cpu/mpc86xx/speed.c

diff --git a/cpu/mpc86xx/start.S b/arch/ppc/cpu/mpc86xx/start.S
similarity index 100%
rename from cpu/mpc86xx/start.S
rename to arch/ppc/cpu/mpc86xx/start.S

diff --git a/cpu/mpc86xx/traps.c b/arch/ppc/cpu/mpc86xx/traps.c
similarity index 100%
rename from cpu/mpc86xx/traps.c
rename to arch/ppc/cpu/mpc86xx/traps.c

diff --git a/cpu/mpc8xx/Makefile b/arch/ppc/cpu/mpc8xx/Makefile
similarity index 100%
rename from cpu/mpc8xx/Makefile
rename to arch/ppc/cpu/mpc8xx/Makefile

diff --git a/cpu/mpc8xx/bedbug_860.c b/arch/ppc/cpu/mpc8xx/bedbug_860.c
similarity index 100%
rename from cpu/mpc8xx/bedbug_860.c
rename to arch/ppc/cpu/mpc8xx/bedbug_860.c

diff --git a/cpu/mpc8xx/commproc.c b/arch/ppc/cpu/mpc8xx/commproc.c
similarity index 100%
rename from cpu/mpc8xx/commproc.c
rename to arch/ppc/cpu/mpc8xx/commproc.c

diff --git a/cpu/mpc8xx/config.mk b/arch/ppc/cpu/mpc8xx/config.mk
similarity index 100%
rename from cpu/mpc8xx/config.mk
rename to arch/ppc/cpu/mpc8xx/config.mk

diff --git a/cpu/mpc8xx/cpu.c b/arch/ppc/cpu/mpc8xx/cpu.c
similarity index 100%
rename from cpu/mpc8xx/cpu.c
rename to arch/ppc/cpu/mpc8xx/cpu.c

diff --git a/cpu/mpc8xx/cpu_init.c b/arch/ppc/cpu/mpc8xx/cpu_init.c
similarity index 100%
rename from cpu/mpc8xx/cpu_init.c
rename to arch/ppc/cpu/mpc8xx/cpu_init.c

diff --git a/cpu/mpc8xx/fdt.c b/arch/ppc/cpu/mpc8xx/fdt.c
similarity index 100%
rename from cpu/mpc8xx/fdt.c
rename to arch/ppc/cpu/mpc8xx/fdt.c

diff --git a/cpu/mpc8xx/fec.c b/arch/ppc/cpu/mpc8xx/fec.c
similarity index 100%
rename from cpu/mpc8xx/fec.c
rename to arch/ppc/cpu/mpc8xx/fec.c

diff --git a/cpu/mpc8xx/fec.h b/arch/ppc/cpu/mpc8xx/fec.h
similarity index 100%
rename from cpu/mpc8xx/fec.h
rename to arch/ppc/cpu/mpc8xx/fec.h

diff --git a/cpu/mpc8xx/i2c.c b/arch/ppc/cpu/mpc8xx/i2c.c
similarity index 100%
rename from cpu/mpc8xx/i2c.c
rename to arch/ppc/cpu/mpc8xx/i2c.c

diff --git a/cpu/mpc8xx/interrupts.c b/arch/ppc/cpu/mpc8xx/interrupts.c
similarity index 100%
rename from cpu/mpc8xx/interrupts.c
rename to arch/ppc/cpu/mpc8xx/interrupts.c

diff --git a/cpu/mpc8xx/kgdb.S b/arch/ppc/cpu/mpc8xx/kgdb.S
similarity index 100%
rename from cpu/mpc8xx/kgdb.S
rename to arch/ppc/cpu/mpc8xx/kgdb.S

diff --git a/cpu/mpc8xx/lcd.c b/arch/ppc/cpu/mpc8xx/lcd.c
similarity index 100%
rename from cpu/mpc8xx/lcd.c
rename to arch/ppc/cpu/mpc8xx/lcd.c

diff --git a/cpu/mpc8xx/plprcr_write.S b/arch/ppc/cpu/mpc8xx/plprcr_write.S
similarity index 100%
rename from cpu/mpc8xx/plprcr_write.S
rename to arch/ppc/cpu/mpc8xx/plprcr_write.S

diff --git a/cpu/mpc8xx/scc.c b/arch/ppc/cpu/mpc8xx/scc.c
similarity index 100%
rename from cpu/mpc8xx/scc.c
rename to arch/ppc/cpu/mpc8xx/scc.c

diff --git a/cpu/mpc8xx/serial.c b/arch/ppc/cpu/mpc8xx/serial.c
similarity index 100%
rename from cpu/mpc8xx/serial.c
rename to arch/ppc/cpu/mpc8xx/serial.c

diff --git a/cpu/mpc8xx/speed.c b/arch/ppc/cpu/mpc8xx/speed.c
similarity index 100%
rename from cpu/mpc8xx/speed.c
rename to arch/ppc/cpu/mpc8xx/speed.c

diff --git a/cpu/mpc8xx/spi.c b/arch/ppc/cpu/mpc8xx/spi.c
similarity index 100%
rename from cpu/mpc8xx/spi.c
rename to arch/ppc/cpu/mpc8xx/spi.c

diff --git a/cpu/mpc8xx/start.S b/arch/ppc/cpu/mpc8xx/start.S
similarity index 100%
rename from cpu/mpc8xx/start.S
rename to arch/ppc/cpu/mpc8xx/start.S

diff --git a/cpu/mpc8xx/traps.c b/arch/ppc/cpu/mpc8xx/traps.c
similarity index 100%
rename from cpu/mpc8xx/traps.c
rename to arch/ppc/cpu/mpc8xx/traps.c

diff --git a/cpu/mpc8xx/upatch.c b/arch/ppc/cpu/mpc8xx/upatch.c
similarity index 100%
rename from cpu/mpc8xx/upatch.c
rename to arch/ppc/cpu/mpc8xx/upatch.c

diff --git a/cpu/mpc8xx/video.c b/arch/ppc/cpu/mpc8xx/video.c
similarity index 100%
rename from cpu/mpc8xx/video.c
rename to arch/ppc/cpu/mpc8xx/video.c

diff --git a/cpu/mpc8xx/wlkbd.c b/arch/ppc/cpu/mpc8xx/wlkbd.c
similarity index 100%
rename from cpu/mpc8xx/wlkbd.c
rename to arch/ppc/cpu/mpc8xx/wlkbd.c

diff --git a/cpu/mpc8xxx/Makefile b/arch/ppc/cpu/mpc8xxx/Makefile
similarity index 100%
rename from cpu/mpc8xxx/Makefile
rename to arch/ppc/cpu/mpc8xxx/Makefile

diff --git a/cpu/mpc8xxx/cpu.c b/arch/ppc/cpu/mpc8xxx/cpu.c
similarity index 95%
rename from cpu/mpc8xxx/cpu.c
rename to arch/ppc/cpu/mpc8xxx/cpu.c
index 47842e98da7a08e447154de663d8e2e7ff2511ad..fef062b224dd5f1b48df5c99d2fc80ef79d11dd9 100644 (file)
--- a/cpu/mpc8xxx/cpu.c
+++ b/arch/ppc/cpu/mpc8xxx/cpu.c
@@ -1,9 +1,9 @@
 /*
  * Copyright 2009-2010 Freescale Semiconductor, Inc.
  *
 /*
  * 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.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
  *

diff --git a/cpu/mpc8xxx/ddr/Makefile b/arch/ppc/cpu/mpc8xxx/ddr/Makefile
similarity index 100%
rename from cpu/mpc8xxx/ddr/Makefile
rename to arch/ppc/cpu/mpc8xxx/ddr/Makefile

diff --git a/cpu/mpc8xxx/ddr/common_timing_params.h b/arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h
similarity index 100%
rename from cpu/mpc8xxx/ddr/common_timing_params.h
rename to arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h

diff --git a/cpu/mpc8xxx/ddr/ctrl_regs.c b/arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c
similarity index 100%
rename from cpu/mpc8xxx/ddr/ctrl_regs.c
rename to arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c

diff --git a/cpu/mpc8xxx/ddr/ddr.h b/arch/ppc/cpu/mpc8xxx/ddr/ddr.h
similarity index 100%
rename from cpu/mpc8xxx/ddr/ddr.h
rename to arch/ppc/cpu/mpc8xxx/ddr/ddr.h

diff --git a/cpu/mpc8xxx/ddr/ddr1_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
similarity index 100%
rename from cpu/mpc8xxx/ddr/ddr1_dimm_params.c
rename to arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c

diff --git a/cpu/mpc8xxx/ddr/ddr2_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
similarity index 100%
rename from cpu/mpc8xxx/ddr/ddr2_dimm_params.c
rename to arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c

diff --git a/cpu/mpc8xxx/ddr/ddr3_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
similarity index 100%
rename from cpu/mpc8xxx/ddr/ddr3_dimm_params.c
rename to arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c

diff --git a/cpu/mpc8xxx/ddr/lc_common_dimm_params.c b/arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
similarity index 100%
rename from cpu/mpc8xxx/ddr/lc_common_dimm_params.c
rename to arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c

diff --git a/cpu/mpc8xxx/ddr/main.c b/arch/ppc/cpu/mpc8xxx/ddr/main.c
similarity index 100%
rename from cpu/mpc8xxx/ddr/main.c
rename to arch/ppc/cpu/mpc8xxx/ddr/main.c

diff --git a/cpu/mpc8xxx/ddr/options.c b/arch/ppc/cpu/mpc8xxx/ddr/options.c
similarity index 100%
rename from cpu/mpc8xxx/ddr/options.c
rename to arch/ppc/cpu/mpc8xxx/ddr/options.c

diff --git a/cpu/mpc8xxx/ddr/util.c b/arch/ppc/cpu/mpc8xxx/ddr/util.c
similarity index 100%
rename from cpu/mpc8xxx/ddr/util.c
rename to arch/ppc/cpu/mpc8xxx/ddr/util.c

diff --git a/cpu/mpc8xxx/fdt.c b/arch/ppc/cpu/mpc8xxx/fdt.c
similarity index 90%
rename from cpu/mpc8xxx/fdt.c
rename to arch/ppc/cpu/mpc8xxx/fdt.c
index 3a9b5841b6956e5e3bc89c564fdec5ae5d382c84..e68d6f336bb073f3a8d767a1831e16bd54d0e03f 100644 (file)
--- a/cpu/mpc8xxx/fdt.c
+++ b/arch/ppc/cpu/mpc8xxx/fdt.c
@@ -1,9 +1,9 @@
 /*
  * Copyright 2009 Freescale Semiconductor, Inc.
  *
 /*
  * 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.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
  *

diff --git a/cpu/mpc8xxx/pci_cfg.c b/arch/ppc/cpu/mpc8xxx/pci_cfg.c
similarity index 100%
rename from cpu/mpc8xxx/pci_cfg.c
rename to arch/ppc/cpu/mpc8xxx/pci_cfg.c

diff --git a/cpu/ppc4xx/40x_spd_sdram.c b/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
similarity index 99%
rename from cpu/ppc4xx/40x_spd_sdram.c
rename to arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
index 5e6dbe3331db1309df4bb70711d26407f4025a5f..595d5687d691d305241a1971f530bdcbf255a480 100644 (file)
--- a/cpu/ppc4xx/40x_spd_sdram.c
+++ b/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
@@ -1,5 +1,5 @@
 /*
 /*

- * cpu/ppc4xx/40x_spd_sdram.c
+ * arch/ppc/cpu/ppc4xx/40x_spd_sdram.c

  * This SPD SDRAM detection code supports IBM/AMCC PPC44x cpu with a
  * SDRAM controller. Those are all current 405 PPC's.
  *
  * This SPD SDRAM detection code supports IBM/AMCC PPC44x cpu with a
  * SDRAM controller. Those are all current 405 PPC's.
  *

diff --git a/cpu/ppc4xx/44x_spd_ddr.c b/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
similarity index 99%
rename from cpu/ppc4xx/44x_spd_ddr.c
rename to arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
index 6176eabfbfdcbc8813518bd6d7205126eff5e6d1..9d1994f99ec25fe89781edc450855979de0df494 100644 (file)
--- a/cpu/ppc4xx/44x_spd_ddr.c
+++ b/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
@@ -1,5 +1,5 @@
 /*
 /*

- * cpu/ppc4xx/44x_spd_ddr.c
+ * arch/ppc/cpu/ppc4xx/44x_spd_ddr.c

  * This SPD DDR detection code supports IBM/AMCC PPC44x cpu with a
  * DDR controller. Those are 440GP/GX/EP/GR.
  *
  * This SPD DDR detection code supports IBM/AMCC PPC44x cpu with a
  * DDR controller. Those are 440GP/GX/EP/GR.
  *

diff --git a/cpu/ppc4xx/44x_spd_ddr2.c b/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
similarity index 99%
rename from cpu/ppc4xx/44x_spd_ddr2.c
rename to arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
index 593a286919d1782a49dc5e51783a8ce24f1726ae..ea6c2ac770ac4f4fad12ae6544482e48020441ae 100644 (file)
--- a/cpu/ppc4xx/44x_spd_ddr2.c
+++ b/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
@@ -1,5 +1,5 @@
 /*
 /*

- * cpu/ppc4xx/44x_spd_ddr2.c
+ * arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c

  * This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
  * DDR2 controller (non Denali Core). Those currently are:
  *
  * This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
  * DDR2 controller (non Denali Core). Those currently are:
  *

diff --git a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
similarity index 99%
rename from cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
rename to arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
index 0283c91d84109a3533d8aa8a40a23201dea2f21d..72630716c962bd56bfa3c47c1462a51ed10c2b75 100644 (file)
--- a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+++ b/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
@@ -1,5 +1,5 @@
 /*
 /*

- * cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+ * arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c

  * This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
  * DDR2 controller (non Denali Core). Those currently are:
  *
  * This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
  * DDR2 controller (non Denali Core). Those currently are:
  *

diff --git a/cpu/ppc4xx/4xx_pci.c b/arch/ppc/cpu/ppc4xx/4xx_pci.c
similarity index 100%
rename from cpu/ppc4xx/4xx_pci.c
rename to arch/ppc/cpu/ppc4xx/4xx_pci.c

diff --git a/cpu/ppc4xx/4xx_pcie.c b/arch/ppc/cpu/ppc4xx/4xx_pcie.c
similarity index 100%
rename from cpu/ppc4xx/4xx_pcie.c
rename to arch/ppc/cpu/ppc4xx/4xx_pcie.c

diff --git a/cpu/ppc4xx/4xx_uart.c b/arch/ppc/cpu/ppc4xx/4xx_uart.c
similarity index 100%
rename from cpu/ppc4xx/4xx_uart.c
rename to arch/ppc/cpu/ppc4xx/4xx_uart.c

diff --git a/cpu/ppc4xx/Makefile b/arch/ppc/cpu/ppc4xx/Makefile
similarity index 100%
rename from cpu/ppc4xx/Makefile
rename to arch/ppc/cpu/ppc4xx/Makefile

diff --git a/cpu/ppc4xx/bedbug_405.c b/arch/ppc/cpu/ppc4xx/bedbug_405.c
similarity index 100%
rename from cpu/ppc4xx/bedbug_405.c
rename to arch/ppc/cpu/ppc4xx/bedbug_405.c

diff --git a/cpu/ppc4xx/cache.S b/arch/ppc/cpu/ppc4xx/cache.S
similarity index 100%
rename from cpu/ppc4xx/cache.S
rename to arch/ppc/cpu/ppc4xx/cache.S

diff --git a/cpu/ppc4xx/cmd_chip_config.c b/arch/ppc/cpu/ppc4xx/cmd_chip_config.c
similarity index 100%
rename from cpu/ppc4xx/cmd_chip_config.c
rename to arch/ppc/cpu/ppc4xx/cmd_chip_config.c

diff --git a/cpu/ppc4xx/commproc.c b/arch/ppc/cpu/ppc4xx/commproc.c
similarity index 100%
rename from cpu/ppc4xx/commproc.c
rename to arch/ppc/cpu/ppc4xx/commproc.c

diff --git a/cpu/ppc4xx/config.mk b/arch/ppc/cpu/ppc4xx/config.mk
similarity index 96%
rename from cpu/ppc4xx/config.mk
rename to arch/ppc/cpu/ppc4xx/config.mk
index c1de1e97e6c420dfdac36d1d660d5b2c50dae2c3..ea4d707842c835301452fb67530b1976c6ec4aaa 100644 (file)
--- a/cpu/ppc4xx/config.mk
+++ b/arch/ppc/cpu/ppc4xx/config.mk
@@ -34,4 +34,4 @@ PLATFORM_CPPFLAGS += -Wa,-m405 -mcpu=405
 endif
 
 # Use default linker script.  Board port can override in board/*/config.mk
 endif
 
 # Use default linker script.  Board port can override in board/*/config.mk

-LDSCRIPT := $(SRCTREE)/cpu/ppc4xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/ppc4xx/u-boot.lds

diff --git a/cpu/ppc4xx/cpu.c b/arch/ppc/cpu/ppc4xx/cpu.c
similarity index 100%
rename from cpu/ppc4xx/cpu.c
rename to arch/ppc/cpu/ppc4xx/cpu.c

diff --git a/cpu/ppc4xx/cpu_init.c b/arch/ppc/cpu/ppc4xx/cpu_init.c
similarity index 100%
rename from cpu/ppc4xx/cpu_init.c
rename to arch/ppc/cpu/ppc4xx/cpu_init.c

diff --git a/cpu/ppc4xx/dcr.S b/arch/ppc/cpu/ppc4xx/dcr.S
similarity index 100%
rename from cpu/ppc4xx/dcr.S
rename to arch/ppc/cpu/ppc4xx/dcr.S

diff --git a/cpu/ppc4xx/denali_data_eye.c b/arch/ppc/cpu/ppc4xx/denali_data_eye.c
similarity index 99%
rename from cpu/ppc4xx/denali_data_eye.c
rename to arch/ppc/cpu/ppc4xx/denali_data_eye.c
index ffc38174491f1531c5f0ee76d94557f6587fe2ee..15a9b4f3ecc9977883146adc46b489b2d409f5df 100644 (file)
--- a/cpu/ppc4xx/denali_data_eye.c
+++ b/arch/ppc/cpu/ppc4xx/denali_data_eye.c
@@ -1,5 +1,5 @@
 /*
 /*

- * cpu/ppc4xx/denali_data_eye.c
+ * arch/ppc/cpu/ppc4xx/denali_data_eye.c

  * Extracted from board/amcc/sequoia/sdram.c by Larry Johnson <lrj@acm.org>.
  *
  * (C) Copyright 2006
  * Extracted from board/amcc/sequoia/sdram.c by Larry Johnson <lrj@acm.org>.
  *
  * (C) Copyright 2006

diff --git a/cpu/ppc4xx/denali_spd_ddr2.c b/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
similarity index 99%
rename from cpu/ppc4xx/denali_spd_ddr2.c
rename to arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
index 5858cb36a5aa3444f1108eacd4777e5002c4423e..72f76cd2fa7abe75e4eb8c6788458606e12448dc 100644 (file)
--- a/cpu/ppc4xx/denali_spd_ddr2.c
+++ b/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
@@ -1,12 +1,12 @@
 /*
 /*

- * cpu/ppc4xx/denali_spd_ddr2.c
+ * arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c

  * This SPD SDRAM detection code supports AMCC PPC44x CPUs with a Denali-core
  * DDR2 controller, specifically the 440EPx/GRx.
  *
  * (C) Copyright 2007-2008
  * Larry Johnson, lrj@acm.org.
  *
  * This SPD SDRAM detection code supports AMCC PPC44x CPUs with a Denali-core
  * DDR2 controller, specifically the 440EPx/GRx.
  *
  * (C) Copyright 2007-2008
  * Larry Johnson, lrj@acm.org.
  *

- * Based primarily on cpu/ppc4xx/4xx_spd_ddr2.c, which is...
+ * Based primarily on arch/ppc/cpu/ppc4xx/4xx_spd_ddr2.c, which is...

  *
  * (C) Copyright 2007
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  *
  * (C) Copyright 2007
  * Stefan Roese, DENX Software Engineering, sr@denx.de.

diff --git a/cpu/ppc4xx/ecc.c b/arch/ppc/cpu/ppc4xx/ecc.c
similarity index 100%
rename from cpu/ppc4xx/ecc.c
rename to arch/ppc/cpu/ppc4xx/ecc.c

diff --git a/cpu/ppc4xx/ecc.h b/arch/ppc/cpu/ppc4xx/ecc.h
similarity index 100%
rename from cpu/ppc4xx/ecc.h
rename to arch/ppc/cpu/ppc4xx/ecc.h

diff --git a/cpu/ppc4xx/fdt.c b/arch/ppc/cpu/ppc4xx/fdt.c
similarity index 100%
rename from cpu/ppc4xx/fdt.c
rename to arch/ppc/cpu/ppc4xx/fdt.c

diff --git a/cpu/ppc4xx/gpio.c b/arch/ppc/cpu/ppc4xx/gpio.c
similarity index 100%
rename from cpu/ppc4xx/gpio.c
rename to arch/ppc/cpu/ppc4xx/gpio.c

diff --git a/cpu/ppc4xx/interrupts.c b/arch/ppc/cpu/ppc4xx/interrupts.c
similarity index 100%
rename from cpu/ppc4xx/interrupts.c
rename to arch/ppc/cpu/ppc4xx/interrupts.c

diff --git a/cpu/ppc4xx/iop480_uart.c b/arch/ppc/cpu/ppc4xx/iop480_uart.c
similarity index 100%
rename from cpu/ppc4xx/iop480_uart.c
rename to arch/ppc/cpu/ppc4xx/iop480_uart.c

diff --git a/cpu/ppc4xx/kgdb.S b/arch/ppc/cpu/ppc4xx/kgdb.S
similarity index 100%
rename from cpu/ppc4xx/kgdb.S
rename to arch/ppc/cpu/ppc4xx/kgdb.S

diff --git a/cpu/ppc4xx/miiphy.c b/arch/ppc/cpu/ppc4xx/miiphy.c
similarity index 100%
rename from cpu/ppc4xx/miiphy.c
rename to arch/ppc/cpu/ppc4xx/miiphy.c

diff --git a/cpu/ppc4xx/reginfo.c b/arch/ppc/cpu/ppc4xx/reginfo.c
similarity index 100%
rename from cpu/ppc4xx/reginfo.c
rename to arch/ppc/cpu/ppc4xx/reginfo.c

diff --git a/cpu/ppc4xx/resetvec.S b/arch/ppc/cpu/ppc4xx/resetvec.S
similarity index 100%
rename from cpu/ppc4xx/resetvec.S
rename to arch/ppc/cpu/ppc4xx/resetvec.S

diff --git a/cpu/ppc4xx/sdram.c b/arch/ppc/cpu/ppc4xx/sdram.c
similarity index 100%
rename from cpu/ppc4xx/sdram.c
rename to arch/ppc/cpu/ppc4xx/sdram.c

diff --git a/cpu/ppc4xx/sdram.h b/arch/ppc/cpu/ppc4xx/sdram.h
similarity index 100%
rename from cpu/ppc4xx/sdram.h
rename to arch/ppc/cpu/ppc4xx/sdram.h

diff --git a/cpu/ppc4xx/speed.c b/arch/ppc/cpu/ppc4xx/speed.c
similarity index 100%
rename from cpu/ppc4xx/speed.c
rename to arch/ppc/cpu/ppc4xx/speed.c

diff --git a/cpu/ppc4xx/start.S b/arch/ppc/cpu/ppc4xx/start.S
similarity index 100%
rename from cpu/ppc4xx/start.S
rename to arch/ppc/cpu/ppc4xx/start.S

diff --git a/cpu/ppc4xx/tlb.c b/arch/ppc/cpu/ppc4xx/tlb.c
similarity index 100%
rename from cpu/ppc4xx/tlb.c
rename to arch/ppc/cpu/ppc4xx/tlb.c

diff --git a/cpu/ppc4xx/traps.c b/arch/ppc/cpu/ppc4xx/traps.c
similarity index 100%
rename from cpu/ppc4xx/traps.c
rename to arch/ppc/cpu/ppc4xx/traps.c

diff --git a/cpu/ppc4xx/u-boot.lds b/arch/ppc/cpu/ppc4xx/u-boot.lds
similarity index 98%
rename from cpu/ppc4xx/u-boot.lds
rename to arch/ppc/cpu/ppc4xx/u-boot.lds
index 2b47934a2ef99b9ad0b5f3026d6414591f9b2aa7..3704d8a695ad9238d78d7f50ac626bc63eca4910 100644 (file)
--- a/cpu/ppc4xx/u-boot.lds
+++ b/arch/ppc/cpu/ppc4xx/u-boot.lds
@@ -124,7 +124,7 @@ SECTIONS
 #ifdef CONFIG_440
   .bootpg RESET_VECTOR_ADDRESS - 0xffc :
   {
 #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
 
     /*
      * PPC440 board need a board specific object with the

diff --git a/cpu/ppc4xx/uic.c b/arch/ppc/cpu/ppc4xx/uic.c
similarity index 100%
rename from cpu/ppc4xx/uic.c
rename to arch/ppc/cpu/ppc4xx/uic.c

diff --git a/cpu/ppc4xx/usb.c b/arch/ppc/cpu/ppc4xx/usb.c
similarity index 100%
rename from cpu/ppc4xx/usb.c
rename to arch/ppc/cpu/ppc4xx/usb.c

diff --git a/cpu/ppc4xx/usb_ohci.c b/arch/ppc/cpu/ppc4xx/usb_ohci.c
similarity index 100%
rename from cpu/ppc4xx/usb_ohci.c
rename to arch/ppc/cpu/ppc4xx/usb_ohci.c

diff --git a/cpu/ppc4xx/usb_ohci.h b/arch/ppc/cpu/ppc4xx/usb_ohci.h
similarity index 100%
rename from cpu/ppc4xx/usb_ohci.h
rename to arch/ppc/cpu/ppc4xx/usb_ohci.h

diff --git a/cpu/ppc4xx/usbdev.c b/arch/ppc/cpu/ppc4xx/usbdev.c
similarity index 100%
rename from cpu/ppc4xx/usbdev.c
rename to arch/ppc/cpu/ppc4xx/usbdev.c

diff --git a/cpu/ppc4xx/usbdev.h b/arch/ppc/cpu/ppc4xx/usbdev.h
similarity index 100%
rename from cpu/ppc4xx/usbdev.h
rename to arch/ppc/cpu/ppc4xx/usbdev.h

diff --git a/cpu/ppc4xx/xilinx_irq.c b/arch/ppc/cpu/ppc4xx/xilinx_irq.c
similarity index 100%
rename from cpu/ppc4xx/xilinx_irq.c
rename to arch/ppc/cpu/ppc4xx/xilinx_irq.c

diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
index d3929ea89f1ceb5bb87e189138fb644e4c3ab4d2..e26792cc2ff8b154c57bdc6dbc960cc79eacb80a 100644 (file)
--- 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   */
 
     /* 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)
     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 f6c21f745390fbc4d243cd88dbe5a9a8db9b25f6..707ff7a6b0196a5c0b6dc0cdad3006495515471b 100644 (file)
--- 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   */
 
     /* 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)
     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 18510a8e7e3985ece9bb71f34116350d05324a17..1f55c6571d14807e1fffe07d95e6e5152b054e21 100644 (file)
--- a/board/MAI/AmigaOneG3SE/u-boot.lds
+++ b/board/MAI/AmigaOneG3SE/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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)
 /* 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 d0213311488df9a72c1fb8a752e5b5cd9a9c5f81..6dff003dc1fb3f54de5ea94c268c07d669f5af3c 100644 (file)
--- a/board/Marvell/db64360/u-boot.lds
+++ b/board/Marvell/db64360/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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; */
 
 /* 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 d0213311488df9a72c1fb8a752e5b5cd9a9c5f81..6dff003dc1fb3f54de5ea94c268c07d669f5af3c 100644 (file)
--- a/board/Marvell/db64460/u-boot.lds
+++ b/board/Marvell/db64460/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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; */
 
 /* 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 09d9470f794324c35bb85a31fc9936960c840af1..f7de95dc8797b2c4bfc097f4becc2cac53fc8230 100644 (file)
--- 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   */
 
     /* 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)
     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 f559df71656bb6d2af028ec4bf268706916f1993..57cc3058686f84ade0bd96e32c1d6f5c0804c0b2 100644 (file)
--- 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   */
 
     /* 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)
     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 09d9470f794324c35bb85a31fc9936960c840af1..f7de95dc8797b2c4bfc097f4becc2cac53fc8230 100644 (file)
--- 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   */
 
     /* 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)
     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 f559df71656bb6d2af028ec4bf268706916f1993..57cc3058686f84ade0bd96e32c1d6f5c0804c0b2 100644 (file)
--- 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   */
 
     /* 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)
     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 a099cb9d58b8c48351cea515e8f71f3e3c8d096a..a2db9a6288e615234eb48a147b0fb3348fbbddb9 100644 (file)
--- 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   */
 
     /* 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)
     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 3b61a42561af308cdb92bc4b17d7916e01780bda..723f56291140ecae477aede1033130a90e043740 100644 (file)
--- 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   */
 
     /* 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)
     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 1132fd6eb5ddfad5981ec20349b044ed7617ee90..b323768fb0f2050f3a1cff97621e7ab91af3b4ba 100644 (file)
--- 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   */
 
     /* 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)
     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 397ee2f05334e8c93a5975e10e2e4de89afa1e95..018bcf1a26f6ba21bb840abae94b25939ff502ec 100644 (file)
--- a/board/adder/u-boot.lds
+++ b/board/adder/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt           : { *(.plt)           }
   .text          :
   {
   .plt           : { *(.plt)           }
   .text          :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     *(.text)
     *(.got1)
     . = ALIGN(16);
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/board/amcc/acadia/u-boot-nand.lds b/board/amcc/acadia/u-boot-nand.lds
index 738caa0c5fe6a7eaf58d9853cd40f3b22e33d25b..bfca582715e3e72fbaf81d9c99af0fb5abae5906 100644 (file)
--- 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   */
 
     /* 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);
 
     /* 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 738caa0c5fe6a7eaf58d9853cd40f3b22e33d25b..bfca582715e3e72fbaf81d9c99af0fb5abae5906 100644 (file)
--- 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   */
 
     /* 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);
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);

diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c
index 13a0daced774ae24ebeb579df73f0fb4633998f7..71a57019166f949f98f5bafd01a6542419fd4731 100644 (file)
--- a/board/amcc/canyonlands/canyonlands.c
+++ b/board/amcc/canyonlands/canyonlands.c
@@ -42,7 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define BOARD_ARCHES           4
 
 /*
 #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)
  * 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 47c6bd921135a2031653af318697d8561bccf598..b04b05e38af13b617291a10484f23097f492095f 100644 (file)
--- 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   */
 
     /* 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);
 
     /* Align to next NAND block */
     . = ALIGN(0x20000);

diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c
index 54e2a39aa14dd2cc9122b025619af8ba819ef996..15291f96b57a2811dae415657f47347545204c38 100644 (file)
--- 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) {
  * 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 738caa0c5fe6a7eaf58d9853cd40f3b22e33d25b..bfca582715e3e72fbaf81d9c99af0fb5abae5906 100644 (file)
--- 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   */
 
     /* 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);
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);

diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c
index 332d170d6129b742ca5a42184745a3bc9ff3b12f..6542565f08a3a886648d5fe2d977d0d35d801848 100644 (file)
--- 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) {
  * board specific values.
  */
 u32 ddr_clktr(u32 default_val) {

diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c
index bde471c2efc58d4add1bac37caa23cb8a098d208..b5c7d6d50634069cda4c19513be22e3f565126a9 100644 (file)
--- 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)
 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.
  */
  * 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 fb629e0c5e5c4c558cc558790ce6cf87ba3c5d1e..8a71bfa44ef5d77aca463e2444b660d85c763fa8 100644 (file)
--- 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   */
 
     /* 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);
 
     /* 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 e22dbecbf7b6784aa97a59b8be4eb00edb13396b..c6a321e400ece9df4ad36f2b72a3316842d80123 100644 (file)
--- a/board/amcc/sequoia/u-boot-ram.lds
+++ b/board/amcc/sequoia/u-boot-ram.lds
@@ -50,7 +50,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/ppc4xx/start.o (.text)
+    arch/ppc/cpu/ppc4xx/start.o        (.text)

 
     *(.text)
     *(.got1)
 
     *(.text)
     *(.got1)

diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c
index 8c65cfb6fe5e4528ce06291c6e5f1cce029de6d9..241f484491353ec67931fb1a3611e3f49823e3e7 100644 (file)
--- 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)
  * 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 89ffc6d2d09d23d76a1374b9747586fd94a18cd5..faeefe8bdde2b791cc07a3208c9251ccd7360ca1 100644 (file)
--- 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   */
 
     /* 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)
     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)
     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 51e95d555c13316ff7acd7f306842ac0e48d1116..5bd5a75c619a567a2ce9a1d71f61900db94ee134 100644 (file)
--- 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   */
 
     /* 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)
     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 d55bf33b88d476c8e35be45a2782ece94e99241f..e62f6be5aa58cc5829707ffd9625868e95f33540 100644 (file)
--- 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   */
 
     /* 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)
     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 5887f774e92fb6131e29e4787652b2e2f646010a..30a37d9fb24fd6aa67fcd2503e0a5735d0eb1fe3 100644 (file)
--- a/board/cm5200/u-boot.lds
+++ b/board/cm5200/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc5xxx/start.o        (.text)
+    arch/ppc/cpu/mpc5xxx/start.o       (.text)

     *(.text)
     *(.got1)
     . = ALIGN(16);
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug
index f559df71656bb6d2af028ec4bf268706916f1993..57cc3058686f84ade0bd96e32c1d6f5c0804c0b2 100644 (file)
--- 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   */
 
     /* 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)
     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 d6d65cf45cf9b30c6fd937c462c9de3b1380993d..5a00afe402c9377b0f32bd0298161313680ce9ac 100644 (file)
--- 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
        /*
         * 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();
 
         */
        sdram_init();
 

diff --git a/board/csb472/csb472.c b/board/csb472/csb472.c
index 20d34adfdd67c14f39f6cb75ba2952c8bbc185b3..996a67b4edc4ba559eb6fb48d73cb15cabfcbe01 100644 (file)
--- 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
        /*
         * 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();
 
         */
        sdram_init();
 

diff --git a/board/eltec/bab7xx/u-boot.lds b/board/eltec/bab7xx/u-boot.lds
index d0213311488df9a72c1fb8a752e5b5cd9a9c5f81..6dff003dc1fb3f54de5ea94c268c07d669f5af3c 100644 (file)
--- a/board/eltec/bab7xx/u-boot.lds
+++ b/board/eltec/bab7xx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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; */
 
 /* 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 d0213311488df9a72c1fb8a752e5b5cd9a9c5f81..6dff003dc1fb3f54de5ea94c268c07d669f5af3c 100644 (file)
--- a/board/eltec/elppc/u-boot.lds
+++ b/board/eltec/elppc/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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; */
 
 /* 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 5c847fbf84589f7c3cf2b970b3896926cd653d8e..dc370eacf22ecb6bafb2879887aa8b84a70cbb58 100644 (file)
--- a/board/eltec/mhpc/u-boot.lds
+++ b/board/eltec/mhpc/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     common/env_embedded.o(.text)
 
     *(.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 d55bf33b88d476c8e35be45a2782ece94e99241f..e62f6be5aa58cc5829707ffd9625868e95f33540 100644 (file)
--- 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   */
 
     /* 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)
     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 46dca96e60383c75d826f03d1beb1125b54f3947..3fb6d1269214743af69b734109196cdc1ac35f70 100644 (file)
--- a/board/emk/top860/u-boot.lds
+++ b/board/emk/top860/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

 
     *(.text)
     *(.got1)
 
     *(.text)
     *(.got1)

diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index 6ca72980e30ef8a034eb111e65a5ce1f81bb709a..3229a23a3eb7f0c3e127319c886c12a40e463dd5 100644 (file)
--- 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   */
 
     /* 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)
     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 70b84e4c8ac80c73757844563ca88864a159594e..f9579a6430265a4bb45b89854e46d6fa825a28a2 100644 (file)
--- a/board/ep88x/u-boot.lds
+++ b/board/ep88x/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt           : { *(.plt)           }
   .text          :
   {
   .plt           : { *(.plt)           }
   .text          :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     *(.text)
     *(.got1)
     . = ALIGN(16);
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/board/eric/eric.c b/board/eric/eric.c
index cfcfa525a9d86698f1fee45a75063033d67facb9..96c0b8385d43884bd8671497808b2085551c0ceb 100644 (file)
--- 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
        /*
         * 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();
 
         */
        sdram_init();
 

diff --git a/board/esd/cpci750/u-boot.lds b/board/esd/cpci750/u-boot.lds
index d0213311488df9a72c1fb8a752e5b5cd9a9c5f81..6dff003dc1fb3f54de5ea94c268c07d669f5af3c 100644 (file)
--- a/board/esd/cpci750/u-boot.lds
+++ b/board/esd/cpci750/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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; */
 
 /* 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 b044649ebf0fbcf484931111c709463aa0f5c30b..3d33d0f0222620718bafe3f10de6dd1f42b20f62 100644 (file)
--- a/board/esd/dasa_sim/u-boot.lds
+++ b/board/esd/dasa_sim/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/ppc4xx/start.o         (.text)
+    arch/ppc/cpu/ppc4xx/start.o                (.text)

 
     . = env_offset;
     common/env_embedded.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 fb629e0c5e5c4c558cc558790ce6cf87ba3c5d1e..8a71bfa44ef5d77aca463e2444b660d85c763fa8 100644 (file)
--- 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   */
 
     /* 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);
 
     /* Align to next NAND block */
     . = ALIGN(0x4000);

diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds
index 848eacdb2cd06cb85d576ed4bb027adff3cf5150..4490f19a1f0b313ff43f417c64aa88450062b5c8 100644 (file)
--- 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   */
 
     /* 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)
     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 d8112eb0a7417be7a201fa2ddb93c34a1639df1c..94b13422afba601a333acc35bfeaf0a946482e29 100644 (file)
--- 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   */
 
     /* 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)
     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 12f6ce7652a3312cefc987159cde790427d85153..458d4e076cdd693943ab8454edee4be8a5b062d4 100644 (file)
--- 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   */
 
     /* 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)
     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 d0213311488df9a72c1fb8a752e5b5cd9a9c5f81..6dff003dc1fb3f54de5ea94c268c07d669f5af3c 100644 (file)
--- a/board/evb64260/u-boot.lds
+++ b/board/evb64260/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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; */
 
 /* 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 ce3e32e0d5cb26e302c554e83d61aa673db427f0..d6476cdb7150b8d4365f7f8a9779f94e2ef412ba 100644 (file)
--- a/board/fads/u-boot.lds
+++ b/board/fads/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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)
 
     /*. = 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 4f179c7fa704729a5f64911c06b72f3ff56673a5..61c0d68d7814ba41e6bea6952d41d68ecdb7e178 100644 (file)
--- 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   */
 
     /* 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)
     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 877e82c84cd96568ea67111946f98e9c1d8265af..fbfba6ec9a17113379a1d3040de64673623a638c 100644 (file)
--- a/board/flagadm/u-boot.lds
+++ b/board/flagadm/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

 
     *(.text)
     *(.got1)
 
     *(.text)
     *(.got1)

diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug
index d55bf33b88d476c8e35be45a2782ece94e99241f..e62f6be5aa58cc5829707ffd9625868e95f33540 100644 (file)
--- 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   */
 
     /* 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)
     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 247779f6c22a235cae0177825056c0f46b6c9d84..c4266cec5047420b7b4cee0bc8c1884bfa7771cc 100644 (file)
--- a/board/freescale/mpc7448hpc2/u-boot.lds
+++ b/board/freescale/mpc7448hpc2/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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; */
 
 /* 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 67847f10600a8ecaf5efb6bb0f69fbddaf98dccc..1f9f8eb94914eff392bc8e61a47fc136fdc74193 100644 (file)
--- a/board/freescale/mpc8610hpcd/u-boot.lds
+++ b/board/freescale/mpc8610hpcd/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
   .plt : { *(.plt) }
   .text :
   {
   .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)
     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 20e03447fe72b47f99d54efa7cbf62e0924d0d79..d7c65ce21765212123320ab13f61c54d1e9aedbb 100644 (file)
--- a/board/freescale/mpc8641hpcn/u-boot.lds
+++ b/board/freescale/mpc8641hpcn/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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)
     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 d8c3006a6bda66caa16cdb1b0188bc918e5dd9f5..146573e1df7f2843de5409a9c91f951f45651d1a 100644 (file)
--- 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
 
 /*
  * 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)
 {
  */
 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 7b83b25b658c0f19281e07e54141e2d9e0b367fb..0e129253e7f9bf395cc6b6a85fd2b939af61f920 100644 (file)
--- a/board/gen860t/u-boot-flashenv.lds
+++ b/board/gen860t/u-boot-flashenv.lds
@@ -55,7 +55,7 @@ SECTIONS
   .plt           : { *(.plt)           }
   .text :
   {
   .plt           : { *(.plt)           }
   .text :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     *(.text)
     *(.got1)
   }
     *(.text)
     *(.got1)
   }

diff --git a/board/gen860t/u-boot.lds b/board/gen860t/u-boot.lds
index 8f40b303bf0eb6a2ddabfc4b70ded75ddb58ed1f..d184379dbc6cbc40761d46dfa0e7c28bb6d8fe41 100644 (file)
--- a/board/gen860t/u-boot.lds
+++ b/board/gen860t/u-boot.lds
@@ -54,7 +54,7 @@ SECTIONS
   .plt           : { *(.plt)           }
   .text :
   {
   .plt           : { *(.plt)           }
   .text :
   {

-    cpu/mpc8xx/start.o         (.text)
+    arch/ppc/cpu/mpc8xx/start.o                (.text)

     *(.text)
     *(.got1)
   }
     *(.text)
     *(.got1)
   }

diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 1bd1ba70c22e56575e4bd845eecc18626e5497e6..22ada9ae1d70bd0c4b0de1406a84c4a4087948ca 100644 (file)
--- 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   */
 
     /* 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)
     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 c0dd67f053b46c3d05985a7279d27ca7f7e5f065..e5aa625b5ca6870922f470d80f16e40a621b4e78 100644 (file)
--- 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   */
 
     /* 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)
     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 f6175d9d57096fd44d93a2a1a77ff8f37d4752ed..0e68e1414278ef82433a9a08b51e490353220529 100644 (file)
--- a/board/gth/u-boot.lds
+++ b/board/gth/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o(.text)
+    arch/ppc/cpu/mpc8xx/start.o(.text)

     *(.text)
     common/env_embedded.o(.text)
     *(.got1)
     *(.text)
     common/env_embedded.o(.text)
     *(.got1)

diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index 1f6e7d6c92f89eda2c68a149f38034899500b761..23e3e3bc5ea45d0f369b390c3e0becce64022b9d 100644 (file)
--- 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   */
 
     /* 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)
     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)
     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 dc810beaec789ca87e2206b0ff5e1b84e6f3a5f5..47e3927ec6e76c1d8290b72ffc5af028270e332a 100644 (file)
--- 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   */
 
     /* 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)
     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;
     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 4fe18316e5f654b83d8c4b688b1495c662b8175a..aebf30411e444aee07273fd7510f9977fd6d643c 100644 (file)
--- 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
 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 965716f7159795844e55fd6a5bbaa6c2f85d0345..7086ced3486f51a3a9502981b2c0b7b3651b7ae1 100644 (file)
--- 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   */
 
     /* 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)
 /*
     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 f559df71656bb6d2af028ec4bf268706916f1993..57cc3058686f84ade0bd96e32c1d6f5c0804c0b2 100644 (file)
--- 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   */
 
     /* 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)
     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 d7d0fb3dfc6bb611f2061a7d324d0caedd5d12db..d6837005f6ce70e7d67f15dfcbdc06eb5672a18b 100644 (file)
--- 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   */
 
     /* 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)
     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 282738bd59eb4570523a734335e181d149a8c5f4..b331d5afc1654f94049d9a4376a2ca0db6bb5b93 100644 (file)
--- 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   */
 
     /* 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)
     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 fc70efeeed4d8d112434a48073e2b3de819b28b5..761efa1d1723720eadfe783093cff19546f5c530 100644 (file)
--- 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
 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 bbc7139e532025a2bbe4aa6dde4460a8d9bc4ed1..d8560423734b8e36767d186302c40155c4720a6c 100644 (file)
--- 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   */
 
     /* 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)
     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)
 /**
     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 fc8fe6cec2b571e93ff8c11cde1e8601cd7fe4c1..dd39b9ac79dc2c1c1001faf992934b4e83e90856 100644 (file)
--- 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   */
 
     /* 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)
     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)
 /**
     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 8d7ff70117f0573b4968c39a7174ab7f6de6b94e..767408b52baca720f875e96d296666b2f6393e05 100644 (file)
--- a/board/ivm/u-boot.lds
+++ b/board/ivm/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     common/env_embedded.o(.text)
     *(.text)
     *(.got1)
     common/env_embedded.o(.text)
     *(.text)
     *(.got1)

diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug
index 037785e7dfabccdce264fe21230b00dea55e1b5c..5ec82f441ddff6fda7c9d10ac84197462d47384a 100644 (file)
--- 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   */
 
     /* 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)
     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 2e913adc55d87d11a3cbb63454996409bb13bd2d..ceddaf752e4e45c560db8e0e67ca62e357d8c8ac 100644 (file)
--- 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.
  *
  * (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.
  *
  * 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 9b93131f0c9dda6ed4a0a42d2fc41de2f54626d0..543deafb9ee402d25c424a271ec630d3d1fcca21 100644 (file)
--- 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.
  *
  * (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.
  *
  * 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 759072df97e0049bfb95402b3e8b6fcb35809f5a..19936bd4b18f926934576c09113973e7e35af2ad 100644 (file)
--- 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   */
 
     /* 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)
     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 34f04f56263df8d31e1b19777e07a21cb0ed4ec4..6b8e7eaf7e6caf72571b62d1da27faf063df4d3e 100644 (file)
--- 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.
  *
  * (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.
  *
  * 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 cbad8668e30ee9a609992e1426dbd3fa14001037..e483394539dd04e28a9bb147ccbd31f572695a23 100644 (file)
--- a/board/korat/u-boot-F7FC.lds
+++ b/board/korat/u-boot-F7FC.lds
@@ -33,7 +33,7 @@ SECTIONS
 
   .bootpg 0xF7FBF000 :
   {
 
   .bootpg 0xF7FBF000 :
   {

-    cpu/ppc4xx/start.o (.bootpg)
+    arch/ppc/cpu/ppc4xx/start.o        (.bootpg)

   } = 0xffff
 
   /* Read-only sections, merged into text segment: */
   } = 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   */
 
     /* 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)
 
     *(.text)
     *(.got1)

diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds
index e1233a748a7e5072fb7ce7dd7845b42b8c760a18..18cecaf51092d2196ad40c6a95a010ea889368e0 100644 (file)
--- 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   */
 
     /* 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)
     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 3b61a42561af308cdb92bc4b17d7916e01780bda..723f56291140ecae477aede1033130a90e043740 100644 (file)
--- 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   */
 
     /* 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)
     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 e1233a748a7e5072fb7ce7dd7845b42b8c760a18..18cecaf51092d2196ad40c6a95a010ea889368e0 100644 (file)
--- 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   */
 
     /* 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)
     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 3b61a42561af308cdb92bc4b17d7916e01780bda..723f56291140ecae477aede1033130a90e043740 100644 (file)
--- 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   */
 
     /* 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)
     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 50bdfb457f9699587c8a34e59ab0be8f86200ec6..160f5cf386d2ffc049ccec53d1220e81eac6ca51 100644 (file)
--- 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   */
 
     /* 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)
     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 be06235c04aa00e826776fed191878640cef2f13..172482f880d3d2411ba7b3ebbc00ab7b6cb2c92d 100644 (file)
--- 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   */
 
     /* 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)
     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 ba58e39346fdfbeca12d3122b520583658259d03..cfbad13478a6037750c22935aa561184b1a0f3d1 100644 (file)
--- 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
  *
  * 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 cc8ad7d3dbece98feb7c3dafa49f27eaf9d63f05..ff2f56640b382777f211d0d85994e9ee8d12f3b2 100644 (file)
--- a/board/lwmon/u-boot.lds
+++ b/board/lwmon/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     common/env_embedded.o(.text)
     *(.text)
     *(.got1)
     common/env_embedded.o(.text)
     *(.text)
     *(.got1)

diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug
index 251ee9bbdc248d984eae460d2049ab9c52ffafd1..fcf2cbb96d121e2a981937de5a47fa344244d9e9 100644 (file)
--- 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   */
 
     /* 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)
     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 dc3e580fb11f9461a533d673a7101a9168f325d4..3572f1ad322ba70a79a4735226760da5e8bbde32 100644 (file)
--- a/board/mbx8xx/u-boot.lds
+++ b/board/mbx8xx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

 
     *(.text)
     *(.got1)
 
     *(.text)
     *(.got1)

diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug
index 4f179c7fa704729a5f64911c06b72f3ff56673a5..61c0d68d7814ba41e6bea6952d41d68ecdb7e178 100644 (file)
--- 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   */
 
     /* 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)
     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 e68cfb81a3574f657a6ed6c14f49313a1a8db54b..e382283ea25e3d5ed0b12c43b5800384e37cf25e 100644 (file)
--- 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   */
 
     /* 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)
     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)
     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 f6930b538cc2e2ac1b41a8b89cb2c35bdd52d5e6..ed5492d45ed10db7832988d46cef652f857a7022 100644 (file)
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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)
     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 d048e52d35ad481038c8e578811801926574fe63..d3169489b5a3fe0460f6d253f3feb6aa5f242c6e 100644 (file)
--- a/board/mousse/u-boot.lds.ram
+++ b/board/mousse/u-boot.lds.ram
@@ -37,7 +37,7 @@ SECTIONS
   PROVIDE(_f_init_rom = .);
 
   .init : {
   PROVIDE(_f_init_rom = .);
 
   .init : {

-      cpu/mpc824x/start.o      (.text)
+      arch/ppc/cpu/mpc824x/start.o     (.text)

       *(.init)
   } > ram
   _init_size = SIZEOF(.init);
       *(.init)
   } > ram
   _init_size = SIZEOF(.init);

diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom
index 8355f335eed8f616f977fe67ea40717b1652da0b..2721fdc6f8a62134fd38e6db125d01400a018327 100644 (file)
--- a/board/mousse/u-boot.lds.rom
+++ b/board/mousse/u-boot.lds.rom
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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)
         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 90d9ce2c9c8df9445ddfc7dd8c0faac5d1790a60..4e9ee73e6a5ff4599d7095dc1a9bca86d69ceb71 100644 (file)
--- 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
 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 8db7f26a52b332b64839723e3041d636ca5ffc2f..2cd6d3c1ad44f38d55240e865309b60fdb2061e3 100644 (file)
--- a/board/munices/u-boot.lds
+++ b/board/munices/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc5xxx/start.o        (.text)
+    arch/ppc/cpu/mpc5xxx/start.o       (.text)

     *(.text)
     *(.got1)
     . = ALIGN(16);
     *(.text)
     *(.got1)
     . = ALIGN(16);

diff --git a/board/nc650/u-boot.lds b/board/nc650/u-boot.lds
index 21fed6262c73d3aaea5f0405e381a67761d8b35d..90ca165c44a216fada1f69e2cfa62efdc8da9101 100644 (file)
--- a/board/nc650/u-boot.lds
+++ b/board/nc650/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     *(.text)
     *(.got1)
   }
     *(.text)
     *(.got1)
   }

diff --git a/board/nc650/u-boot.lds.debug b/board/nc650/u-boot.lds.debug
index 5f8dc9d2c66d3903c5bacac96fc00e662a93b1a4..1405b1730b945c830e2eb85517aec3bd1e98131a 100644 (file)
--- a/board/nc650/u-boot.lds.debug
+++ b/board/nc650/u-boot.lds.debug
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     *(.text)
     *(.got1)
   }
     *(.text)
     *(.got1)
   }

diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index 8f96b1de6fdd5ca4ac3b9851bce2a96234b9ae0b..d6e2404f9a310b0ed6fb43038685402ad1beb8d0 100644 (file)
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
   .plt         : { *(.plt)             }
   .text        :
   {
   .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)
     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 139751177c0abe97d9971d67f814c5c3f4c1aa8b..ec479b1533e93d31c115721c45a89d99bc5fabb8 100644 (file)
--- 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   */
 
     /* 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)
     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 0a54f9aee1c12e8dd8e5b95098a43f9802ef8865..0be51925c10e4babef3f354bec45c8a6c20be079 100644 (file)
--- a/board/netstal/hcu5/README.txt
+++ b/board/netstal/hcu5/README.txt
@@ -83,11 +83,11 @@ System-LEDs ??? (Analog zu HCU4 ???)
 Startup sequence
 ----------------
 
 Startup sequence
 ----------------
 

-(cpu/ppc4xx/resetvec.S)
+(arch/ppc/cpu/ppc4xx/resetvec.S)

 depending on configs option
 call _start_440 _start_pci oder _start
 
 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
 
 _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
         *  - 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
 -------------------------------------------------------
 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
        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
            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/*
 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
 
 arch/ppc/lib/*
 include/ppc440.h
 

diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index ff11ad0f69ad06580777b41e76747faa8cda55d8..c4df378c978c433342b8d291f8d49dd507f95484 100644 (file)
--- a/board/netta/u-boot.lds
+++ b/board/netta/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
   .plt         : { *(.plt)             }
   .text        :
   {
   .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)
     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 139751177c0abe97d9971d67f814c5c3f4c1aa8b..ec479b1533e93d31c115721c45a89d99bc5fabb8 100644 (file)
--- 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   */
 
     /* 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)
     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 ff11ad0f69ad06580777b41e76747faa8cda55d8..c4df378c978c433342b8d291f8d49dd507f95484 100644 (file)
--- a/board/netta2/u-boot.lds
+++ b/board/netta2/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
   .plt         : { *(.plt)             }
   .text        :
   {
   .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)
     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 139751177c0abe97d9971d67f814c5c3f4c1aa8b..ec479b1533e93d31c115721c45a89d99bc5fabb8 100644 (file)
--- 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   */
 
     /* 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)
     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 70d5a6a0dfb88670623cdfc0ad9d93b35100a962..6683361ea42cddfd9bf903590bee6d5e9bc0c842 100644 (file)
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
   .plt         : { *(.plt)             }
   .text        :
   {
   .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)
     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 bc8f32e0f8a25763f0eb7407c2c84d1ce21ad78f..cef1a428bd077788d220921929f862439723ef0d 100644 (file)
--- 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   */
 
     /* 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)
     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 5c847fbf84589f7c3cf2b970b3896926cd653d8e..dc370eacf22ecb6bafb2879887aa8b84a70cbb58 100644 (file)
--- a/board/nx823/u-boot.lds
+++ b/board/nx823/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     common/env_embedded.o(.text)
 
     *(.text)
     common/env_embedded.o(.text)
 
     *(.text)

diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug
index d55bf33b88d476c8e35be45a2782ece94e99241f..e62f6be5aa58cc5829707ffd9625868e95f33540 100644 (file)
--- 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   */
 
     /* 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)
     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 d11bb056fb8f3d0f8be0687b257b8139db1e5864..b2be32812494fb7dc0bc135c16e2101e9c166b4c 100644 (file)
--- a/board/pcippc2/u-boot.lds
+++ b/board/pcippc2/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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; */
 
 /* 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 ce1e616679f49fa77f792c61b5a072d32e702ef4..bed385c44b8088b67b8f63423979d5718868fd30 100644 (file)
--- 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 */
 
        /*--------------------------------------------------------------------
        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.
         *-------------------------------------------------------------------*/
 
         * via define from board config file.
         *-------------------------------------------------------------------*/
 

diff --git a/board/ppmc7xx/u-boot.lds b/board/ppmc7xx/u-boot.lds
index 30e8972afabf8fa3921c210c813f69e69abfa523..aae105716039a56225f78f54b8f06c3ba7220bc5 100644 (file)
--- a/board/ppmc7xx/u-boot.lds
+++ b/board/ppmc7xx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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; */
 
 /* 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 d0213311488df9a72c1fb8a752e5b5cd9a9c5f81..6dff003dc1fb3f54de5ea94c268c07d669f5af3c 100644 (file)
--- a/board/prodrive/p3mx/u-boot.lds
+++ b/board/prodrive/p3mx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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; */
 
 /* 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 09d9470f794324c35bb85a31fc9936960c840af1..f7de95dc8797b2c4bfc097f4becc2cac53fc8230 100644 (file)
--- 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   */
 
     /* 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)
     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 dcad818927516e697bfe8f8ac8e5ee160e8da99b..a2b7bc70d9e5f42903cb9904ad848a650286bf40 100644 (file)
--- 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   */
 
     /* 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)
     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 9089f7d6b6ef2a5d24c8b7cdb5001a56d057b6ab..4fc18fcf2d9d3b3e141f6d7b73b33379e09781c8 100644 (file)
--- 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   */
 
     /* 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)
 /***
     . = env_offset;
     common/env_embedded.o      (.text)

diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index 15aca6c62344bfc41b6d1748804f63898f3377fd..2161501fff954a6eccf43785cb9a2a8407c174fd 100644 (file)
--- 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   */
 
     /* 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)
     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 09d9470f794324c35bb85a31fc9936960c840af1..f7de95dc8797b2c4bfc097f4becc2cac53fc8230 100644 (file)
--- 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   */
 
     /* 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)
     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 dcad818927516e697bfe8f8ac8e5ee160e8da99b..a2b7bc70d9e5f42903cb9904ad848a650286bf40 100644 (file)
--- 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   */
 
     /* 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)
     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 0d4a9efb79a41598aadf365d928bc094528c3f18..0c51d481277753ae1bd9704922f164613858a79f 100644 (file)
--- a/board/rsdproto/u-boot.lds
+++ b/board/rsdproto/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8260/start.o        (.text)
+    arch/ppc/cpu/mpc8260/start.o       (.text)

     *(.text)
     *(.got1)
     /*. = env_offset; */
     *(.text)
     *(.got1)
     /*. = env_offset; */

diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c
index dbc0cee7588130edac9418c4d0aa6991b59837c2..007f875f0ff6a1648d2cce02f9a0f5b9c9cb89c2 100644 (file)
--- 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.
  */
  * Travis B. Sawyer
  * Sandburst Corporation.
  */

diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
index 34dce838f178358766075cd076cd2b29fcac7151..c1743985378c3207f0fadcdbbcf998d087a03390 100644 (file)
--- 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   */
 
     /* 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)
     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)
     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 fa976c2e5d4eabcc029f3e6dba7f392851a4414a..845841607c121c8d36e2a6f8516b0df39160e8f6 100644 (file)
--- 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   */
 
     /* 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)
     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)
     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 7f0412464f6cbc5d7e17f910350578a0267f5344..2f8730bf2bb0847a482d4236dd317855d500fc13 100644 (file)
--- a/board/sbc8641d/u-boot.lds
+++ b/board/sbc8641d/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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)
     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 fc7464eeeaa7c71be68649fa022a38bb4b542e86..573fbee937a5b7a6187bf2f4ab7a2563c7424a53 100644 (file)
--- 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   */
 
     /* 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)
     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)
     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 51e95d555c13316ff7acd7f306842ac0e48d1116..5bd5a75c619a567a2ce9a1d71f61900db94ee134 100644 (file)
--- 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   */
 
     /* 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)
     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 2a6abfab3fcdcc1ac11ac1395eff92711c617b7d..460a98321535207bab000356d0c30ff07ca4d0e9 100644 (file)
--- 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   */
 
     /* 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)
     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 877cf9ae01608466e7a4de9165de6e281ed0413f..904d45fccc5aed82b59b46187d63e79ba3e482f3 100644 (file)
--- 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   */
 
     /* 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)
     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)
     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 cc8ad7d3dbece98feb7c3dafa49f27eaf9d63f05..ff2f56640b382777f211d0d85994e9ee8d12f3b2 100644 (file)
--- a/board/siemens/pcu_e/u-boot.lds
+++ b/board/siemens/pcu_e/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     common/env_embedded.o(.text)
     *(.text)
     *(.got1)
     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 251ee9bbdc248d984eae460d2049ab9c52ffafd1..fcf2cbb96d121e2a981937de5a47fa344244d9e9 100644 (file)
--- 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   */
 
     /* 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)
     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 dd632a44cea72160ff37c8551f84a441fd89547e..c3e7f501cb7a26a09f6bc77e30745d26a39ff85a 100644 (file)
--- a/board/sixnet/u-boot.lds
+++ b/board/sixnet/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     common/env_embedded.o(.text)
     *(.text)
     *(.got1)
     common/env_embedded.o(.text)
     *(.text)
     *(.got1)

diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds
index 271d74a5c135811e8d25aec5bea6aecebd6d8687..f2154c429b0c47df64a2918907d752474d9d8e74 100644 (file)
--- 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   */
 
     /* 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)
        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 271d74a5c135811e8d25aec5bea6aecebd6d8687..f2154c429b0c47df64a2918907d752474d9d8e74 100644 (file)
--- 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   */
 
     /* 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)
        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 f95f695b131eb5203e4a723f8087946897c12a69..c000746c54fc2deae4398f342e95d72c887b8d42 100644 (file)
--- 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   */
 
     /* 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)
     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 7b9455b25289221add2738ff80b2b343c842caf2..c4d83574d6903f6f7724799534169ecdced9e2ee 100644 (file)
--- a/board/spd8xx/u-boot.lds
+++ b/board/spd8xx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .plt : { *(.plt) }
   .text      :
   {

-    cpu/mpc8xx/start.o (.text)
+    arch/ppc/cpu/mpc8xx/start.o        (.text)

     common/env_embedded.o(.text)
     *(.text)
     *(.got1)
     common/env_embedded.o(.text)
     *(.text)
     *(.got1)

diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug
index 4f179c7fa704729a5f64911c06b72f3ff56673a5..61c0d68d7814ba41e6bea6952d41d68ecdb7e178 100644 (file)
--- 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   */
 
     /* 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)
     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 ff11ad0f69ad06580777b41e76747faa8cda55d8..c4df378c978c433342b8d291f8d49dd507f95484 100644 (file)
--- a/board/stx/stxxtc/u-boot.lds
+++ b/board/stx/stxxtc/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
   .plt         : { *(.plt)             }
   .text        :
   {
   .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)
     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 139751177c0abe97d9971d67f814c5c3f4c1aa8b..ec479b1533e93d31c115721c45a89d99bc5fabb8 100644 (file)
--- 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   */
 
     /* 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)
     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 6de74887ce633448df1c3187be4616321bcaad01..90270954e44d489658897eadea608a87859f74bd 100644 (file)
--- 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   */
 
     /* 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)
     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 dcad818927516e697bfe8f8ac8e5ee160e8da99b..a2b7bc70d9e5f42903cb9904ad848a650286bf40 100644 (file)
--- 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   */
 
     /* 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)
     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 ceaac000540f8198c9172b0ed2de40ed711d3361..a2277c260d6539c2ac11429920faa473798db283 100644 (file)
--- 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   */
 
     /* 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)
     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 f559df71656bb6d2af028ec4bf268706916f1993..57cc3058686f84ade0bd96e32c1d6f5c0804c0b2 100644 (file)
--- 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   */
 
     /* 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)
     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 960b2a582bb54a836ffc9beab5ffcaf12078cf53..f67b1d9c1970f4205edaca3a205cae671e8c8be6 100644 (file)
--- 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   */
 
     /* 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)
     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 116a97208dae258b88722a0456d406921812dc5e..84b338a75de79bee7547fa49045a7ab84fd134e2 100644 (file)
--- 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   */
 
     /* 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)
     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 4fe18316e5f654b83d8c4b688b1495c662b8175a..aebf30411e444aee07273fd7510f9977fd6d643c 100644 (file)
--- 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
 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 248f4887cc9137548192d3708e6218e40f6e3ec0..bc47060f254e9530566c0a32d61057f6eea343c8 100644 (file)
--- 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   */
 
     /* 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)
     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 a818808ba08e794eb862ca3c7aa330876176d535..96a12d73e5f1f522098b596e0792f2fe8bcfb8d3 100644 (file)
--- 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
        /*
         * 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();
 
         */
        sdram_init();
 

diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds
index 51e95d555c13316ff7acd7f306842ac0e48d1116..5bd5a75c619a567a2ce9a1d71f61900db94ee134 100644 (file)
--- 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   */
 
     /* 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)
     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 282738bd59eb4570523a734335e181d149a8c5f4..b331d5afc1654f94049d9a4376a2ca0db6bb5b93 100644 (file)
--- 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   */
 
     /* 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)
     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 555e1ac0321606455c4c026c6dec61b8c8afb496..c3f6fefb45c907d261095f8556996d2d88fd28a1 100644 (file)
--- 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   */
 
     /* 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)
     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)
     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 7f0412464f6cbc5d7e17f910350578a0267f5344..2f8730bf2bb0847a482d4236dd317855d500fc13 100644 (file)
--- a/board/xes/xpedite5170/u-boot.lds
+++ b/board/xes/xpedite5170/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
   .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)
     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 02044e43d5fb7c45bfafe2da078f6f79aaff38c8..8fafbd59c03bf96afef43db8bcd5873777a84a52 100644 (file)
--- 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 :
   {
 
   .bootpg 0xFFFFF000 :
   {

-    cpu/ppc4xx/start.o (.bootpg)
+    arch/ppc/cpu/ppc4xx/start.o        (.bootpg)

   } = 0xffff
 
   /* Read-only sections, merged into text segment: */
   } = 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 57c809e4cb4cc78cdb9a4b46fcdd2a74c1660369..0cbed8ea57365968d22f39b09c6118466bcb1590 100644 (file)
--- 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 :
   {
 
   .bootpg 0xFFFFF000 :
   {

-    cpu/ppc4xx/start.o (.bootpg)
+    arch/ppc/cpu/ppc4xx/start.o        (.bootpg)

   } = 0xffff
 
   /* Read-only sections, merged into text segment: */
   } = 0xffff
 
   /* Read-only sections, merged into text segment: */

diff --git a/config.mk b/config.mk
index 85b524eada7fdfd01872d04cbc438cdc37567429..73b5195cb639370fc32884d76d89ba4ea3e9679e 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -112,7 +112,12 @@ sinclude $(OBJTREE)/include/autoconf.mk
 
 # Some architecture config.mk files need to know what CPUDIR is set to,
 # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files.
 
 # Some architecture config.mk files need to know what CPUDIR is set to,
 # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files.

-CPUDIR=cpu/$(CPU)
+# Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains
+# CPU-specific code.
+CPUDIR=arch/$(ARCH)/cpu/$(CPU)
+ifneq ($(SRCTREE)/$(CPUDIR),$(wildcard $(SRCTREE)/$(CPUDIR)))
+CPUDIR=arch/$(ARCH)/cpu
+endif

 
 sinclude $(TOPDIR)/arch/$(ARCH)/config.mk      # include architecture dependend rules
 sinclude $(TOPDIR)/$(CPUDIR)/config.mk         # include  CPU  specific rules
 
 sinclude $(TOPDIR)/arch/$(ARCH)/config.mk      # include architecture dependend rules
 sinclude $(TOPDIR)/$(CPUDIR)/config.mk         # include  CPU  specific rules

diff --git a/doc/README.PIP405 b/doc/README.PIP405
index d8b3f9c01205d90ae369e7326cce9030e067a35c..e8a654128d0aa233cff17389147dc955edf5e9e7 100644 (file)
--- a/doc/README.PIP405
+++ b/doc/README.PIP405
@@ -17,11 +17,11 @@ Changed files:
                                added console settings from environment
 - common/devices.c             added ISA keyboard init
 - common/main.c                        corrected the read of bootdelay
                                added console settings from environment
 - common/devices.c             added ISA keyboard init
 - common/main.c                        corrected the read of bootdelay

-- cpu/ppc4xx/405gp_pci.c       excluded file from PIP405
-- cpu/ppc4xx/i2c.c             added 16bit read write I2C support
+- arch/ppc/cpu/ppc4xx/405gp_pci.c      excluded file from PIP405
+- arch/ppc/cpu/ppc4xx/i2c.c            added 16bit read write I2C support

                                added page write
                                added page write

-- cpu/ppc4xx/speed.c           added get_PCI_freq
-- cpu/ppc4xx/start.S           added CONFIG_IDENT_STRING
+- arch/ppc/cpu/ppc4xx/speed.c          added get_PCI_freq
+- arch/ppc/cpu/ppc4xx/start.S          added CONFIG_IDENT_STRING

 - disk/Makefile                        added part_iso for CD support
 - disk/part.c                  changed to work with block device description
                                added ISO CD support
 - disk/Makefile                        added part_iso for CD support
 - disk/part.c                  changed to work with block device description
                                added ISO CD support


@@ -275,7 +275,7 @@ Added the config variable CONFIG_IDENT_STRING which will be added to the
 "U_BOOT_VERSION __TIME__ DATE___ " String, to allows to identify intermidiate
 and custom versions.
 Changed files:
 "U_BOOT_VERSION __TIME__ DATE___ " String, to allows to identify intermidiate
 and custom versions.
 Changed files:

-- cpu/ppc4xx/start.s
+- arch/ppc/cpu/ppc4xx/start.s

 
 Firmware Image:
 ---------------
 
 Firmware Image:
 ---------------


@@ -288,11 +288,11 @@ Changed files:
 
 Correct PCI Frequency for PPC405:
 ---------------------------------
 
 Correct PCI Frequency for PPC405:
 ---------------------------------

-Added function (in cpu/ppc4xx/speed.c) to get the PCI frequency for PPC405 CPU.
+Added function (in arch/ppc/cpu/ppc4xx/speed.c) to get the PCI frequency for PPC405 CPU.

 The PCI Frequency will now be set correct in the board description in common/board.c.
 (was set to the busfreq before).
 Changed files:
 The PCI Frequency will now be set correct in the board description in common/board.c.
 (was set to the busfreq before).
 Changed files:

-- cpu/ppc4xx/speed.c
+- arch/ppc/cpu/ppc4xx/speed.c

 - common/board.c
 
 I2C Stuff:
 - common/board.c
 
 I2C Stuff:


@@ -301,7 +301,7 @@ Added defined(CONFIG_PIP405) at several points in common/cmd_i2c.c.
 Added 16bit read/write support for I2C (PPC405), and page write to
 I2C EEPROM if defined CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE.
 Changed files:
 Added 16bit read/write support for I2C (PPC405), and page write to
 I2C EEPROM if defined CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE.
 Changed files:

-- cpu/ppc4xx/i2c.c
+- arch/ppc/cpu/ppc4xx/i2c.c

 - common/cmd_i2c.c
 
 Environment / Console:
 - common/cmd_i2c.c
 
 Environment / Console:

diff --git a/doc/README.POST b/doc/README.POST
index a81e07926dbd236fa5ce1346f23d34301f59d079..0d5e20e9773d852cc63a5001dd6b86094239b141 100644 (file)
--- a/doc/README.POST
+++ b/doc/README.POST
@@ -713,7 +713,7 @@ use external loopback for testing. That will need appropriate
 reconfiguration of the physical interface chip.
 
 The test routines for the SCC ethernet tests will be located in
 reconfiguration of the physical interface chip.
 
 The test routines for the SCC ethernet tests will be located in

-cpu/mpc8xx/scc.c.
+arch/ppc/cpu/mpc8xx/scc.c.

 
 2.2.3.2. UART tests (SMC/SCC)
 
 
 2.2.3.2. UART tests (SMC/SCC)
 


@@ -725,7 +725,7 @@ will be transmitted. These tests may be enhanced to make to perform
 test will be executed manually.
 
 The test routine for the SMC/SCC UART tests will be located in
 test will be executed manually.
 
 The test routine for the SMC/SCC UART tests will be located in

-cpu/mpc8xx/serial.c.
+arch/ppc/cpu/mpc8xx/serial.c.

 
 2.2.3.3. USB test
 
 
 2.2.3.3. USB test
 

diff --git a/doc/README.RPXlite b/doc/README.RPXlite
index c0238ae21310cb4fc6739ec06f92cf1fe365e00c..0aa4d11303bdad2801211dacd0eddc7dfb7ddbd6 100644 (file)
--- a/doc/README.RPXlite
+++ b/doc/README.RPXlite
@@ -116,7 +116,7 @@
        board/RPXLITE/RPXLITE.c         /* DRAM-related routines */
        board/RPXLITE/flash.c           /* flash-related routines */
        board/RPXLITE/config.mk         /* set text base address */
        board/RPXLITE/RPXLITE.c         /* DRAM-related routines */
        board/RPXLITE/flash.c           /* flash-related routines */
        board/RPXLITE/config.mk         /* set text base address */

-       cpu/mpc8xx/serial.c                     /* board specific register setting */
+       arch/ppc/cpu/mpc8xx/serial.c                    /* board specific register setting */

        include/config_RPXLITE.h        /* board specific registers */
 
        See 'reg_config.txt' for register values in detail.
        include/config_RPXLITE.h        /* board specific registers */
 
        See 'reg_config.txt' for register values in detail.

diff --git a/doc/README.TQM8260 b/doc/README.TQM8260
index b93a1cb948ec1a792f0d0834cea2a3abed0976dc..e64e64a3e2ef3b10bb3d776318cf691c34da6d09 100644 (file)
--- a/doc/README.TQM8260
+++ b/doc/README.TQM8260
@@ -14,10 +14,10 @@ The following common files have been modified by this project:
 
 MAKEALL                        - TQM8260 entry added
 Makefile               - TQM8260_config entry added
 
 MAKEALL                        - TQM8260 entry added
 Makefile               - TQM8260_config entry added

-cpu/mpc8260/Makefile   - soft_i2c.o module added
-cpu/mpc8260/ether_scc.c        - TQM8260-specific definitions added, an obvious
+arch/ppc/cpu/mpc8260/Makefile  - soft_i2c.o module added
+arch/ppc/cpu/mpc8260/ether_scc.c       - TQM8260-specific definitions added, an obvious

                          bug fixed (fcr -> scr)
                          bug fixed (fcr -> scr)

-cpu/mpc8260/ether_fcc.c        - TQM8260-specific definitions added
+arch/ppc/cpu/mpc8260/ether_fcc.c       - TQM8260-specific definitions added

 include/flash.h                - added definitions for the AM29LV640D Flash chip
 
 
 include/flash.h                - added definitions for the AM29LV640D Flash chip
 
 


@@ -33,7 +33,7 @@ board/tqm8260/config.mk         - config file
 board/tqm8260/flash.c    - flash driver (for AM29LV640D)
 board/tqm8260/ppcboot.lds - linker script
 board/tqm8260/tqm8260.c          - ioport and memory initialization
 board/tqm8260/flash.c    - flash driver (for AM29LV640D)
 board/tqm8260/ppcboot.lds - linker script
 board/tqm8260/tqm8260.c          - ioport and memory initialization

-cpu/mpc8260/soft_i2c.c   - software i2c EEPROM driver
+arch/ppc/cpu/mpc8260/soft_i2c.c          - software i2c EEPROM driver

 include/config_TQM8260.h  - main configuration file
 
 
 include/config_TQM8260.h  - main configuration file
 
 

diff --git a/doc/README.alaska8220 b/doc/README.alaska8220
index 279dac69f5ce97f6381d011f30700143a25650bb..9249cfb31e07a37e4333568a58336f1987fa86b4 100644 (file)
--- a/doc/README.alaska8220
+++ b/doc/README.alaska8220
@@ -37,24 +37,24 @@ Added files:
 - board/alaska/config.mk    config make
 - board/alaska/u-boot.lds   Linker description
 
 - board/alaska/config.mk    config make
 - board/alaska/u-boot.lds   Linker description
 

-- cpu/mpc8220/dma.h        multi-channel dma header file
-- cpu/mpc8220/dramSetup.h   dram setup header file
-- cpu/mpc8220/fec.h        MPC8220 FEC header file
-- cpu/mpc8220/cpu.c        cpu specific code
-- cpu/mpc8220/cpu_init.c    Flexbus ChipSelect and Mux pins setup
-- cpu/mpc8220/dramSetup.c   MPC8220 DDR SDRAM setup
-- cpu/mpc8220/fec.c        MPC8220 FEC driver
-- cpu/mpc8220/i2c.c        MPC8220 I2C driver
-- cpu/mpc8220/interrupts.c  interrupt support (not enable)
-- cpu/mpc8220/loadtask.c    load dma
-- cpu/mpc8220/speed.c      system, pci, flexbus, pev, and cpu clock
-- cpu/mpc8220/traps.c      exception
-- cpu/mpc8220/uart.c       MPC8220 UART driver
-- cpu/mpc8220/Makefile     Makefile
-- cpu/mpc8220/config.mk            config make
-- cpu/mpc8220/fec_dma_task.S MPC8220 FEC multi-channel dma program
-- cpu/mpc8220/io.S         io functions
-- cpu/mpc8220/start.S      start up
+- arch/ppc/cpu/mpc8220/dma.h       multi-channel dma header file
+- arch/ppc/cpu/mpc8220/dramSetup.h   dram setup header file
+- arch/ppc/cpu/mpc8220/fec.h       MPC8220 FEC header file
+- arch/ppc/cpu/mpc8220/cpu.c       cpu specific code
+- arch/ppc/cpu/mpc8220/cpu_init.c    Flexbus ChipSelect and Mux pins setup
+- arch/ppc/cpu/mpc8220/dramSetup.c   MPC8220 DDR SDRAM setup
+- arch/ppc/cpu/mpc8220/fec.c       MPC8220 FEC driver
+- arch/ppc/cpu/mpc8220/i2c.c       MPC8220 I2C driver
+- arch/ppc/cpu/mpc8220/interrupts.c  interrupt support (not enable)
+- arch/ppc/cpu/mpc8220/loadtask.c    load dma
+- arch/ppc/cpu/mpc8220/speed.c     system, pci, flexbus, pev, and cpu clock
+- arch/ppc/cpu/mpc8220/traps.c     exception
+- arch/ppc/cpu/mpc8220/uart.c      MPC8220 UART driver
+- arch/ppc/cpu/mpc8220/Makefile            Makefile
+- arch/ppc/cpu/mpc8220/config.mk           config make
+- arch/ppc/cpu/mpc8220/fec_dma_task.S MPC8220 FEC multi-channel dma program
+- arch/ppc/cpu/mpc8220/io.S        io functions
+- arch/ppc/cpu/mpc8220/start.S     start up

 
 - include/mpc8220.h
 
 
 - include/mpc8220.h
 

diff --git a/doc/README.bedbug b/doc/README.bedbug
index 2616acc65321bf9be4e41fec88bd307688b4a5a9..4c1e6c4d5ba2f021128955350bc60b06af9be1dc 100644 (file)
--- a/doc/README.bedbug
+++ b/doc/README.bedbug
@@ -18,15 +18,15 @@ can be easily implemented.
 ./common/board.c
        Added call to initialize debugger on startup.
 
 ./common/board.c
        Added call to initialize debugger on startup.
 

-./cpu/ppc4xx/Makefile
+./arch/ppc/cpu/ppc4xx/Makefile

        Added bedbug_405.c to the Makefile.
 
        Added bedbug_405.c to the Makefile.
 

-./cpu/ppc4xx/start.S
+./arch/ppc/cpu/ppc4xx/start.S

        Added code to handle the debug exception (0x2000) on the 405.
        Also added code to handle critical exceptions since the debug
        is treated as critical on the 405.
 
        Added code to handle the debug exception (0x2000) on the 405.
        Also added code to handle critical exceptions since the debug
        is treated as critical on the 405.
 

-./cpu/ppc4xx/traps.c
+./arch/ppc/cpu/ppc4xx/traps.c

        Added more detailed output for the program exception to tell
        if it is an illegal instruction, privileged instruction or
        a trap. Also added debug trap handler.
        Added more detailed output for the program exception to tell
        if it is an illegal instruction, privileged instruction or
        a trap. Also added debug trap handler.


@@ -51,7 +51,7 @@ can be easily implemented.
        hardware breakpoints and stepping through code.  These
        routines are common to all PowerPC processors.
 
        hardware breakpoints and stepping through code.  These
        routines are common to all PowerPC processors.
 

-./cpu/ppc4xx/bedbug_405.c
+./arch/ppc/cpu/ppc4xx/bedbug_405.c

        AMCC  PPC405 specific debugger routines.
 
 
        AMCC  PPC405 specific debugger routines.
 
 


@@ -63,16 +63,16 @@ Changes:
        common/cmd_bedbug.c
                Added call to initialize 860 debugger.
 
        common/cmd_bedbug.c
                Added call to initialize 860 debugger.
 

-       cpu/mpc8xx/Makefile
+       arch/ppc/cpu/mpc8xx/Makefile

                Added new file "bedbug_860.c" to the makefile
 
                Added new file "bedbug_860.c" to the makefile
 

-       cpu/mpc8xx/start.S
+       arch/ppc/cpu/mpc8xx/start.S

                Added handler for InstructionBreakpoint (0xfd00)
 
                Added handler for InstructionBreakpoint (0xfd00)
 

-       cpu/mpc8xx/traps.c
+       arch/ppc/cpu/mpc8xx/traps.c

                Added new routine DebugException()
 
 New Files:
 
                Added new routine DebugException()
 
 New Files:
 

-       cpu/mpc8xx/bedbug_860.c
+       arch/ppc/cpu/mpc8xx/bedbug_860.c

                CPU-specific routines for 860 debug registers.
                CPU-specific routines for 860 debug registers.

diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx
index 2e121746ddcc4aa4e1975559f96cd9bcd086b945..26fb0c27dcf7eb053c60d3fa439ed495cf55fca0 100644 (file)
--- a/doc/README.mpc5xx
+++ b/doc/README.mpc5xx
@@ -25,7 +25,7 @@ Added or Changed Files:
 u-boot-0.2.0/common/cmd_boot.c
 u-boot-0.2.0/common/cmd_reginfo.c
 u-boot-0.2.0/common/environment.c
 u-boot-0.2.0/common/cmd_boot.c
 u-boot-0.2.0/common/cmd_reginfo.c
 u-boot-0.2.0/common/environment.c

-u-boot-0.2.0/cpu/mpc5xx/*
+u-boot-0.2.0/arch/ppc/cpu/mpc5xx/*

 u-boot-0.2.0/include/cmd_reginfo.h
 u-boot-0.2.0/include/common.h
 u-boot-0.2.0/include/ppc_asm.tmpl
 u-boot-0.2.0/include/cmd_reginfo.h
 u-boot-0.2.0/include/common.h
 u-boot-0.2.0/include/ppc_asm.tmpl

diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index c4214d9a0ae3f64c7cd4a3ae4ab5fba325a8e468..c1cc23bfcdd5229f195da16402182bd15590f4a9 100644 (file)
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -47,7 +47,7 @@
 /*--------------------------------------------------------------------+
  * Fixed PHY (PHY-less) support for Ethernet Ports.
  *
 /*--------------------------------------------------------------------+
  * Fixed PHY (PHY-less) support for Ethernet Ports.
  *

- * Copied from cpu/ppc4xx/4xx_enet.c
+ * Copied from arch/ppc/cpu/ppc4xx/4xx_enet.c

  *--------------------------------------------------------------------*/
 
 /*
  *--------------------------------------------------------------------*/
 
 /*

diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index c4b36f06c05cf037b6daaeb2903f7dc8a5b7e7b4..687ffe6ace06d7d59248989870aced71cd5d4b6f 100644 (file)
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006 Ben Warren, Qstreams Networks Inc.
 /*
  * Copyright (c) 2006 Ben Warren, Qstreams Networks Inc.

- * With help from the common/soft_spi and cpu/mpc8260 drivers
+ * With help from the common/soft_spi and arch/ppc/cpu/mpc8260 drivers

  *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
  * See file CREDITS for list of people who contributed to this
  * project.

diff --git a/examples/standalone/mem_to_mem_idma2intr.c b/examples/standalone/mem_to_mem_idma2intr.c
index 15779d0a162fc0de4a6203f0527c6a1e615b8363..eeff5f5f2de1f35280e03bcc4061afdf0064a3fb 100644 (file)
--- a/examples/standalone/mem_to_mem_idma2intr.c
+++ b/examples/standalone/mem_to_mem_idma2intr.c
@@ -1,5 +1,5 @@
 /* The dpalloc function used and implemented in this file was derieved
 /* The dpalloc function used and implemented in this file was derieved

- * from PPCBoot/U-Boot file "cpu/mpc8260/commproc.c".
+ * from PPCBoot/U-Boot file "arch/ppc/cpu/mpc8260/commproc.c".

  */
 
 /* Author: Arun Dharankar <ADharankar@ATTBI.Com>
  */
 
 /* Author: Arun Dharankar <ADharankar@ATTBI.Com>

diff --git a/include/configs/aria.h b/include/configs/aria.h
index f89fc570aa5407f527058a3a6d78e7ef7a9766fb..06763c5d966b12738f3d9a55df608688323f3f16 100644 (file)
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -190,7 +190,7 @@
 
 /*
  * Backward compatible definitions,
 
 /*
  * Backward compatible definitions,

- * so we do not have to change cpu/mpc512x/fixed_sdram.c
+ * so we do not have to change arch/ppc/cpu/mpc512x/fixed_sdram.c

  */
 #define        CONFIG_SYS_DDRCMD_EM2           (CONFIG_SYS_MICRON_EMR2)
 #define CONFIG_SYS_DDRCMD_EM3          (CONFIG_SYS_MICRON_EMR3)
  */
 #define        CONFIG_SYS_DDRCMD_EM2           (CONFIG_SYS_MICRON_EMR2)
 #define CONFIG_SYS_DDRCMD_EM3          (CONFIG_SYS_MICRON_EMR3)

diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index 4be28b26a65a87643aeb31e7b149b438a9fcd5b4..44669ea44d36bfb79723d87cf0ad630019c0133c 100644 (file)
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -141,7 +141,7 @@
 
 #define CONFIG_SYS_FLASH_BASE          0xfe000000
 /*
 
 #define CONFIG_SYS_FLASH_BASE          0xfe000000
 /*

- * The flash size is autoconfigured, but cpu/mpc5xxx/cpu_init.c needs this
+ * The flash size is autoconfigured, but arch/ppc/cpu/mpc5xxx/cpu_init.c needs this

  * variable defined
  */
 #define CONFIG_SYS_FLASH_SIZE          0x02000000
  * variable defined
  */
 #define CONFIG_SYS_FLASH_SIZE          0x02000000

diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index a79feec16dfbddf363cf122548a61c5ce944eee0..e5537da4af0a322e8686a40d82891d058a4e9cf4 100644 (file)
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -230,7 +230,7 @@
  *       SDRAM Controller DDR autocalibration values and takes a lot longer
  *       to run than Method_B.
  * (See the Method_A and Method_B algorithm discription in the file:
  *       SDRAM Controller DDR autocalibration values and takes a lot longer
  *       to run than Method_B.
  * (See the Method_A and Method_B algorithm discription in the file:

- *     cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c)
+ *     arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c)

  * Define CONFIG_PPC4xx_DDR_METHOD_A to use DDR autocalibration Method_A
  *
  * DDR Autocalibration Method_B is the default.
  * Define CONFIG_PPC4xx_DDR_METHOD_A to use DDR autocalibration Method_A
  *
  * DDR Autocalibration Method_B is the default.

diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index 16b464cf6dac5ae7f5fcbea02edea78f0984e051..3958d09eb9324d597cffe40f99d6b92a3413b9d8 100644 (file)
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -290,7 +290,7 @@
  * taken from the orignal Linkstation boot code
  *
  * Most of the low level configuration setttings are normally used
  * taken from the orignal Linkstation boot code
  *
  * Most of the low level configuration setttings are normally used

- * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation.
+ * in arch/ppc/cpu/mpc824x/cpu_init.c which is NOT used by this implementation.

  * Low level initialisation is done in board/linkstation/early_init.S
  * The values below are included for reference purpose only
  */
  * Low level initialisation is done in board/linkstation/early_init.S
  * The values below are included for reference purpose only
  */

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 403837e14b02dc00d18019664d43df09a0bc84c6..2472187520a549ba871f50b7215228ac851d3cde 100644 (file)
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -233,7 +233,7 @@
  * Definitions for initial stack pointer and data area (in data cache)
  */
 /* use on chip memory (OCM) for temperary stack until sdram is tested */
  * Definitions for initial stack pointer and data area (in data cache)
  */
 /* use on chip memory (OCM) for temperary stack until sdram is tested */

-/* see ./cpu/ppc4xx/start.S */
+/* see ./arch/ppc/cpu/ppc4xx/start.S */

 #define CONFIG_SYS_TEMP_STACK_OCM      1
 
 /* On Chip Memory location */
 #define CONFIG_SYS_TEMP_STACK_OCM      1
 
 /* On Chip Memory location */


@@ -251,7 +251,7 @@
  * Taken from PPCBoot board/icecube/icecube.h
  */
 
  * Taken from PPCBoot board/icecube/icecube.h
  */
 

-/* see ./cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */
+/* see ./arch/ppc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */

 #define CONFIG_SYS_EBC_PB0AP           0x04002480
 /* AMD NOR flash - this corresponds to FLASH_BASE so may be correct */
 #define CONFIG_SYS_EBC_PB0CR           0xFFC5A000
 #define CONFIG_SYS_EBC_PB0AP           0x04002480
 /* AMD NOR flash - this corresponds to FLASH_BASE so may be correct */
 #define CONFIG_SYS_EBC_PB0CR           0xFFC5A000


@@ -269,7 +269,7 @@
  *
  * Taken in part from PPCBoot board/icecube/icecube.h
  */
  *
  * Taken in part from PPCBoot board/icecube/icecube.h
  */

-/* see ./cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */
+/* see ./arch/ppc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */

 #define CONFIG_SYS_GPIO0_OSRH          0x55555550
 #define CONFIG_SYS_GPIO0_OSRL          0x00000110
 #define CONFIG_SYS_GPIO0_ISR1H         0x00000000
 #define CONFIG_SYS_GPIO0_OSRH          0x55555550
 #define CONFIG_SYS_GPIO0_OSRL          0x00000110
 #define CONFIG_SYS_GPIO0_ISR1H         0x00000000

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index d00f2480cb6a256219771f73340278ca43ec4d4a..7423663a26e1dd068473052f6c9d1b63c65abd99 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -456,7 +456,7 @@
  * - internal SRAM (OCM=On Chip Memory) is placed to CONFIG_SYS_OCM_DATA_ADDR
  * - Stackpointer will be located to
  *   (CONFIG_SYS_INIT_RAM_ADDR&0xFFFF0000) | (CONFIG_SYS_INIT_SP_OFFSET&0x0000FFFF)
  * - internal SRAM (OCM=On Chip Memory) is placed to CONFIG_SYS_OCM_DATA_ADDR
  * - Stackpointer will be located to
  *   (CONFIG_SYS_INIT_RAM_ADDR&0xFFFF0000) | (CONFIG_SYS_INIT_SP_OFFSET&0x0000FFFF)

- *   in cpu/ppc4xx/start.S
+ *   in arch/ppc/cpu/ppc4xx/start.S

  */
 
 #undef CONFIG_SYS_INIT_DCACHE_CS
  */
 
 #undef CONFIG_SYS_INIT_DCACHE_CS


@@ -495,7 +495,7 @@
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
 /* ################################################################################### */
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
 /* ################################################################################### */

-/* These defines will be used in cpu/ppc4xx/cpu_init.c to setup external chip selects  */
+/* These defines will be used in arch/ppc/cpu/ppc4xx/cpu_init.c to setup external chip selects  */

 /* They are currently undefined cause they are initiaized in board/solidcard3/init.S   */
 
 /* This chip select accesses the boot device */
 /* They are currently undefined cause they are initiaized in board/solidcard3/init.S   */
 
 /* This chip select accesses the boot device */

diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile
index f37425eba1ca19a461820a345322f2dded426a02..fce4582c252cb0328091506bc5da86011cfd3748 100644 (file)
--- a/nand_spl/board/amcc/acadia/Makefile
+++ b/nand_spl/board/amcc/acadia/Makefile
@@ -68,11 +68,11 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # from cpu directory
 $(obj)cache.S:
        @rm -f $(obj)cache.S
 # from cpu directory
 $(obj)cache.S:
        @rm -f $(obj)cache.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/cache.S $(obj)cache.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/cache.S $(obj)cache.S

 
 $(obj)gpio.c:
        @rm -f $(obj)gpio.c
 
 $(obj)gpio.c:
        @rm -f $(obj)gpio.c

-       ln -s $(SRCTREE)/cpu/ppc4xx/gpio.c $(obj)gpio.c
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/gpio.c $(obj)gpio.c

 
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c
 
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c


@@ -80,11 +80,11 @@ $(obj)ndfc.c:
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S

 
 $(obj)start.S:
        @rm -f $(obj)start.S
 
 $(obj)start.S:
        @rm -f $(obj)start.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S

 
 # from board directory
 $(obj)memory.c:
 
 # from board directory
 $(obj)memory.c:

diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile
index 5fcf2905aff268a2fd36ba9e3f6509268a2b44d5..48fde1d1dabf109828418ab5cbf8e5575565c8a0 100644 (file)
--- a/nand_spl/board/amcc/bamboo/Makefile
+++ b/nand_spl/board/amcc/bamboo/Makefile
@@ -66,11 +66,11 @@ $(obj)ndfc.c:
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S

 
 $(obj)start.S:
        @rm -f $(obj)start.S
 
 $(obj)start.S:
        @rm -f $(obj)start.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S

 
 # from board directory
 $(obj)init.S:
 
 # from board directory
 $(obj)init.S:

diff --git a/nand_spl/board/amcc/canyonlands/Makefile b/nand_spl/board/amcc/canyonlands/Makefile
index f77e459448717c9f1da06ceb99c1e20f597bb658..0012a9c99b32183e41f6ebe7be10d2ff7455a1ed 100644 (file)
--- a/nand_spl/board/amcc/canyonlands/Makefile
+++ b/nand_spl/board/amcc/canyonlands/Makefile
@@ -71,11 +71,11 @@ $(obj)ndfc.c:
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S

 
 $(obj)start.S:
        @rm -f $(obj)start.S
 
 $(obj)start.S:
        @rm -f $(obj)start.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S

 
 # from board directory
 $(obj)init.S:
 
 # from board directory
 $(obj)init.S:

diff --git a/nand_spl/board/amcc/kilauea/Makefile b/nand_spl/board/amcc/kilauea/Makefile
index bc2174401987a5e035532882b8162bef2467dd16..de4980a55c10ce95f128cf84d04e0e51a6a61ded 100644 (file)
--- a/nand_spl/board/amcc/kilauea/Makefile
+++ b/nand_spl/board/amcc/kilauea/Makefile
@@ -62,15 +62,15 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # from cpu directory
 $(obj)44x_spd_ddr2.c: $(obj)ecc.h
        @rm -f $(obj)44x_spd_ddr2.c
 # from cpu directory
 $(obj)44x_spd_ddr2.c: $(obj)ecc.h
        @rm -f $(obj)44x_spd_ddr2.c

-       ln -s $(SRCTREE)/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c

 
 $(obj)cache.S:
        @rm -f $(obj)cache.S
 
 $(obj)cache.S:
        @rm -f $(obj)cache.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/cache.S $(obj)cache.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/cache.S $(obj)cache.S

 
 $(obj)ecc.h:
        @rm -f $(obj)ecc.h
 
 $(obj)ecc.h:
        @rm -f $(obj)ecc.h

-       ln -s $(SRCTREE)/cpu/ppc4xx/ecc.h $(obj)ecc.h
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/ecc.h $(obj)ecc.h

 
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c
 
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c


@@ -78,11 +78,11 @@ $(obj)ndfc.c:
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S

 
 $(obj)start.S:
        @rm -f $(obj)start.S
 
 $(obj)start.S:
        @rm -f $(obj)start.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S

 
 # from nand_spl directory
 $(obj)nand_boot.c:
 
 # from nand_spl directory
 $(obj)nand_boot.c:

diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile
index 54ea7c7e51ee6b2f2da7957191a34ef19645a0fd..e6f96fd3bced9ac542fde62bba53e884a959a7a0 100644 (file)
--- a/nand_spl/board/amcc/sequoia/Makefile
+++ b/nand_spl/board/amcc/sequoia/Makefile
@@ -62,7 +62,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # from cpu directory
 $(obj)denali_data_eye.c:
        @rm -f $(obj)denali_data_eye.c
 # from cpu directory
 $(obj)denali_data_eye.c:
        @rm -f $(obj)denali_data_eye.c

-       ln -s $(SRCTREE)/cpu/ppc4xx/denali_data_eye.c $(obj)denali_data_eye.c
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/denali_data_eye.c $(obj)denali_data_eye.c

 
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c
 
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c


@@ -70,11 +70,11 @@ $(obj)ndfc.c:
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S

 
 $(obj)start.S:
        @rm -f $(obj)start.S
 
 $(obj)start.S:
        @rm -f $(obj)start.S

-       ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+       ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S

 
 # from board directory
 $(obj)init.S:
 
 # from board directory
 $(obj)init.S:

diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile
index ee1dc4b298f25c8057b0cdc53c2b4896bc326d79..a23176c78afc451615444a7eeabb9e6f2816f357 100644 (file)
--- a/nand_spl/board/freescale/mpc8313erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8313erdb/Makefile
@@ -65,7 +65,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # create symbolic links for common files
 
 $(obj)start.S:
 # create symbolic links for common files
 
 $(obj)start.S:

-       ln -sf $(SRCTREE)/cpu/mpc83xx/start.S $(obj)start.S
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $(obj)start.S

 
 $(obj)nand_boot_fsl_elbc.c:
        ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \
 
 $(obj)nand_boot_fsl_elbc.c:
        ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \


@@ -81,7 +81,7 @@ $(obj)ns16550.c:
        ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
 
 $(obj)nand_init.c:
        ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
 
 $(obj)nand_init.c:

-       ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c

 
 $(obj)cache.c:
        ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
 
 $(obj)cache.c:
        ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c

diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index ee1dc4b298f25c8057b0cdc53c2b4896bc326d79..a23176c78afc451615444a7eeabb9e6f2816f357 100644 (file)
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -65,7 +65,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 # create symbolic links for common files
 
 $(obj)start.S:
 # create symbolic links for common files
 
 $(obj)start.S:

-       ln -sf $(SRCTREE)/cpu/mpc83xx/start.S $(obj)start.S
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $(obj)start.S

 
 $(obj)nand_boot_fsl_elbc.c:
        ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \
 
 $(obj)nand_boot_fsl_elbc.c:
        ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \


@@ -81,7 +81,7 @@ $(obj)ns16550.c:
        ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
 
 $(obj)nand_init.c:
        ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
 
 $(obj)nand_init.c:

-       ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c

 
 $(obj)cache.c:
        ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
 
 $(obj)cache.c:
        ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c

diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index ff8b8be6a4181dc9af8d8f67a01cf67e5614821b..7f75afcb5071f90a813b134d4486a2ca722de791 100644 (file)
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -68,11 +68,11 @@ $(obj)cache.c:
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c

-       ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c

 
 $(obj)cpu_init_nand.c:
        @rm -f $(obj)cpu_init_nand.c
 
 $(obj)cpu_init_nand.c:
        @rm -f $(obj)cpu_init_nand.c

-       ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c

 
 $(obj)fsl_law.c:
        @rm -f $(obj)fsl_law.c
 
 $(obj)fsl_law.c:
        @rm -f $(obj)fsl_law.c


@@ -97,15 +97,15 @@ $(obj)resetvec.S:
 
 $(obj)fixed_ivor.S:
        @rm -f $(obj)fixed_ivor.S
 
 $(obj)fixed_ivor.S:
        @rm -f $(obj)fixed_ivor.S

-       ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S

 
 $(obj)start.S: $(obj)fixed_ivor.S
        @rm -f $(obj)start.S
 
 $(obj)start.S: $(obj)fixed_ivor.S
        @rm -f $(obj)start.S

-       ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S

 
 $(obj)tlb.c:
        @rm -f $(obj)tlb.c
 
 $(obj)tlb.c:
        @rm -f $(obj)tlb.c

-       ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c

 
 $(obj)tlb_table.c:
        @rm -f $(obj)tlb_table.c
 
 $(obj)tlb_table.c:
        @rm -f $(obj)tlb_table.c

diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index ff8b8be6a4181dc9af8d8f67a01cf67e5614821b..7f75afcb5071f90a813b134d4486a2ca722de791 100644 (file)
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -68,11 +68,11 @@ $(obj)cache.c:
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c

-       ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c

 
 $(obj)cpu_init_nand.c:
        @rm -f $(obj)cpu_init_nand.c
 
 $(obj)cpu_init_nand.c:
        @rm -f $(obj)cpu_init_nand.c

-       ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c

 
 $(obj)fsl_law.c:
        @rm -f $(obj)fsl_law.c
 
 $(obj)fsl_law.c:
        @rm -f $(obj)fsl_law.c


@@ -97,15 +97,15 @@ $(obj)resetvec.S:
 
 $(obj)fixed_ivor.S:
        @rm -f $(obj)fixed_ivor.S
 
 $(obj)fixed_ivor.S:
        @rm -f $(obj)fixed_ivor.S

-       ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S

 
 $(obj)start.S: $(obj)fixed_ivor.S
        @rm -f $(obj)start.S
 
 $(obj)start.S: $(obj)fixed_ivor.S
        @rm -f $(obj)start.S

-       ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S

 
 $(obj)tlb.c:
        @rm -f $(obj)tlb.c
 
 $(obj)tlb.c:
        @rm -f $(obj)tlb.c

-       ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c

 
 $(obj)tlb_table.c:
        @rm -f $(obj)tlb_table.c
 
 $(obj)tlb_table.c:
        @rm -f $(obj)tlb_table.c

diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index ff8b8be6a4181dc9af8d8f67a01cf67e5614821b..7f75afcb5071f90a813b134d4486a2ca722de791 100644 (file)
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -68,11 +68,11 @@ $(obj)cache.c:
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c
 
 $(obj)cpu_init_early.c:
        @rm -f $(obj)cpu_init_early.c

-       ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c

 
 $(obj)cpu_init_nand.c:
        @rm -f $(obj)cpu_init_nand.c
 
 $(obj)cpu_init_nand.c:
        @rm -f $(obj)cpu_init_nand.c

-       ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c

 
 $(obj)fsl_law.c:
        @rm -f $(obj)fsl_law.c
 
 $(obj)fsl_law.c:
        @rm -f $(obj)fsl_law.c


@@ -97,15 +97,15 @@ $(obj)resetvec.S:
 
 $(obj)fixed_ivor.S:
        @rm -f $(obj)fixed_ivor.S
 
 $(obj)fixed_ivor.S:
        @rm -f $(obj)fixed_ivor.S

-       ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S

 
 $(obj)start.S: $(obj)fixed_ivor.S
        @rm -f $(obj)start.S
 
 $(obj)start.S: $(obj)fixed_ivor.S
        @rm -f $(obj)start.S

-       ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S

 
 $(obj)tlb.c:
        @rm -f $(obj)tlb.c
 
 $(obj)tlb.c:
        @rm -f $(obj)tlb.c

-       ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c
+       ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c

 
 $(obj)tlb_table.c:
        @rm -f $(obj)tlb_table.c
 
 $(obj)tlb_table.c:
        @rm -f $(obj)tlb_table.c

diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index 48c22f84b11feaadbcf68f2361147d480c392551..3ad6250db50e5be6c4bfffea08ce52532f8d33fc 100644 (file)
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -66,7 +66,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
 
 $(obj)start.S:
        @rm -f $@
 
 $(obj)start.S:
        @rm -f $@

-       ln -s $(SRCTREE)/cpu/mpc83xx/start.S $@
+       ln -s $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $@

 
 $(obj)nand_boot_fsl_elbc.c:
        @rm -f $@
 
 $(obj)nand_boot_fsl_elbc.c:
        @rm -f $@


@@ -86,7 +86,7 @@ $(obj)ns16550.c:
 
 $(obj)nand_init.c:
        @rm -f $@
 
 $(obj)nand_init.c:
        @rm -f $@

-       ln -s $(SRCTREE)/cpu/mpc83xx/nand_init.c $@
+       ln -s $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $@

 
 $(obj)cache.c:
        @rm -f $@
 
 $(obj)cache.c:
        @rm -f $@

diff --git a/post/cpu/ppc4xx/spr.c b/post/cpu/ppc4xx/spr.c
index ecb87b53acc8d2ef8573671db46d19e5019fd0c2..6ff5c79aa905aeeb085c3f19e977192e252febaa 100644 (file)
--- a/post/cpu/ppc4xx/spr.c
+++ b/post/cpu/ppc4xx/spr.c
@@ -69,7 +69,7 @@ static struct {
 
        /* Additional Special-Purpose Registers.
         * The values must match the initialization
 
        /* Additional Special-Purpose Registers.
         * The values must match the initialization

-        * values from cpu/ppc4xx/start.S
+        * values from arch/ppc/cpu/ppc4xx/start.S

         */
        {0x30,  "PID",          0x00000000,     0x00000000},
        {0x3a,  "CSRR0",        0x00000000,     0x00000000},
         */
        {0x30,  "PID",          0x00000000,     0x00000000},
        {0x3a,  "CSRR0",        0x00000000,     0x00000000},