[U-Boot] [PATCH v4 08/20] ppc: Move cpu/$CPU to arch/ppc/cpu/$CPU
Peter Tyser
ptyser at xes-inc.com
Tue Apr 13 05:28:09 CEST 2010
Signed-off-by: Peter Tyser <ptyser at xes-inc.com>
---
Makefile | 10 +++---
README | 4 +-
{cpu => arch/ppc/cpu}/74xx_7xx/Makefile | 0
{cpu => arch/ppc/cpu}/74xx_7xx/cache.S | 0
{cpu => arch/ppc/cpu}/74xx_7xx/config.mk | 0
{cpu => arch/ppc/cpu}/74xx_7xx/cpu.c | 0
{cpu => arch/ppc/cpu}/74xx_7xx/cpu_init.c | 0
{cpu => arch/ppc/cpu}/74xx_7xx/interrupts.c | 0
{cpu => arch/ppc/cpu}/74xx_7xx/io.S | 0
{cpu => arch/ppc/cpu}/74xx_7xx/kgdb.S | 0
{cpu => arch/ppc/cpu}/74xx_7xx/speed.c | 0
{cpu => arch/ppc/cpu}/74xx_7xx/start.S | 0
{cpu => arch/ppc/cpu}/74xx_7xx/traps.c | 0
{cpu => arch/ppc/cpu}/mpc512x/Makefile | 4 +-
{cpu => arch/ppc/cpu}/mpc512x/asm-offsets.h | 2 +-
{cpu => arch/ppc/cpu}/mpc512x/config.mk | 2 +-
{cpu => arch/ppc/cpu}/mpc512x/cpu.c | 0
{cpu => arch/ppc/cpu}/mpc512x/cpu_init.c | 0
{cpu => arch/ppc/cpu}/mpc512x/diu.c | 2 +-
{cpu => arch/ppc/cpu}/mpc512x/fixed_sdram.c | 0
{cpu => arch/ppc/cpu}/mpc512x/i2c.c | 0
{cpu => arch/ppc/cpu}/mpc512x/ide.c | 0
{cpu => arch/ppc/cpu}/mpc512x/iim.c | 0
{cpu => arch/ppc/cpu}/mpc512x/interrupts.c | 0
{cpu => arch/ppc/cpu}/mpc512x/iopin.c | 0
{cpu => arch/ppc/cpu}/mpc512x/pci.c | 0
{cpu => arch/ppc/cpu}/mpc512x/serial.c | 0
{cpu => arch/ppc/cpu}/mpc512x/speed.c | 0
{cpu => arch/ppc/cpu}/mpc512x/start.S | 0
{cpu => arch/ppc/cpu}/mpc512x/traps.c | 0
{cpu => arch/ppc/cpu}/mpc512x/u-boot.lds | 2 +-
{cpu => arch/ppc/cpu}/mpc5xx/Makefile | 4 +-
{cpu => arch/ppc/cpu}/mpc5xx/config.mk | 2 +-
{cpu => arch/ppc/cpu}/mpc5xx/cpu.c | 0
{cpu => arch/ppc/cpu}/mpc5xx/cpu_init.c | 0
{cpu => arch/ppc/cpu}/mpc5xx/interrupts.c | 0
{cpu => arch/ppc/cpu}/mpc5xx/serial.c | 0
{cpu => arch/ppc/cpu}/mpc5xx/speed.c | 0
{cpu => arch/ppc/cpu}/mpc5xx/spi.c | 0
{cpu => arch/ppc/cpu}/mpc5xx/start.S | 0
{cpu => arch/ppc/cpu}/mpc5xx/traps.c | 0
{cpu => arch/ppc/cpu}/mpc5xx/u-boot.lds | 2 +-
{cpu => arch/ppc/cpu}/mpc5xxx/Makefile | 0
{cpu => arch/ppc/cpu}/mpc5xxx/config.mk | 2 +-
{cpu => arch/ppc/cpu}/mpc5xxx/cpu.c | 0
{cpu => arch/ppc/cpu}/mpc5xxx/cpu_init.c | 0
.../cpu}/mpc5xxx/firmware_sc_task_bestcomm.impl.S | 0
{cpu => arch/ppc/cpu}/mpc5xxx/i2c.c | 0
{cpu => arch/ppc/cpu}/mpc5xxx/ide.c | 0
{cpu => arch/ppc/cpu}/mpc5xxx/interrupts.c | 0
{cpu => arch/ppc/cpu}/mpc5xxx/io.S | 0
{cpu => arch/ppc/cpu}/mpc5xxx/loadtask.c | 0
{cpu => arch/ppc/cpu}/mpc5xxx/pci_mpc5200.c | 0
{cpu => arch/ppc/cpu}/mpc5xxx/serial.c | 0
{cpu => arch/ppc/cpu}/mpc5xxx/speed.c | 0
{cpu => arch/ppc/cpu}/mpc5xxx/start.S | 0
{cpu => arch/ppc/cpu}/mpc5xxx/traps.c | 0
.../ppc/cpu}/mpc5xxx/u-boot-customlayout.lds | 4 +-
{cpu => arch/ppc/cpu}/mpc5xxx/u-boot.lds | 2 +-
{cpu => arch/ppc/cpu}/mpc5xxx/usb.c | 0
{cpu => arch/ppc/cpu}/mpc5xxx/usb_ohci.c | 0
{cpu => arch/ppc/cpu}/mpc5xxx/usb_ohci.h | 0
{cpu => arch/ppc/cpu}/mpc8220/Makefile | 0
{cpu => arch/ppc/cpu}/mpc8220/config.mk | 2 +-
{cpu => arch/ppc/cpu}/mpc8220/cpu.c | 0
{cpu => arch/ppc/cpu}/mpc8220/cpu_init.c | 0
{cpu => arch/ppc/cpu}/mpc8220/dma.h | 0
{cpu => arch/ppc/cpu}/mpc8220/dramSetup.c | 0
{cpu => arch/ppc/cpu}/mpc8220/dramSetup.h | 0
{cpu => arch/ppc/cpu}/mpc8220/fec.c | 0
{cpu => arch/ppc/cpu}/mpc8220/fec.h | 0
{cpu => arch/ppc/cpu}/mpc8220/fec_dma_tasks.S | 0
{cpu => arch/ppc/cpu}/mpc8220/i2c.c | 0
{cpu => arch/ppc/cpu}/mpc8220/i2cCore.c | 0
{cpu => arch/ppc/cpu}/mpc8220/i2cCore.h | 0
{cpu => arch/ppc/cpu}/mpc8220/interrupts.c | 0
{cpu => arch/ppc/cpu}/mpc8220/io.S | 0
{cpu => arch/ppc/cpu}/mpc8220/loadtask.c | 0
{cpu => arch/ppc/cpu}/mpc8220/pci.c | 0
{cpu => arch/ppc/cpu}/mpc8220/speed.c | 0
{cpu => arch/ppc/cpu}/mpc8220/start.S | 0
{cpu => arch/ppc/cpu}/mpc8220/traps.c | 0
{cpu => arch/ppc/cpu}/mpc8220/u-boot.lds | 2 +-
{cpu => arch/ppc/cpu}/mpc8220/uart.c | 0
{cpu => arch/ppc/cpu}/mpc824x/.gitignore | 0
{cpu => arch/ppc/cpu}/mpc824x/Makefile | 0
{cpu => arch/ppc/cpu}/mpc824x/config.mk | 2 +-
{cpu => arch/ppc/cpu}/mpc824x/cpu.c | 0
{cpu => arch/ppc/cpu}/mpc824x/cpu_init.c | 0
{cpu => arch/ppc/cpu}/mpc824x/drivers/epic.h | 0
{cpu => arch/ppc/cpu}/mpc824x/drivers/epic/README | 0
{cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epic.h | 0
{cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epic1.c | 0
{cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epic2.S | 0
.../ppc/cpu}/mpc824x/drivers/epic/epicutil.S | 0
{cpu => arch/ppc/cpu}/mpc824x/drivers/errors.h | 0
{cpu => arch/ppc/cpu}/mpc824x/drivers/i2c/i2c.c | 0
{cpu => arch/ppc/cpu}/mpc824x/drivers/i2c_export.h | 0
{cpu => arch/ppc/cpu}/mpc824x/interrupts.c | 0
{cpu => arch/ppc/cpu}/mpc824x/pci.c | 0
{cpu => arch/ppc/cpu}/mpc824x/speed.c | 0
{cpu => arch/ppc/cpu}/mpc824x/start.S | 0
{cpu => arch/ppc/cpu}/mpc824x/traps.c | 0
{cpu/mpc8260 => arch/ppc/cpu/mpc824x}/u-boot.lds | 2 +-
{cpu => arch/ppc/cpu}/mpc8260/Makefile | 0
{cpu => arch/ppc/cpu}/mpc8260/bedbug_603e.c | 0
{cpu => arch/ppc/cpu}/mpc8260/commproc.c | 0
{cpu => arch/ppc/cpu}/mpc8260/config.mk | 2 +-
{cpu => arch/ppc/cpu}/mpc8260/cpu.c | 0
{cpu => arch/ppc/cpu}/mpc8260/cpu_init.c | 0
{cpu => arch/ppc/cpu}/mpc8260/ether_fcc.c | 0
{cpu => arch/ppc/cpu}/mpc8260/ether_scc.c | 0
{cpu => arch/ppc/cpu}/mpc8260/i2c.c | 0
{cpu => arch/ppc/cpu}/mpc8260/interrupts.c | 0
{cpu => arch/ppc/cpu}/mpc8260/kgdb.S | 0
{cpu => arch/ppc/cpu}/mpc8260/pci.c | 0
{cpu => arch/ppc/cpu}/mpc8260/serial_scc.c | 0
{cpu => arch/ppc/cpu}/mpc8260/serial_smc.c | 0
{cpu => arch/ppc/cpu}/mpc8260/speed.c | 0
{cpu => arch/ppc/cpu}/mpc8260/speed.h | 0
{cpu => arch/ppc/cpu}/mpc8260/spi.c | 0
{cpu => arch/ppc/cpu}/mpc8260/start.S | 0
{cpu => arch/ppc/cpu}/mpc8260/traps.c | 0
{cpu/mpc824x => arch/ppc/cpu/mpc8260}/u-boot.lds | 2 +-
{cpu => arch/ppc/cpu}/mpc83xx/Makefile | 0
{cpu => arch/ppc/cpu}/mpc83xx/config.mk | 2 +-
{cpu => arch/ppc/cpu}/mpc83xx/cpu.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/cpu_init.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/ecc.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/fdt.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/interrupts.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/nand_init.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/pci.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/pcie.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/qe_io.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/serdes.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/spd_sdram.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/speed.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/start.S | 0
{cpu => arch/ppc/cpu}/mpc83xx/traps.c | 0
{cpu => arch/ppc/cpu}/mpc83xx/u-boot.lds | 2 +-
{cpu => arch/ppc/cpu}/mpc85xx/Makefile | 0
{cpu => arch/ppc/cpu}/mpc85xx/commproc.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/config.mk | 2 +-
{cpu => arch/ppc/cpu}/mpc85xx/cpu.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/cpu_init.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/cpu_init_early.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/cpu_init_nand.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/ddr-gen1.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/ddr-gen2.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/ddr-gen3.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/ether_fcc.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/fdt.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/fixed_ivor.S | 0
{cpu => arch/ppc/cpu}/mpc85xx/interrupts.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/mp.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/mp.h | 0
{cpu => arch/ppc/cpu}/mpc85xx/mpc8536_serdes.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/pci.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/qe_io.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/release.S | 0
{cpu => arch/ppc/cpu}/mpc85xx/resetvec.S | 0
{cpu => arch/ppc/cpu}/mpc85xx/serial_scc.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/speed.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/start.S | 0
{cpu => arch/ppc/cpu}/mpc85xx/tlb.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/traps.c | 0
{cpu => arch/ppc/cpu}/mpc85xx/u-boot-nand.lds | 2 +-
{cpu => arch/ppc/cpu}/mpc85xx/u-boot-nand_spl.lds | 0
{cpu => arch/ppc/cpu}/mpc85xx/u-boot.lds | 2 +-
{cpu => arch/ppc/cpu}/mpc86xx/Makefile | 0
{cpu => arch/ppc/cpu}/mpc86xx/cache.S | 0
{cpu => arch/ppc/cpu}/mpc86xx/config.mk | 0
{cpu => arch/ppc/cpu}/mpc86xx/cpu.c | 0
{cpu => arch/ppc/cpu}/mpc86xx/cpu_init.c | 0
{cpu => arch/ppc/cpu}/mpc86xx/ddr-8641.c | 0
{cpu => arch/ppc/cpu}/mpc86xx/fdt.c | 0
{cpu => arch/ppc/cpu}/mpc86xx/interrupts.c | 0
{cpu => arch/ppc/cpu}/mpc86xx/mp.c | 0
{cpu => arch/ppc/cpu}/mpc86xx/release.S | 0
{cpu => arch/ppc/cpu}/mpc86xx/speed.c | 0
{cpu => arch/ppc/cpu}/mpc86xx/start.S | 0
{cpu => arch/ppc/cpu}/mpc86xx/traps.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/Makefile | 0
{cpu => arch/ppc/cpu}/mpc8xx/bedbug_860.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/commproc.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/config.mk | 0
{cpu => arch/ppc/cpu}/mpc8xx/cpu.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/cpu_init.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/fdt.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/fec.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/fec.h | 0
{cpu => arch/ppc/cpu}/mpc8xx/i2c.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/interrupts.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/kgdb.S | 0
{cpu => arch/ppc/cpu}/mpc8xx/lcd.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/plprcr_write.S | 0
{cpu => arch/ppc/cpu}/mpc8xx/scc.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/serial.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/speed.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/spi.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/start.S | 0
{cpu => arch/ppc/cpu}/mpc8xx/traps.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/upatch.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/video.c | 0
{cpu => arch/ppc/cpu}/mpc8xx/wlkbd.c | 0
{cpu => arch/ppc/cpu}/mpc8xxx/Makefile | 0
{cpu => arch/ppc/cpu}/mpc8xxx/cpu.c | 6 ++--
{cpu => arch/ppc/cpu}/mpc8xxx/ddr/Makefile | 0
.../ppc/cpu}/mpc8xxx/ddr/common_timing_params.h | 0
{cpu => arch/ppc/cpu}/mpc8xxx/ddr/ctrl_regs.c | 0
{cpu => arch/ppc/cpu}/mpc8xxx/ddr/ddr.h | 0
.../ppc/cpu}/mpc8xxx/ddr/ddr1_dimm_params.c | 0
.../ppc/cpu}/mpc8xxx/ddr/ddr2_dimm_params.c | 0
.../ppc/cpu}/mpc8xxx/ddr/ddr3_dimm_params.c | 0
.../ppc/cpu}/mpc8xxx/ddr/lc_common_dimm_params.c | 0
{cpu => arch/ppc/cpu}/mpc8xxx/ddr/main.c | 0
{cpu => arch/ppc/cpu}/mpc8xxx/ddr/options.c | 0
{cpu => arch/ppc/cpu}/mpc8xxx/ddr/util.c | 0
{cpu => arch/ppc/cpu}/mpc8xxx/fdt.c | 6 ++--
{cpu => arch/ppc/cpu}/mpc8xxx/pci_cfg.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/40x_spd_sdram.c | 2 +-
{cpu => arch/ppc/cpu}/ppc4xx/44x_spd_ddr.c | 2 +-
{cpu => arch/ppc/cpu}/ppc4xx/44x_spd_ddr2.c | 2 +-
.../ppc/cpu}/ppc4xx/4xx_ibm_ddr2_autocalib.c | 2 +-
{cpu => arch/ppc/cpu}/ppc4xx/4xx_pci.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/4xx_pcie.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/4xx_uart.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/Makefile | 0
{cpu => arch/ppc/cpu}/ppc4xx/bedbug_405.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/cache.S | 0
{cpu => arch/ppc/cpu}/ppc4xx/cmd_chip_config.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/commproc.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/config.mk | 2 +-
{cpu => arch/ppc/cpu}/ppc4xx/cpu.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/cpu_init.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/dcr.S | 0
{cpu => arch/ppc/cpu}/ppc4xx/denali_data_eye.c | 2 +-
{cpu => arch/ppc/cpu}/ppc4xx/denali_spd_ddr2.c | 4 +-
{cpu => arch/ppc/cpu}/ppc4xx/ecc.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/ecc.h | 0
{cpu => arch/ppc/cpu}/ppc4xx/fdt.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/gpio.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/interrupts.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/iop480_uart.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/kgdb.S | 0
{cpu => arch/ppc/cpu}/ppc4xx/miiphy.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/reginfo.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/resetvec.S | 0
{cpu => arch/ppc/cpu}/ppc4xx/sdram.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/sdram.h | 0
{cpu => arch/ppc/cpu}/ppc4xx/speed.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/start.S | 0
{cpu => arch/ppc/cpu}/ppc4xx/tlb.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/traps.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/u-boot.lds | 2 +-
{cpu => arch/ppc/cpu}/ppc4xx/uic.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/usb.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/usb_ohci.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/usb_ohci.h | 0
{cpu => arch/ppc/cpu}/ppc4xx/usbdev.c | 0
{cpu => arch/ppc/cpu}/ppc4xx/usbdev.h | 0
{cpu => arch/ppc/cpu}/ppc4xx/xilinx_irq.c | 0
board/LEOX/elpt860/u-boot.lds | 2 +-
board/LEOX/elpt860/u-boot.lds.debug | 2 +-
board/MAI/AmigaOneG3SE/u-boot.lds | 2 +-
board/Marvell/db64360/u-boot.lds | 2 +-
board/Marvell/db64460/u-boot.lds | 2 +-
board/RPXClassic/u-boot.lds | 2 +-
board/RPXClassic/u-boot.lds.debug | 2 +-
board/RPXlite/u-boot.lds | 2 +-
board/RPXlite/u-boot.lds.debug | 2 +-
board/RPXlite_dw/u-boot.lds | 2 +-
board/RPXlite_dw/u-boot.lds.debug | 2 +-
board/RRvision/u-boot.lds | 4 +-
board/adder/u-boot.lds | 2 +-
board/amcc/acadia/u-boot-nand.lds | 2 +-
board/amcc/bamboo/u-boot-nand.lds | 2 +-
board/amcc/canyonlands/canyonlands.c | 2 +-
board/amcc/canyonlands/u-boot-nand.lds | 2 +-
board/amcc/katmai/katmai.c | 2 +-
board/amcc/kilauea/u-boot-nand.lds | 2 +-
board/amcc/luan/luan.c | 2 +-
board/amcc/sequoia/sdram.c | 2 +-
board/amcc/sequoia/u-boot-nand.lds | 2 +-
board/amcc/sequoia/u-boot-ram.lds | 2 +-
board/amcc/yucca/yucca.c | 2 +-
board/amirix/ap1000/u-boot.lds | 14 ++++----
board/c2mon/u-boot.lds | 2 +-
board/c2mon/u-boot.lds.debug | 2 +-
board/cm5200/u-boot.lds | 2 +-
board/cogent/u-boot.lds.debug | 2 +-
board/csb272/csb272.c | 2 +-
board/csb472/csb472.c | 2 +-
board/eltec/bab7xx/u-boot.lds | 2 +-
board/eltec/elppc/u-boot.lds | 2 +-
board/eltec/mhpc/u-boot.lds | 2 +-
board/eltec/mhpc/u-boot.lds.debug | 2 +-
board/emk/top860/u-boot.lds | 2 +-
board/emk/top860/u-boot.lds.debug | 2 +-
board/ep88x/u-boot.lds | 2 +-
board/eric/eric.c | 2 +-
board/esd/cpci750/u-boot.lds | 2 +-
board/esd/dasa_sim/u-boot.lds | 2 +-
board/esd/pmc440/u-boot-nand.lds | 2 +-
board/esteem192e/u-boot.lds | 2 +-
board/etx094/u-boot.lds | 12 +++---
board/etx094/u-boot.lds.debug | 14 ++++----
board/evb64260/u-boot.lds | 2 +-
board/fads/u-boot.lds | 2 +-
board/fads/u-boot.lds.debug | 2 +-
board/flagadm/u-boot.lds | 2 +-
board/flagadm/u-boot.lds.debug | 2 +-
board/freescale/mpc7448hpc2/u-boot.lds | 2 +-
board/freescale/mpc8610hpcd/u-boot.lds | 12 +++---
board/freescale/mpc8641hpcn/u-boot.lds | 12 +++---
board/gen860t/ioport.c | 2 +-
board/gen860t/u-boot-flashenv.lds | 2 +-
board/gen860t/u-boot.lds | 2 +-
board/genietv/u-boot.lds | 2 +-
board/genietv/u-boot.lds.debug | 2 +-
board/gth/u-boot.lds | 2 +-
board/hermes/u-boot.lds | 4 +-
board/hermes/u-boot.lds.debug | 4 +-
board/hmi1001/config.mk | 2 +-
board/hymod/u-boot.lds | 2 +-
board/hymod/u-boot.lds.debug | 2 +-
board/icu862/u-boot.lds | 4 +-
board/icu862/u-boot.lds.debug | 2 +-
board/inka4x0/config.mk | 2 +-
board/ip860/u-boot.lds | 4 +-
board/ip860/u-boot.lds.debug | 4 +-
board/ivm/u-boot.lds | 2 +-
board/ivm/u-boot.lds.debug | 2 +-
board/keymile/common/keymile_hdlc_enet.c | 2 +-
board/keymile/km8xx/km8xx_hdlc_enet.c | 2 +-
board/keymile/km8xx/u-boot.lds | 4 +-
board/keymile/mgcoge/mgcoge_hdlc_enet.c | 2 +-
board/korat/u-boot-F7FC.lds | 4 +-
board/kup/kup4k/u-boot.lds | 4 +-
board/kup/kup4k/u-boot.lds.debug | 2 +-
board/kup/kup4x/u-boot.lds | 4 +-
board/kup/kup4x/u-boot.lds.debug | 2 +-
board/lantec/u-boot.lds | 2 +-
board/lantec/u-boot.lds.debug | 2 +-
board/logicpd/zoom2/zoom2_serial.c | 2 +-
board/lwmon/u-boot.lds | 2 +-
board/lwmon/u-boot.lds.debug | 2 +-
board/mbx8xx/u-boot.lds | 2 +-
board/mbx8xx/u-boot.lds.debug | 2 +-
board/ml2/u-boot.lds | 14 ++++----
board/mousse/u-boot.lds | 2 +-
board/mousse/u-boot.lds.ram | 2 +-
board/mousse/u-boot.lds.rom | 2 +-
board/mucmc52/config.mk | 2 +-
board/munices/u-boot.lds | 2 +-
board/nc650/u-boot.lds | 2 +-
board/nc650/u-boot.lds.debug | 2 +-
board/netphone/u-boot.lds | 4 +-
board/netphone/u-boot.lds.debug | 2 +-
board/netstal/hcu5/README.txt | 10 +++---
board/netta/u-boot.lds | 4 +-
board/netta/u-boot.lds.debug | 2 +-
board/netta2/u-boot.lds | 4 +-
board/netta2/u-boot.lds.debug | 2 +-
board/netvia/u-boot.lds | 4 +-
board/netvia/u-boot.lds.debug | 2 +-
board/nx823/u-boot.lds | 2 +-
board/nx823/u-boot.lds.debug | 2 +-
board/pcippc2/u-boot.lds | 2 +-
board/pcs440ep/pcs440ep.c | 2 +-
board/ppmc7xx/u-boot.lds | 2 +-
board/prodrive/p3mx/u-boot.lds | 2 +-
board/quantum/u-boot.lds | 2 +-
board/quantum/u-boot.lds.debug | 2 +-
board/r360mpi/u-boot.lds | 8 ++--
board/rbc823/u-boot.lds | 2 +-
board/rmu/u-boot.lds | 2 +-
board/rmu/u-boot.lds.debug | 2 +-
board/rsdproto/u-boot.lds | 2 +-
board/sandburst/common/ppc440gx_i2c.c | 2 +-
board/sandburst/karef/u-boot.lds.debug | 14 ++++----
board/sandburst/metrobox/u-boot.lds.debug | 14 ++++----
board/sbc8641d/u-boot.lds | 12 +++---
board/sc3/u-boot.lds | 14 ++++----
board/siemens/CCM/u-boot.lds | 2 +-
board/siemens/CCM/u-boot.lds.debug | 2 +-
board/siemens/IAD210/u-boot.lds | 4 +-
board/siemens/pcu_e/u-boot.lds | 2 +-
board/siemens/pcu_e/u-boot.lds.debug | 2 +-
board/sixnet/u-boot.lds | 2 +-
board/snmc/qs850/u-boot.lds | 4 +-
board/snmc/qs860t/u-boot.lds | 4 +-
board/spc1920/u-boot.lds | 4 +-
board/spd8xx/u-boot.lds | 2 +-
board/spd8xx/u-boot.lds.debug | 2 +-
board/stx/stxxtc/u-boot.lds | 4 +-
board/stx/stxxtc/u-boot.lds.debug | 2 +-
board/svm_sc8xx/u-boot.lds | 4 +-
board/svm_sc8xx/u-boot.lds.debug | 2 +-
board/tqc/tqm8xx/u-boot.lds | 4 +-
board/tqc/tqm8xx/u-boot.lds.debug | 2 +-
board/uc100/u-boot.lds | 4 +-
board/uc100/u-boot.lds.debug | 2 +-
board/uc101/config.mk | 2 +-
board/v37/u-boot.lds | 4 +-
board/w7o/w7o.c | 2 +-
board/westel/amx860/u-boot.lds | 2 +-
board/westel/amx860/u-boot.lds.debug | 2 +-
board/xes/xpedite1000/u-boot.lds.debug | 14 ++++----
board/xes/xpedite5170/u-boot.lds | 12 +++---
board/xilinx/ppc405-generic/u-boot-rom.lds | 2 +-
board/xilinx/ppc440-generic/u-boot-rom.lds | 2 +-
config.mk | 7 +++-
doc/README.PIP405 | 16 ++++----
doc/README.POST | 4 +-
doc/README.RPXlite | 2 +-
doc/README.TQM8260 | 8 ++--
doc/README.alaska8220 | 36 ++++++++++----------
doc/README.bedbug | 16 ++++----
doc/README.mpc5xx | 2 +-
drivers/qe/uec_phy.c | 2 +-
drivers/spi/mpc8xxx_spi.c | 2 +-
examples/standalone/mem_to_mem_idma2intr.c | 2 +-
include/configs/aria.h | 2 +-
include/configs/galaxy5200.h | 2 +-
include/configs/kilauea.h | 2 +-
include/configs/linkstation.h | 2 +-
include/configs/quad100hd.h | 6 ++--
include/configs/sc3.h | 4 +-
nand_spl/board/amcc/acadia/Makefile | 8 ++--
nand_spl/board/amcc/bamboo/Makefile | 4 +-
nand_spl/board/amcc/canyonlands/Makefile | 4 +-
nand_spl/board/amcc/kilauea/Makefile | 10 +++---
nand_spl/board/amcc/sequoia/Makefile | 6 ++--
nand_spl/board/freescale/mpc8313erdb/Makefile | 4 +-
nand_spl/board/freescale/mpc8315erdb/Makefile | 4 +-
nand_spl/board/freescale/mpc8536ds/Makefile | 10 +++---
nand_spl/board/freescale/mpc8569mds/Makefile | 10 +++---
nand_spl/board/freescale/p1_p2_rdb/Makefile | 10 +++---
nand_spl/board/sheldon/simpc8313/Makefile | 4 +-
post/cpu/ppc4xx/spr.c | 2 +-
442 files changed, 392 insertions(+), 387 deletions(-)
rename {cpu => arch/ppc/cpu}/74xx_7xx/Makefile (100%)
rename {cpu => arch/ppc/cpu}/74xx_7xx/cache.S (100%)
rename {cpu => arch/ppc/cpu}/74xx_7xx/config.mk (100%)
rename {cpu => arch/ppc/cpu}/74xx_7xx/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/74xx_7xx/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/74xx_7xx/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/74xx_7xx/io.S (100%)
rename {cpu => arch/ppc/cpu}/74xx_7xx/kgdb.S (100%)
rename {cpu => arch/ppc/cpu}/74xx_7xx/speed.c (100%)
rename {cpu => arch/ppc/cpu}/74xx_7xx/start.S (100%)
rename {cpu => arch/ppc/cpu}/74xx_7xx/traps.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/Makefile (91%)
rename {cpu => arch/ppc/cpu}/mpc512x/asm-offsets.h (88%)
rename {cpu => arch/ppc/cpu}/mpc512x/config.mk (95%)
rename {cpu => arch/ppc/cpu}/mpc512x/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/diu.c (98%)
rename {cpu => arch/ppc/cpu}/mpc512x/fixed_sdram.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/i2c.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/ide.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/iim.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/iopin.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/pci.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/serial.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/speed.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/start.S (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/traps.c (100%)
rename {cpu => arch/ppc/cpu}/mpc512x/u-boot.lds (98%)
rename {cpu => arch/ppc/cpu}/mpc5xx/Makefile (94%)
rename {cpu => arch/ppc/cpu}/mpc5xx/config.mk (95%)
rename {cpu => arch/ppc/cpu}/mpc5xx/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xx/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xx/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xx/serial.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xx/speed.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xx/spi.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xx/start.S (100%)
rename {cpu => arch/ppc/cpu}/mpc5xx/traps.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xx/u-boot.lds (98%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/Makefile (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/config.mk (95%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/firmware_sc_task_bestcomm.impl.S (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/i2c.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/ide.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/io.S (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/loadtask.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/pci_mpc5200.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/serial.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/speed.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/start.S (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/traps.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/u-boot-customlayout.lds (97%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/u-boot.lds (98%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/usb.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/usb_ohci.c (100%)
rename {cpu => arch/ppc/cpu}/mpc5xxx/usb_ohci.h (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/Makefile (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/config.mk (95%)
rename {cpu => arch/ppc/cpu}/mpc8220/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/dma.h (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/dramSetup.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/dramSetup.h (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/fec.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/fec.h (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/fec_dma_tasks.S (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/i2c.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/i2cCore.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/i2cCore.h (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/io.S (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/loadtask.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/pci.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/speed.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/start.S (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/traps.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8220/u-boot.lds (98%)
rename {cpu => arch/ppc/cpu}/mpc8220/uart.c (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/.gitignore (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/Makefile (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/config.mk (95%)
rename {cpu => arch/ppc/cpu}/mpc824x/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic.h (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic/README (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epic.h (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epic1.c (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epic2.S (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/drivers/epic/epicutil.S (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/drivers/errors.h (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/drivers/i2c/i2c.c (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/drivers/i2c_export.h (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/pci.c (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/speed.c (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/start.S (100%)
rename {cpu => arch/ppc/cpu}/mpc824x/traps.c (100%)
rename {cpu/mpc8260 => arch/ppc/cpu/mpc824x}/u-boot.lds (98%)
rename {cpu => arch/ppc/cpu}/mpc8260/Makefile (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/bedbug_603e.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/commproc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/config.mk (95%)
rename {cpu => arch/ppc/cpu}/mpc8260/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/ether_fcc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/ether_scc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/i2c.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/kgdb.S (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/pci.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/serial_scc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/serial_smc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/speed.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/speed.h (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/spi.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/start.S (100%)
rename {cpu => arch/ppc/cpu}/mpc8260/traps.c (100%)
rename {cpu/mpc824x => arch/ppc/cpu/mpc8260}/u-boot.lds (98%)
rename {cpu => arch/ppc/cpu}/mpc83xx/Makefile (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/config.mk (94%)
rename {cpu => arch/ppc/cpu}/mpc83xx/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/ecc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/fdt.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/nand_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/pci.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/pcie.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/qe_io.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/serdes.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/spd_sdram.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/speed.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/start.S (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/traps.c (100%)
rename {cpu => arch/ppc/cpu}/mpc83xx/u-boot.lds (98%)
rename {cpu => arch/ppc/cpu}/mpc85xx/Makefile (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/commproc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/config.mk (95%)
rename {cpu => arch/ppc/cpu}/mpc85xx/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/cpu_init_early.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/cpu_init_nand.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/ddr-gen1.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/ddr-gen2.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/ddr-gen3.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/ether_fcc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/fdt.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/fixed_ivor.S (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/mp.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/mp.h (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/mpc8536_serdes.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/pci.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/qe_io.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/release.S (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/resetvec.S (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/serial_scc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/speed.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/start.S (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/tlb.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/traps.c (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/u-boot-nand.lds (98%)
rename {cpu => arch/ppc/cpu}/mpc85xx/u-boot-nand_spl.lds (100%)
rename {cpu => arch/ppc/cpu}/mpc85xx/u-boot.lds (98%)
rename {cpu => arch/ppc/cpu}/mpc86xx/Makefile (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/cache.S (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/config.mk (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/ddr-8641.c (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/fdt.c (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/mp.c (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/release.S (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/speed.c (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/start.S (100%)
rename {cpu => arch/ppc/cpu}/mpc86xx/traps.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/Makefile (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/bedbug_860.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/commproc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/config.mk (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/fdt.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/fec.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/fec.h (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/i2c.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/kgdb.S (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/lcd.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/plprcr_write.S (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/scc.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/serial.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/speed.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/spi.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/start.S (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/traps.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/upatch.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/video.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xx/wlkbd.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/Makefile (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/cpu.c (95%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/Makefile (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/common_timing_params.h (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ctrl_regs.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ddr.h (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ddr1_dimm_params.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ddr2_dimm_params.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/ddr3_dimm_params.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/lc_common_dimm_params.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/main.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/options.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/ddr/util.c (100%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/fdt.c (90%)
rename {cpu => arch/ppc/cpu}/mpc8xxx/pci_cfg.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/40x_spd_sdram.c (99%)
rename {cpu => arch/ppc/cpu}/ppc4xx/44x_spd_ddr.c (99%)
rename {cpu => arch/ppc/cpu}/ppc4xx/44x_spd_ddr2.c (99%)
rename {cpu => arch/ppc/cpu}/ppc4xx/4xx_ibm_ddr2_autocalib.c (99%)
rename {cpu => arch/ppc/cpu}/ppc4xx/4xx_pci.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/4xx_pcie.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/4xx_uart.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/Makefile (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/bedbug_405.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/cache.S (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/cmd_chip_config.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/commproc.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/config.mk (96%)
rename {cpu => arch/ppc/cpu}/ppc4xx/cpu.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/cpu_init.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/dcr.S (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/denali_data_eye.c (99%)
rename {cpu => arch/ppc/cpu}/ppc4xx/denali_spd_ddr2.c (99%)
rename {cpu => arch/ppc/cpu}/ppc4xx/ecc.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/ecc.h (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/fdt.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/gpio.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/interrupts.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/iop480_uart.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/kgdb.S (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/miiphy.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/reginfo.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/resetvec.S (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/sdram.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/sdram.h (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/speed.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/start.S (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/tlb.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/traps.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/u-boot.lds (98%)
rename {cpu => arch/ppc/cpu}/ppc4xx/uic.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/usb.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/usb_ohci.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/usb_ohci.h (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/usbdev.c (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/usbdev.h (100%)
rename {cpu => arch/ppc/cpu}/ppc4xx/xilinx_irq.c (100%)
diff --git a/Makefile b/Makefile
index fdd781a..ddfe73c 100644
--- a/Makefile
+++ b/Makefile
@@ -227,12 +227,12 @@ LIBS += drivers/qe/qe.a
endif
ifeq ($(CPU),mpc85xx)
LIBS += drivers/qe/qe.a
-LIBS += cpu/mpc8xxx/ddr/libddr.a
-LIBS += cpu/mpc8xxx/lib8xxx.a
+LIBS += arch/ppc/cpu/mpc8xxx/ddr/libddr.a
+LIBS += arch/ppc/cpu/mpc8xxx/lib8xxx.a
endif
ifeq ($(CPU),mpc86xx)
-LIBS += cpu/mpc8xxx/ddr/libddr.a
-LIBS += cpu/mpc8xxx/lib8xxx.a
+LIBS += arch/ppc/cpu/mpc8xxx/ddr/libddr.a
+LIBS += arch/ppc/cpu/mpc8xxx/lib8xxx.a
endif
LIBS += drivers/rtc/librtc.a
LIBS += drivers/serial/libserial.a
@@ -3768,7 +3768,7 @@ clobber: clean
@rm -f $(obj)u-boot.kwb
@rm -f $(obj)u-boot.imx
@rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
- @rm -f $(obj)cpu/mpc824x/bedbug_603e.c
+ @rm -f $(obj)arch/ppc/cpu/mpc824x/bedbug_603e.c
@rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
@[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
@[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f
diff --git a/README b/README
index e1d58bd..d5ccdc5 100644
--- a/README
+++ b/README
@@ -1393,7 +1393,7 @@ The following options need to be configured:
to run and CONFIG_SYS_I2C_SLAVE to be the address of this node (ie
the CPU's i2c node address).
- Now, the u-boot i2c code for the mpc8xx (cpu/mpc8xx/i2c.c)
+ Now, the u-boot i2c code for the mpc8xx (arch/ppc/cpu/mpc8xx/i2c.c)
sets the CPU up as a master node and so its address should
therefore be cleared to 0 (See, eg, MPC823e User's Manual
p.16-473). So, set CONFIG_SYS_I2C_SLAVE to 0.
@@ -2703,7 +2703,7 @@ Low Level (hardware related) configuration options:
CONFIG_SYS_PCI_MSTR_MEMIO_SIZE, CONFIG_SYS_POCMR1_MASK_ATTRIB, CONFIG_SYS_PCI_MSTR_IO_LOCAL,
CONFIG_SYS_PCI_MSTR_IO_BUS, CONFIG_SYS_CPU_PCI_IO_START, CONFIG_SYS_PCI_MSTR_IO_SIZE,
CONFIG_SYS_POCMR2_MASK_ATTRIB: (MPC826x only)
- Overrides the default PCI memory map in cpu/mpc8260/pci.c if set.
+ Overrides the default PCI memory map in arch/ppc/cpu/mpc8260/pci.c if set.
- CONFIG_PCI_DISABLE_PCIE:
Disable PCI-Express on systems where it is supported but not
diff --git a/cpu/74xx_7xx/Makefile b/arch/ppc/cpu/74xx_7xx/Makefile
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 427db7a..1719c66 100644
--- a/cpu/mpc512x/Makefile
+++ b/arch/ppc/cpu/mpc512x/Makefile
@@ -37,8 +37,8 @@ COBJS-y += iopin.o
COBJS-y += serial.o
COBJS-y += speed.o
COBJS-${CONFIG_FSL_DIU_FB} += diu.o
-COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_diu_fb.o
-COBJS-${CONFIG_FSL_DIU_FB} += ../../board/freescale/common/fsl_logo_bmp.o
+COBJS-${CONFIG_FSL_DIU_FB} += ../../../../board/freescale/common/fsl_diu_fb.o
+COBJS-${CONFIG_FSL_DIU_FB} += ../../../../board/freescale/common/fsl_logo_bmp.o
COBJS-${CONFIG_CMD_IDE} += ide.o
COBJS-${CONFIG_IIM} += iim.o
COBJS-$(CONFIG_PCI) += pci.o
diff --git a/cpu/mpc512x/asm-offsets.h b/arch/ppc/cpu/mpc512x/asm-offsets.h
similarity index 88%
rename from cpu/mpc512x/asm-offsets.h
rename to arch/ppc/cpu/mpc512x/asm-offsets.h
index 4b14778..5873fe0 100644
--- a/cpu/mpc512x/asm-offsets.h
+++ b/arch/ppc/cpu/mpc512x/asm-offsets.h
@@ -1,5 +1,5 @@
/*
- * needed for cpu/mpc512x/start.S
+ * needed for arch/ppc/cpu/mpc512x/start.S
*
* These should be auto-generated
*/
diff --git a/cpu/mpc512x/config.mk b/arch/ppc/cpu/mpc512x/config.mk
similarity index 95%
rename from cpu/mpc512x/config.mk
rename to arch/ppc/cpu/mpc512x/config.mk
index fb0a563..b6727dc 100644
--- a/cpu/mpc512x/config.mk
+++ b/arch/ppc/cpu/mpc512x/config.mk
@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \
# Use default linker script.
# A board port can override this setting in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc512x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc512x/u-boot.lds
diff --git a/cpu/mpc512x/cpu.c b/arch/ppc/cpu/mpc512x/cpu.c
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 c2453c6..9361161 100644
--- a/cpu/mpc512x/diu.c
+++ b/arch/ppc/cpu/mpc512x/diu.c
@@ -27,7 +27,7 @@
#include <command.h>
#include <asm/io.h>
-#include "../../board/freescale/common/fsl_diu_fb.h"
+#include "../../../../board/freescale/common/fsl_diu_fb.h"
#if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
#include <stdio_dev.h>
diff --git a/cpu/mpc512x/fixed_sdram.c b/arch/ppc/cpu/mpc512x/fixed_sdram.c
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 2e260eb..fbc2026 100644
--- a/cpu/mpc512x/u-boot.lds
+++ b/arch/ppc/cpu/mpc512x/u-boot.lds
@@ -49,7 +49,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc512x/start.o (.text)
+ arch/ppc/cpu/mpc512x/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/cpu/mpc5xx/Makefile b/arch/ppc/cpu/mpc5xx/Makefile
similarity index 94%
rename from cpu/mpc5xx/Makefile
rename to arch/ppc/cpu/mpc5xx/Makefile
index 8aab018..f2ebb9a 100644
--- a/cpu/mpc5xx/Makefile
+++ b/arch/ppc/cpu/mpc5xx/Makefile
@@ -25,11 +25,11 @@
#
#
-# File: cpu/mpc5xx/Makefile
+# File: arch/ppc/cpu/mpc5xx/Makefile
#
# Discription: Makefile to build mpc5xx cpu configuration.
# Will include top config.mk which itselfs
-# uses the definitions made in cpu/mpc5xx/config.mk
+# uses the definitions made in arch/ppc/cpu/mpc5xx/config.mk
#
diff --git a/cpu/mpc5xx/config.mk b/arch/ppc/cpu/mpc5xx/config.mk
similarity index 95%
rename from cpu/mpc5xx/config.mk
rename to arch/ppc/cpu/mpc5xx/config.mk
index 7854924..e0b0ce1 100644
--- a/cpu/mpc5xx/config.mk
+++ b/arch/ppc/cpu/mpc5xx/config.mk
@@ -33,4 +33,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi
PLATFORM_CPPFLAGS += -DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xx/u-boot.lds
diff --git a/cpu/mpc5xx/cpu.c b/arch/ppc/cpu/mpc5xx/cpu.c
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 deeb06a..55190c7 100644
--- a/cpu/mpc5xx/u-boot.lds
+++ b/arch/ppc/cpu/mpc5xx/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc5xx/start.o (.text)
+ arch/ppc/cpu/mpc5xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/cpu/mpc5xxx/Makefile b/arch/ppc/cpu/mpc5xxx/Makefile
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 5e82f67..9a64cb6 100644
--- a/cpu/mpc5xxx/config.mk
+++ b/arch/ppc/cpu/mpc5xxx/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 \
-mstring -mcpu=603e -mmultiple
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds
diff --git a/cpu/mpc5xxx/cpu.c b/arch/ppc/cpu/mpc5xxx/cpu.c
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 6c80139..81ebde9 100644
--- a/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc5xxx/start.o (.text)
- cpu/mpc5xxx/traps.o (.text)
+ arch/ppc/cpu/mpc5xxx/start.o (.text)
+ arch/ppc/cpu/mpc5xxx/traps.o (.text)
lib/crc32.o (.text)
arch/ppc/lib/cache.o (.text)
arch/ppc/lib/time.o (.text)
diff --git a/cpu/mpc5xxx/u-boot.lds b/arch/ppc/cpu/mpc5xxx/u-boot.lds
similarity index 98%
rename from cpu/mpc5xxx/u-boot.lds
rename to arch/ppc/cpu/mpc5xxx/u-boot.lds
index 7fe1e95..64ef481 100644
--- a/cpu/mpc5xxx/u-boot.lds
+++ b/arch/ppc/cpu/mpc5xxx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc5xxx/start.o (.text)
+ arch/ppc/cpu/mpc5xxx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/cpu/mpc5xxx/usb.c b/arch/ppc/cpu/mpc5xxx/usb.c
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 3ce40c0..e2ebf38 100644
--- a/cpu/mpc8220/config.mk
+++ b/arch/ppc/cpu/mpc8220/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 \
-mstring -mcpu=603e -mmultiple
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc8220/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8220/u-boot.lds
diff --git a/cpu/mpc8220/cpu.c b/arch/ppc/cpu/mpc8220/cpu.c
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 4400e60..8c5d307 100644
--- a/cpu/mpc8220/u-boot.lds
+++ b/arch/ppc/cpu/mpc8220/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8220/start.o (.text)
+ arch/ppc/cpu/mpc8220/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/cpu/mpc8220/uart.c b/arch/ppc/cpu/mpc8220/uart.c
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 940474b..31ecd20 100644
--- a/cpu/mpc824x/config.mk
+++ b/arch/ppc/cpu/mpc824x/config.mk
@@ -26,4 +26,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi
PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc824x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc824x/u-boot.lds
diff --git a/cpu/mpc824x/cpu.c b/arch/ppc/cpu/mpc824x/cpu.c
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/mpc8260/u-boot.lds b/arch/ppc/cpu/mpc824x/u-boot.lds
similarity index 98%
rename from cpu/mpc8260/u-boot.lds
rename to arch/ppc/cpu/mpc824x/u-boot.lds
index c777cf9..8a6d508 100644
--- a/cpu/mpc8260/u-boot.lds
+++ b/arch/ppc/cpu/mpc824x/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8260/start.o (.text)
+ arch/ppc/cpu/mpc824x/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/cpu/mpc8260/Makefile b/arch/ppc/cpu/mpc8260/Makefile
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 39d81ee..51bb9fa 100644
--- a/cpu/mpc8260/config.mk
+++ b/arch/ppc/cpu/mpc8260/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 \
-mstring -mcpu=603e -mmultiple
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc8260/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8260/u-boot.lds
diff --git a/cpu/mpc8260/cpu.c b/arch/ppc/cpu/mpc8260/cpu.c
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/mpc824x/u-boot.lds b/arch/ppc/cpu/mpc8260/u-boot.lds
similarity index 98%
rename from cpu/mpc824x/u-boot.lds
rename to arch/ppc/cpu/mpc8260/u-boot.lds
index 0eac48f..9887844 100644
--- a/cpu/mpc824x/u-boot.lds
+++ b/arch/ppc/cpu/mpc8260/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc824x/start.o (.text)
+ arch/ppc/cpu/mpc8260/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/cpu/mpc83xx/Makefile b/arch/ppc/cpu/mpc83xx/Makefile
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 e80919b..8596f6a 100644
--- a/cpu/mpc83xx/config.mk
+++ b/arch/ppc/cpu/mpc83xx/config.mk
@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC83xx -DCONFIG_E300 \
-ffixed-r2 -msoft-float
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc83xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc83xx/u-boot.lds
diff --git a/cpu/mpc83xx/cpu.c b/arch/ppc/cpu/mpc83xx/cpu.c
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 c84d4b0..157cef6 100644
--- a/cpu/mpc83xx/u-boot.lds
+++ b/arch/ppc/cpu/mpc83xx/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc83xx/start.o (.text)
+ arch/ppc/cpu/mpc83xx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/cpu/mpc85xx/Makefile b/arch/ppc/cpu/mpc85xx/Makefile
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 408184a..ffb813d 100644
--- a/cpu/mpc85xx/config.mk
+++ b/arch/ppc/cpu/mpc85xx/config.mk
@@ -32,4 +32,4 @@ PLATFORM_CPPFLAGS +=$(call cc-option,-mspe=yes)
PLATFORM_CPPFLAGS +=$(call cc-option,-mno-spe)
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/mpc85xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc85xx/u-boot.lds
diff --git a/cpu/mpc85xx/cpu.c b/arch/ppc/cpu/mpc85xx/cpu.c
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 b4c63e2..b9240f2 100644
--- a/cpu/mpc85xx/u-boot-nand.lds
+++ b/arch/ppc/cpu/mpc85xx/u-boot-nand.lds
@@ -117,7 +117,7 @@ SECTIONS
.bootpg ADDR(.text) - 0x1000 :
{
- cpu/mpc85xx/start.o (.bootpg)
+ arch/ppc/cpu/mpc85xx/start.o (.bootpg)
} :text = 0xffff
. = ADDR(.text) + 0x80000;
diff --git a/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds
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 183dce9..9698bf4 100644
--- a/cpu/mpc85xx/u-boot.lds
+++ b/arch/ppc/cpu/mpc85xx/u-boot.lds
@@ -121,7 +121,7 @@ SECTIONS
.bootpg RESET_VECTOR_ADDRESS - 0xffc :
{
- cpu/mpc85xx/start.o (.bootpg)
+ arch/ppc/cpu/mpc85xx/start.o (.bootpg)
} :text = 0xffff
.resetvec RESET_VECTOR_ADDRESS :
diff --git a/cpu/mpc86xx/Makefile b/arch/ppc/cpu/mpc86xx/Makefile
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 47842e9..fef062b 100644
--- a/cpu/mpc8xxx/cpu.c
+++ b/arch/ppc/cpu/mpc8xxx/cpu.c
@@ -1,9 +1,9 @@
/*
* Copyright 2009-2010 Freescale Semiconductor, Inc.
*
- * This file is derived from cpu/mpc85xx/cpu.c and cpu/mpc86xx/cpu.c.
- * Basically this file contains cpu specific common code for 85xx/86xx
- * processors.
+ * This file is derived from arch/ppc/cpu/mpc85xx/cpu.c and
+ * arch/ppc/cpu/mpc86xx/cpu.c. Basically this file contains
+ * cpu specific common code for 85xx/86xx processors.
* See file CREDITS for list of people who contributed to this
* project.
*
diff --git a/cpu/mpc8xxx/ddr/Makefile b/arch/ppc/cpu/mpc8xxx/ddr/Makefile
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 3a9b584..e68d6f3 100644
--- a/cpu/mpc8xxx/fdt.c
+++ b/arch/ppc/cpu/mpc8xxx/fdt.c
@@ -1,9 +1,9 @@
/*
* Copyright 2009 Freescale Semiconductor, Inc.
*
- * This file is derived from cpu/mpc85xx/cpu.c and cpu/mpc86xx/cpu.c.
- * Basically this file contains cpu specific common code for 85xx/86xx
- * processors.
+ * This file is derived from arch/ppc/cpu/mpc85xx/cpu.c and
+ * arch/ppc/cpu/mpc86xx/cpu.c. Basically this file contains
+ * cpu specific common code for 85xx/86xx processors.
* See file CREDITS for list of people who contributed to this
* project.
*
diff --git a/cpu/mpc8xxx/pci_cfg.c b/arch/ppc/cpu/mpc8xxx/pci_cfg.c
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 5e6dbe3..595d568 100644
--- a/cpu/ppc4xx/40x_spd_sdram.c
+++ b/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
@@ -1,5 +1,5 @@
/*
- * cpu/ppc4xx/40x_spd_sdram.c
+ * arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
* This SPD SDRAM detection code supports IBM/AMCC PPC44x cpu with a
* SDRAM controller. Those are all current 405 PPC's.
*
diff --git a/cpu/ppc4xx/44x_spd_ddr.c b/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
similarity index 99%
rename from cpu/ppc4xx/44x_spd_ddr.c
rename to arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
index 6176eab..9d1994f 100644
--- a/cpu/ppc4xx/44x_spd_ddr.c
+++ b/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
@@ -1,5 +1,5 @@
/*
- * cpu/ppc4xx/44x_spd_ddr.c
+ * arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
* This SPD DDR detection code supports IBM/AMCC PPC44x cpu with a
* DDR controller. Those are 440GP/GX/EP/GR.
*
diff --git a/cpu/ppc4xx/44x_spd_ddr2.c b/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
similarity index 99%
rename from cpu/ppc4xx/44x_spd_ddr2.c
rename to arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
index 593a286..ea6c2ac 100644
--- a/cpu/ppc4xx/44x_spd_ddr2.c
+++ b/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
@@ -1,5 +1,5 @@
/*
- * cpu/ppc4xx/44x_spd_ddr2.c
+ * arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
* This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
* DDR2 controller (non Denali Core). Those currently are:
*
diff --git a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
similarity index 99%
rename from cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
rename to arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
index 0283c91..7263071 100644
--- a/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+++ b/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
@@ -1,5 +1,5 @@
/*
- * cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+ * arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
* This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
* DDR2 controller (non Denali Core). Those currently are:
*
diff --git a/cpu/ppc4xx/4xx_pci.c b/arch/ppc/cpu/ppc4xx/4xx_pci.c
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 c1de1e9..ea4d707 100644
--- a/cpu/ppc4xx/config.mk
+++ b/arch/ppc/cpu/ppc4xx/config.mk
@@ -34,4 +34,4 @@ PLATFORM_CPPFLAGS += -Wa,-m405 -mcpu=405
endif
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/cpu/ppc4xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/ppc4xx/u-boot.lds
diff --git a/cpu/ppc4xx/cpu.c b/arch/ppc/cpu/ppc4xx/cpu.c
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 ffc3817..15a9b4f 100644
--- a/cpu/ppc4xx/denali_data_eye.c
+++ b/arch/ppc/cpu/ppc4xx/denali_data_eye.c
@@ -1,5 +1,5 @@
/*
- * cpu/ppc4xx/denali_data_eye.c
+ * arch/ppc/cpu/ppc4xx/denali_data_eye.c
* Extracted from board/amcc/sequoia/sdram.c by Larry Johnson <lrj at 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 5858cb3..72f76cd 100644
--- a/cpu/ppc4xx/denali_spd_ddr2.c
+++ b/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
@@ -1,12 +1,12 @@
/*
- * cpu/ppc4xx/denali_spd_ddr2.c
+ * arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
* This SPD SDRAM detection code supports AMCC PPC44x CPUs with a Denali-core
* DDR2 controller, specifically the 440EPx/GRx.
*
* (C) Copyright 2007-2008
* Larry Johnson, lrj at 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 at 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 2b47934..3704d8a 100644
--- a/cpu/ppc4xx/u-boot.lds
+++ b/arch/ppc/cpu/ppc4xx/u-boot.lds
@@ -124,7 +124,7 @@ SECTIONS
#ifdef CONFIG_440
.bootpg RESET_VECTOR_ADDRESS - 0xffc :
{
- cpu/ppc4xx/start.o (.bootpg)
+ arch/ppc/cpu/ppc4xx/start.o (.bootpg)
/*
* PPC440 board need a board specific object with the
diff --git a/cpu/ppc4xx/uic.c b/arch/ppc/cpu/ppc4xx/uic.c
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 d3929ea..e26792c 100644
--- a/board/LEOX/elpt860/u-boot.lds
+++ b/board/LEOX/elpt860/u-boot.lds
@@ -64,7 +64,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug
index f6c21f7..707ff7a 100644
--- a/board/LEOX/elpt860/u-boot.lds.debug
+++ b/board/LEOX/elpt860/u-boot.lds.debug
@@ -64,7 +64,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/MAI/AmigaOneG3SE/u-boot.lds b/board/MAI/AmigaOneG3SE/u-boot.lds
index 18510a8..1f55c65 100644
--- a/board/MAI/AmigaOneG3SE/u-boot.lds
+++ b/board/MAI/AmigaOneG3SE/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
common/env_embedded.o(.text)
diff --git a/board/Marvell/db64360/u-boot.lds b/board/Marvell/db64360/u-boot.lds
index d021331..6dff003 100644
--- a/board/Marvell/db64360/u-boot.lds
+++ b/board/Marvell/db64360/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/Marvell/db64460/u-boot.lds b/board/Marvell/db64460/u-boot.lds
index d021331..6dff003 100644
--- a/board/Marvell/db64460/u-boot.lds
+++ b/board/Marvell/db64460/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds
index 09d9470..f7de95d 100644
--- a/board/RPXClassic/u-boot.lds
+++ b/board/RPXClassic/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug
index f559df7..57cc305 100644
--- a/board/RPXClassic/u-boot.lds.debug
+++ b/board/RPXClassic/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds
index 09d9470..f7de95d 100644
--- a/board/RPXlite/u-boot.lds
+++ b/board/RPXlite/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug
index f559df7..57cc305 100644
--- a/board/RPXlite/u-boot.lds.debug
+++ b/board/RPXlite/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds
index a099cb9..a2db9a6 100644
--- a/board/RPXlite_dw/u-boot.lds
+++ b/board/RPXlite_dw/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug
index 3b61a42..723f562 100644
--- a/board/RPXlite_dw/u-boot.lds.debug
+++ b/board/RPXlite_dw/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
index 1132fd6..b323768 100644
--- a/board/RRvision/u-boot.lds
+++ b/board/RRvision/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/adder/u-boot.lds b/board/adder/u-boot.lds
index 397ee2f..018bcf1 100644
--- a/board/adder/u-boot.lds
+++ b/board/adder/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/board/amcc/acadia/u-boot-nand.lds b/board/amcc/acadia/u-boot-nand.lds
index 738caa0..bfca582 100644
--- a/board/amcc/acadia/u-boot-nand.lds
+++ b/board/amcc/acadia/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x4000);
diff --git a/board/amcc/bamboo/u-boot-nand.lds b/board/amcc/bamboo/u-boot-nand.lds
index 738caa0..bfca582 100644
--- a/board/amcc/bamboo/u-boot-nand.lds
+++ b/board/amcc/bamboo/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x4000);
diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c
index 13a0dac..71a5701 100644
--- a/board/amcc/canyonlands/canyonlands.c
+++ b/board/amcc/canyonlands/canyonlands.c
@@ -42,7 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define BOARD_ARCHES 4
/*
- * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
* board specific values.
*/
#if defined(CONFIG_ARCHES)
diff --git a/board/amcc/canyonlands/u-boot-nand.lds b/board/amcc/canyonlands/u-boot-nand.lds
index 47c6bd9..b04b05e 100644
--- a/board/amcc/canyonlands/u-boot-nand.lds
+++ b/board/amcc/canyonlands/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x20000);
diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c
index 54e2a39..15291f9 100644
--- a/board/amcc/katmai/katmai.c
+++ b/board/amcc/katmai/katmai.c
@@ -249,7 +249,7 @@ int checkboard (void)
}
/*
- * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
* board specific values.
*/
u32 ddr_wrdtr(u32 default_val) {
diff --git a/board/amcc/kilauea/u-boot-nand.lds b/board/amcc/kilauea/u-boot-nand.lds
index 738caa0..bfca582 100644
--- a/board/amcc/kilauea/u-boot-nand.lds
+++ b/board/amcc/kilauea/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x4000);
diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c
index 332d170..6542565 100644
--- a/board/amcc/luan/luan.c
+++ b/board/amcc/luan/luan.c
@@ -119,7 +119,7 @@ int checkboard(void)
}
/*
- * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
* board specific values.
*/
u32 ddr_clktr(u32 default_val) {
diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c
index bde471c..b5c7d6d 100644
--- a/board/amcc/sequoia/sdram.c
+++ b/board/amcc/sequoia/sdram.c
@@ -40,7 +40,7 @@ extern int denali_wait_for_dlllock(void);
extern void denali_core_search_data_eye(void);
#if defined(CONFIG_NAND_SPL)
-/* Using cpu/ppc4xx/speed.c to calculate the bus frequency is too big
+/* Using arch/ppc/cpu/ppc4xx/speed.c to calculate the bus frequency is too big
* for the 4k NAND boot image so define bus_frequency to 133MHz here
* which is save for the refresh counter setup.
*/
diff --git a/board/amcc/sequoia/u-boot-nand.lds b/board/amcc/sequoia/u-boot-nand.lds
index fb629e0..8a71bfa 100644
--- a/board/amcc/sequoia/u-boot-nand.lds
+++ b/board/amcc/sequoia/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x4000);
diff --git a/board/amcc/sequoia/u-boot-ram.lds b/board/amcc/sequoia/u-boot-ram.lds
index e22dbec..c6a321e 100644
--- a/board/amcc/sequoia/u-boot-ram.lds
+++ b/board/amcc/sequoia/u-boot-ram.lds
@@ -50,7 +50,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c
index 8c65cfb..241f484 100644
--- a/board/amcc/yucca/yucca.c
+++ b/board/amcc/yucca/yucca.c
@@ -555,7 +555,7 @@ int checkboard (void)
}
/*
- * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
* board specific values.
*/
static int ppc440spe_rev_a(void)
diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds
index 89ffc6d..faeefe8 100644
--- a/board/amirix/ap1000/u-boot.lds
+++ b/board/amirix/ap1000/u-boot.lds
@@ -55,14 +55,14 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
board/amirix/ap1000/init.o (.text)
- cpu/ppc4xx/kgdb.o (.text)
- cpu/ppc4xx/traps.o (.text)
- cpu/ppc4xx/interrupts.o (.text)
- cpu/ppc4xx/4xx_uart.o (.text)
- cpu/ppc4xx/cpu_init.o (.text)
- cpu/ppc4xx/speed.o (.text)
+ arch/ppc/cpu/ppc4xx/kgdb.o (.text)
+ arch/ppc/cpu/ppc4xx/traps.o (.text)
+ arch/ppc/cpu/ppc4xx/interrupts.o (.text)
+ arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/ppc/cpu/ppc4xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
arch/ppc/lib/extable.o (.text)
diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
index 51e95d5..5bd5a75 100644
--- a/board/c2mon/u-boot.lds
+++ b/board/c2mon/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug
index d55bf33..e62f6be 100644
--- a/board/c2mon/u-boot.lds.debug
+++ b/board/c2mon/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/cm5200/u-boot.lds b/board/cm5200/u-boot.lds
index 5887f77..30a37d9 100644
--- a/board/cm5200/u-boot.lds
+++ b/board/cm5200/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc5xxx/start.o (.text)
+ arch/ppc/cpu/mpc5xxx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug
index f559df7..57cc305 100644
--- a/board/cogent/u-boot.lds.debug
+++ b/board/cogent/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/csb272/csb272.c b/board/csb272/csb272.c
index d6d65cf..5a00afe 100644
--- a/board/csb272/csb272.c
+++ b/board/csb272/csb272.c
@@ -129,7 +129,7 @@ phys_size_t initdram (int board_type)
/*
* ToDo: Move the asm init routine sdram_init() to this C file,
* or even better use some common ppc4xx code available
- * in cpu/ppc4xx
+ * in arch/ppc/cpu/ppc4xx
*/
sdram_init();
diff --git a/board/csb472/csb472.c b/board/csb472/csb472.c
index 20d34ad..996a67b 100644
--- a/board/csb472/csb472.c
+++ b/board/csb472/csb472.c
@@ -97,7 +97,7 @@ phys_size_t initdram (int board_type)
/*
* ToDo: Move the asm init routine sdram_init() to this C file,
* or even better use some common ppc4xx code available
- * in cpu/ppc4xx
+ * in arch/ppc/cpu/ppc4xx
*/
sdram_init();
diff --git a/board/eltec/bab7xx/u-boot.lds b/board/eltec/bab7xx/u-boot.lds
index d021331..6dff003 100644
--- a/board/eltec/bab7xx/u-boot.lds
+++ b/board/eltec/bab7xx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/eltec/elppc/u-boot.lds b/board/eltec/elppc/u-boot.lds
index d021331..6dff003 100644
--- a/board/eltec/elppc/u-boot.lds
+++ b/board/eltec/elppc/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/eltec/mhpc/u-boot.lds b/board/eltec/mhpc/u-boot.lds
index 5c847fb..dc370ea 100644
--- a/board/eltec/mhpc/u-boot.lds
+++ b/board/eltec/mhpc/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug
index d55bf33..e62f6be 100644
--- a/board/eltec/mhpc/u-boot.lds.debug
+++ b/board/eltec/mhpc/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/emk/top860/u-boot.lds b/board/emk/top860/u-boot.lds
index 46dca96..3fb6d12 100644
--- a/board/emk/top860/u-boot.lds
+++ b/board/emk/top860/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index 6ca7298..3229a23 100644
--- a/board/emk/top860/u-boot.lds.debug
+++ b/board/emk/top860/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/ep88x/u-boot.lds b/board/ep88x/u-boot.lds
index 70b84e4..f9579a6 100644
--- a/board/ep88x/u-boot.lds
+++ b/board/ep88x/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/board/eric/eric.c b/board/eric/eric.c
index cfcfa52..96c0b83 100644
--- a/board/eric/eric.c
+++ b/board/eric/eric.c
@@ -132,7 +132,7 @@ phys_size_t initdram (int board_type)
/*
* ToDo: Move the asm init routine sdram_init() to this C file,
* or even better use some common ppc4xx code available
- * in cpu/ppc4xx
+ * in arch/ppc/cpu/ppc4xx
*/
sdram_init();
diff --git a/board/esd/cpci750/u-boot.lds b/board/esd/cpci750/u-boot.lds
index d021331..6dff003 100644
--- a/board/esd/cpci750/u-boot.lds
+++ b/board/esd/cpci750/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/esd/dasa_sim/u-boot.lds b/board/esd/dasa_sim/u-boot.lds
index b044649..3d33d0f 100644
--- a/board/esd/dasa_sim/u-boot.lds
+++ b/board/esd/dasa_sim/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/esd/pmc440/u-boot-nand.lds b/board/esd/pmc440/u-boot-nand.lds
index fb629e0..8a71bfa 100644
--- a/board/esd/pmc440/u-boot-nand.lds
+++ b/board/esd/pmc440/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x4000);
diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds
index 848eacd..4490f19 100644
--- a/board/esteem192e/u-boot.lds
+++ b/board/esteem192e/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds
index d8112eb..94b1342 100644
--- a/board/etx094/u-boot.lds
+++ b/board/etx094/u-boot.lds
@@ -55,12 +55,12 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
- cpu/mpc8xx/interrupts.o (.text)
- cpu/mpc8xx/serial.o (.text)
- cpu/mpc8xx/cpu_init.o (.text)
- cpu/mpc8xx/speed.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc8xx/serial.o (.text)
+ arch/ppc/cpu/mpc8xx/cpu_init.o (.text)
+ arch/ppc/cpu/mpc8xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug
index 12f6ce7..458d4e0 100644
--- a/board/etx094/u-boot.lds.debug
+++ b/board/etx094/u-boot.lds.debug
@@ -55,13 +55,13 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
- cpu/mpc8xx/interrupts.o (.text)
- cpu/mpc8xx/cpu.o (.text)
- cpu/mpc8xx/cpu_init.o (.text)
- cpu/mpc8xx/speed.o (.text)
- cpu/mpc8xx/serial.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc8xx/cpu.o (.text)
+ arch/ppc/cpu/mpc8xx/cpu_init.o (.text)
+ arch/ppc/cpu/mpc8xx/speed.o (.text)
+ arch/ppc/cpu/mpc8xx/serial.o (.text)
arch/ppc/lib/extable.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/string.o (.text)
diff --git a/board/evb64260/u-boot.lds b/board/evb64260/u-boot.lds
index d021331..6dff003 100644
--- a/board/evb64260/u-boot.lds
+++ b/board/evb64260/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/fads/u-boot.lds b/board/fads/u-boot.lds
index ce3e32e..d6476cd 100644
--- a/board/fads/u-boot.lds
+++ b/board/fads/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
/*. = DEFINED(env_offset) ? env_offset : .;*/
common/env_embedded.o (.ppcenv)
diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug
index 4f179c7..61c0d68 100644
--- a/board/fads/u-boot.lds.debug
+++ b/board/fads/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/flagadm/u-boot.lds b/board/flagadm/u-boot.lds
index 877e82c..fbfba6e 100644
--- a/board/flagadm/u-boot.lds
+++ b/board/flagadm/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug
index d55bf33..e62f6be 100644
--- a/board/flagadm/u-boot.lds.debug
+++ b/board/flagadm/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/freescale/mpc7448hpc2/u-boot.lds b/board/freescale/mpc7448hpc2/u-boot.lds
index 247779f..c4266ce 100644
--- a/board/freescale/mpc7448hpc2/u-boot.lds
+++ b/board/freescale/mpc7448hpc2/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds
index 67847f1..1f9f8eb 100644
--- a/board/freescale/mpc8610hpcd/u-boot.lds
+++ b/board/freescale/mpc8610hpcd/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc86xx/start.o (.text)
- cpu/mpc86xx/traps.o (.text)
- cpu/mpc86xx/interrupts.o (.text)
- cpu/mpc86xx/cpu_init.o (.text)
- cpu/mpc86xx/cpu.o (.text)
- cpu/mpc86xx/speed.o (.text)
+ arch/ppc/cpu/mpc86xx/start.o (.text)
+ arch/ppc/cpu/mpc86xx/traps.o (.text)
+ arch/ppc/cpu/mpc86xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
+ arch/ppc/cpu/mpc86xx/cpu.o (.text)
+ arch/ppc/cpu/mpc86xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
arch/ppc/lib/extable.o (.text)
diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds
index 20e0344..d7c65ce 100644
--- a/board/freescale/mpc8641hpcn/u-boot.lds
+++ b/board/freescale/mpc8641hpcn/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc86xx/start.o (.text)
- cpu/mpc86xx/traps.o (.text)
- cpu/mpc86xx/interrupts.o (.text)
- cpu/mpc86xx/cpu_init.o (.text)
- cpu/mpc86xx/cpu.o (.text)
- cpu/mpc86xx/speed.o (.text)
+ arch/ppc/cpu/mpc86xx/start.o (.text)
+ arch/ppc/cpu/mpc86xx/traps.o (.text)
+ arch/ppc/cpu/mpc86xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
+ arch/ppc/cpu/mpc86xx/cpu.o (.text)
+ arch/ppc/cpu/mpc86xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
arch/ppc/lib/extable.o (.text)
diff --git a/board/gen860t/ioport.c b/board/gen860t/ioport.c
index d8c3006..146573e 100644
--- a/board/gen860t/ioport.c
+++ b/board/gen860t/ioport.c
@@ -197,7 +197,7 @@ const mpc8xx_iop_conf_t iop_conf_tab[NUM_PORTS][PORT_BITS] = {
/*
* Configure the MPC8XX I/O ports per the ioport configuration table
- * (taken from ./cpu/mpc8260/cpu_init.c)
+ * (taken from ./arch/ppc/cpu/mpc8260/cpu_init.c)
*/
void config_mpc8xx_ioports (volatile immap_t * immr)
{
diff --git a/board/gen860t/u-boot-flashenv.lds b/board/gen860t/u-boot-flashenv.lds
index 7b83b25..0e12925 100644
--- a/board/gen860t/u-boot-flashenv.lds
+++ b/board/gen860t/u-boot-flashenv.lds
@@ -55,7 +55,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
}
diff --git a/board/gen860t/u-boot.lds b/board/gen860t/u-boot.lds
index 8f40b30..d184379 100644
--- a/board/gen860t/u-boot.lds
+++ b/board/gen860t/u-boot.lds
@@ -54,7 +54,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
}
diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 1bd1ba7..22ada9a 100644
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug
index c0dd67f..e5aa625 100644
--- a/board/genietv/u-boot.lds.debug
+++ b/board/genietv/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/gth/u-boot.lds b/board/gth/u-boot.lds
index f6175d9..0e68e14 100644
--- a/board/gth/u-boot.lds
+++ b/board/gth/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o(.text)
+ arch/ppc/cpu/mpc8xx/start.o(.text)
*(.text)
common/env_embedded.o(.text)
*(.got1)
diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index 1f6e7d6..23e3e3b 100644
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- cpu/mpc8xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc8xx/interrupts.o (.text)
arch/ppc/lib/time.o (.text)
arch/ppc/lib/ticks.o (.text)
arch/ppc/lib/cache.o (.text)
diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug
index dc810be..47e3927 100644
--- a/board/hermes/u-boot.lds.debug
+++ b/board/hermes/u-boot.lds.debug
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
arch/ppc/lib/ppcstring.o (.text)
- cpu/mpc8xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc8xx/interrupts.o (.text)
arch/ppc/lib/time.o (.text)
arch/ppc/lib/ticks.o (.text)
. = env_offset;
diff --git a/board/hmi1001/config.mk b/board/hmi1001/config.mk
index 4fe1831..aebf304 100644
--- a/board/hmi1001/config.mk
+++ b/board/hmi1001/config.mk
@@ -39,4 +39,4 @@ TEXT_BASE = 0xFFF00000
endif
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot-customlayout.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index 965716f..7086ced 100644
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8260/start.o (.text)
+ arch/ppc/cpu/mpc8260/start.o (.text)
/*
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug
index f559df7..57cc305 100644
--- a/board/hymod/u-boot.lds.debug
+++ b/board/hymod/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds
index d7d0fb3..d683700 100644
--- a/board/icu862/u-boot.lds
+++ b/board/icu862/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
/*
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug
index 282738b..b331d5a 100644
--- a/board/icu862/u-boot.lds.debug
+++ b/board/icu862/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/inka4x0/config.mk b/board/inka4x0/config.mk
index fc70efe..761efa1 100644
--- a/board/inka4x0/config.mk
+++ b/board/inka4x0/config.mk
@@ -39,4 +39,4 @@ TEXT_BASE = 0xFFE00000
endif
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot-customlayout.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds
index bbc7139..d856042 100644
--- a/board/ip860/u-boot.lds
+++ b/board/ip860/u-boot.lds
@@ -55,10 +55,10 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
- cpu/mpc8xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc8xx/interrupts.o (.text)
arch/ppc/lib/time.o (.text)
arch/ppc/lib/ticks.o (.text)
/**
diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug
index fc8fe6c..dd39b9a 100644
--- a/board/ip860/u-boot.lds.debug
+++ b/board/ip860/u-boot.lds.debug
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
arch/ppc/lib/ppcstring.o (.text)
- cpu/mpc8xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc8xx/interrupts.o (.text)
arch/ppc/lib/time.o (.text)
arch/ppc/lib/ticks.o (.text)
/**
diff --git a/board/ivm/u-boot.lds b/board/ivm/u-boot.lds
index 8d7ff70..767408b 100644
--- a/board/ivm/u-boot.lds
+++ b/board/ivm/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
*(.got1)
diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug
index 037785e..5ec82f4 100644
--- a/board/ivm/u-boot.lds.debug
+++ b/board/ivm/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/keymile/common/keymile_hdlc_enet.c b/board/keymile/common/keymile_hdlc_enet.c
index 2e913ad..ceddaf7 100644
--- a/board/keymile/common/keymile_hdlc_enet.c
+++ b/board/keymile/common/keymile_hdlc_enet.c
@@ -2,7 +2,7 @@
* (C) Copyright 2008
* Gary Jennejohn, DENX Software Engineering GmbH, garyj at denx.de.
*
- * Based in part on cpu/mpc8260/ether_scc.c.
+ * Based in part on arch/ppc/cpu/mpc8260/ether_scc.c.
*
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/board/keymile/km8xx/km8xx_hdlc_enet.c b/board/keymile/km8xx/km8xx_hdlc_enet.c
index 9b93131..543deaf 100644
--- a/board/keymile/km8xx/km8xx_hdlc_enet.c
+++ b/board/keymile/km8xx/km8xx_hdlc_enet.c
@@ -2,7 +2,7 @@
* (C) Copyright 2008
* Gary Jennejohn, DENX Software Engineering GmbH, garyj at denx.de.
*
- * Based in part on cpu/mpc8xx/scc.c.
+ * Based in part on arch/ppc/cpu/mpc8xx/scc.c.
*
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds
index 759072d..19936bd 100644
--- a/board/keymile/km8xx/u-boot.lds
+++ b/board/keymile/km8xx/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/keymile/mgcoge/mgcoge_hdlc_enet.c b/board/keymile/mgcoge/mgcoge_hdlc_enet.c
index 34f04f5..6b8e7ea 100644
--- a/board/keymile/mgcoge/mgcoge_hdlc_enet.c
+++ b/board/keymile/mgcoge/mgcoge_hdlc_enet.c
@@ -2,7 +2,7 @@
* (C) Copyright 2008
* Gary Jennejohn, DENX Software Engineering GmbH, garyj at denx.de.
*
- * Based in part on cpu/mpc8260/ether_scc.c.
+ * Based in part on arch/ppc/cpu/mpc8260/ether_scc.c.
*
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/board/korat/u-boot-F7FC.lds b/board/korat/u-boot-F7FC.lds
index cbad866..e483394 100644
--- a/board/korat/u-boot-F7FC.lds
+++ b/board/korat/u-boot-F7FC.lds
@@ -33,7 +33,7 @@ SECTIONS
.bootpg 0xF7FBF000 :
{
- cpu/ppc4xx/start.o (.bootpg)
+ arch/ppc/cpu/ppc4xx/start.o (.bootpg)
} = 0xffff
/* Read-only sections, merged into text segment: */
@@ -65,7 +65,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds
index e1233a7..18cecaf 100644
--- a/board/kup/kup4k/u-boot.lds
+++ b/board/kup/kup4k/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
/*
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug
index 3b61a42..723f562 100644
--- a/board/kup/kup4k/u-boot.lds.debug
+++ b/board/kup/kup4k/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds
index e1233a7..18cecaf 100644
--- a/board/kup/kup4x/u-boot.lds
+++ b/board/kup/kup4x/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
/*
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug
index 3b61a42..723f562 100644
--- a/board/kup/kup4x/u-boot.lds.debug
+++ b/board/kup/kup4x/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds
index 50bdfb4..160f5cf 100644
--- a/board/lantec/u-boot.lds
+++ b/board/lantec/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug
index be06235..172482f 100644
--- a/board/lantec/u-boot.lds.debug
+++ b/board/lantec/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/logicpd/zoom2/zoom2_serial.c b/board/logicpd/zoom2/zoom2_serial.c
index ba58e39..cfbad13 100644
--- a/board/logicpd/zoom2/zoom2_serial.c
+++ b/board/logicpd/zoom2/zoom2_serial.c
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- * This file was adapted from cpu/mpc5xxx/serial.c
+ * This file was adapted from arch/ppc/cpu/mpc5xxx/serial.c
*
*/
diff --git a/board/lwmon/u-boot.lds b/board/lwmon/u-boot.lds
index cc8ad7d..ff2f566 100644
--- a/board/lwmon/u-boot.lds
+++ b/board/lwmon/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
*(.got1)
diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug
index 251ee9b..fcf2cbb 100644
--- a/board/lwmon/u-boot.lds.debug
+++ b/board/lwmon/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/mbx8xx/u-boot.lds b/board/mbx8xx/u-boot.lds
index dc3e580..3572f1a 100644
--- a/board/mbx8xx/u-boot.lds
+++ b/board/mbx8xx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug
index 4f179c7..61c0d68 100644
--- a/board/mbx8xx/u-boot.lds.debug
+++ b/board/mbx8xx/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds
index e68cfb8..e382283 100644
--- a/board/ml2/u-boot.lds
+++ b/board/ml2/u-boot.lds
@@ -55,14 +55,14 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
board/ml2/init.o (.text)
- cpu/ppc4xx/kgdb.o (.text)
- cpu/ppc4xx/traps.o (.text)
- cpu/ppc4xx/interrupts.o (.text)
- cpu/ppc4xx/4xx_uart.o (.text)
- cpu/ppc4xx/cpu_init.o (.text)
- cpu/ppc4xx/speed.o (.text)
+ arch/ppc/cpu/ppc4xx/kgdb.o (.text)
+ arch/ppc/cpu/ppc4xx/traps.o (.text)
+ arch/ppc/cpu/ppc4xx/interrupts.o (.text)
+ arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/ppc/cpu/ppc4xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
arch/ppc/lib/extable.o (.text)
diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index f6930b5..ed5492d 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc824x/start.o (.text)
+ arch/ppc/cpu/mpc824x/start.o (.text)
arch/ppc/lib/board.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/mousse/u-boot.lds.ram b/board/mousse/u-boot.lds.ram
index d048e52..d316948 100644
--- a/board/mousse/u-boot.lds.ram
+++ b/board/mousse/u-boot.lds.ram
@@ -37,7 +37,7 @@ SECTIONS
PROVIDE(_f_init_rom = .);
.init : {
- cpu/mpc824x/start.o (.text)
+ arch/ppc/cpu/mpc824x/start.o (.text)
*(.init)
} > ram
_init_size = SIZEOF(.init);
diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom
index 8355f33..2721fdc 100644
--- a/board/mousse/u-boot.lds.rom
+++ b/board/mousse/u-boot.lds.rom
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc824x/start.o (.text)
+ arch/ppc/cpu/mpc824x/start.o (.text)
common/board.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/mucmc52/config.mk b/board/mucmc52/config.mk
index 90d9ce2..4e9ee73 100644
--- a/board/mucmc52/config.mk
+++ b/board/mucmc52/config.mk
@@ -42,4 +42,4 @@ TEXT_BASE = 0xFFF00000
endif
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds
diff --git a/board/munices/u-boot.lds b/board/munices/u-boot.lds
index 8db7f26..2cd6d3c 100644
--- a/board/munices/u-boot.lds
+++ b/board/munices/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc5xxx/start.o (.text)
+ arch/ppc/cpu/mpc5xxx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/board/nc650/u-boot.lds b/board/nc650/u-boot.lds
index 21fed62..90ca165 100644
--- a/board/nc650/u-boot.lds
+++ b/board/nc650/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
}
diff --git a/board/nc650/u-boot.lds.debug b/board/nc650/u-boot.lds.debug
index 5f8dc9d..1405b17 100644
--- a/board/nc650/u-boot.lds.debug
+++ b/board/nc650/u-boot.lds.debug
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
}
diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index 8f96b1d..d6e2404 100644
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug
index 1397511..ec479b1 100644
--- a/board/netphone/u-boot.lds.debug
+++ b/board/netphone/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt
index 0a54f9a..0be5192 100644
--- a/board/netstal/hcu5/README.txt
+++ b/board/netstal/hcu5/README.txt
@@ -83,11 +83,11 @@ System-LEDs ??? (Analog zu HCU4 ???)
Startup sequence
----------------
-(cpu/ppc4xx/resetvec.S)
+(arch/ppc/cpu/ppc4xx/resetvec.S)
depending on configs option
call _start_440 _start_pci oder _start
-(cpu/ppc4xx/start.S)
+(arch/ppc/cpu/ppc4xx/start.S)
_start_440:
initialize register like
@@ -136,7 +136,7 @@ _start:
* - board info struct
Save local variables to board info struct
call relocate_code() does not return
- relocate_code: (cpu/ppc4xx/start.S)
+ relocate_code: (arch/ppc/cpu/ppc4xx/start.S)
-------------------------------------------------------
From now on our copy is in RAM and we will run from there,
starting with board_init_r
@@ -147,7 +147,7 @@ From now on our copy is in RAM and we will run from there,
flash_init: (board/netstal/hcu5/flash.c)
/* setup for u-boot erase, update */
setup bd flash info
- cpu_init_r: (cpu/ppc4xx/cpu_init.c)
+ cpu_init_r: (arch/ppc/cpu/ppc4xx/cpu_init.c)
peripheral chip select in using defines like
CONFIG_SYS_EBC_PB0A, CONFIG_SYS_EBC_PB0C from hcu5.h
mem_malloc_init
@@ -161,7 +161,7 @@ From now on our copy is in RAM and we will run from there,
Most of the HW specific code for the HCU5 may be found in
include/configs/hcu5.h
board/netstal/hcu5/*
-cpu/ppc4xx/*
+arch/ppc/cpu/ppc4xx/*
arch/ppc/lib/*
include/ppc440.h
diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index ff11ad0..c4df378 100644
--- a/board/netta/u-boot.lds
+++ b/board/netta/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug
index 1397511..ec479b1 100644
--- a/board/netta/u-boot.lds.debug
+++ b/board/netta/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds
index ff11ad0..c4df378 100644
--- a/board/netta2/u-boot.lds
+++ b/board/netta2/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug
index 1397511..ec479b1 100644
--- a/board/netta2/u-boot.lds.debug
+++ b/board/netta2/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds
index 70d5a6a..6683361 100644
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug
index bc8f32e..cef1a42 100644
--- a/board/netvia/u-boot.lds.debug
+++ b/board/netvia/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/nx823/u-boot.lds b/board/nx823/u-boot.lds
index 5c847fb..dc370ea 100644
--- a/board/nx823/u-boot.lds
+++ b/board/nx823/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug
index d55bf33..e62f6be 100644
--- a/board/nx823/u-boot.lds.debug
+++ b/board/nx823/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/pcippc2/u-boot.lds b/board/pcippc2/u-boot.lds
index d11bb05..b2be328 100644
--- a/board/pcippc2/u-boot.lds
+++ b/board/pcippc2/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c
index ce1e616..bed385c 100644
--- a/board/pcs440ep/pcs440ep.c
+++ b/board/pcs440ep/pcs440ep.c
@@ -148,7 +148,7 @@ int board_early_init_f(void)
mtdcr(EBC0_CFGDATA, reg | 0x04000000); /* Set ATC */
/*--------------------------------------------------------------------
- * GPIO's are alreay setup in cpu/ppc4xx/cpu_init.c
+ * GPIO's are alreay setup in arch/ppc/cpu/ppc4xx/cpu_init.c
* via define from board config file.
*-------------------------------------------------------------------*/
diff --git a/board/ppmc7xx/u-boot.lds b/board/ppmc7xx/u-boot.lds
index 30e8972..aae1057 100644
--- a/board/ppmc7xx/u-boot.lds
+++ b/board/ppmc7xx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/prodrive/p3mx/u-boot.lds b/board/prodrive/p3mx/u-boot.lds
index d021331..6dff003 100644
--- a/board/prodrive/p3mx/u-boot.lds
+++ b/board/prodrive/p3mx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/74xx_7xx/start.o (.text)
+ arch/ppc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds
index 09d9470..f7de95d 100644
--- a/board/quantum/u-boot.lds
+++ b/board/quantum/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug
index dcad818..a2b7bc7 100644
--- a/board/quantum/u-boot.lds.debug
+++ b/board/quantum/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/r360mpi/u-boot.lds b/board/r360mpi/u-boot.lds
index 9089f7d..4fc18fc 100644
--- a/board/r360mpi/u-boot.lds
+++ b/board/r360mpi/u-boot.lds
@@ -55,10 +55,10 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/cpu_init.o (.text)
- cpu/mpc8xx/interrupts.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/cpu_init.o (.text)
+ arch/ppc/cpu/mpc8xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
/***
. = env_offset;
common/env_embedded.o (.text)
diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index 15aca6c..2161501 100644
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds
index 09d9470..f7de95d 100644
--- a/board/rmu/u-boot.lds
+++ b/board/rmu/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug
index dcad818..a2b7bc7 100644
--- a/board/rmu/u-boot.lds.debug
+++ b/board/rmu/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds
index 0d4a9ef..0c51d48 100644
--- a/board/rsdproto/u-boot.lds
+++ b/board/rsdproto/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8260/start.o (.text)
+ arch/ppc/cpu/mpc8260/start.o (.text)
*(.text)
*(.got1)
/*. = env_offset; */
diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c
index dbc0cee..007f875 100644
--- a/board/sandburst/common/ppc440gx_i2c.c
+++ b/board/sandburst/common/ppc440gx_i2c.c
@@ -21,7 +21,7 @@
*/
/*
- * Ported from cpu/ppc4xx/i2c.c by AS HARNOIS by
+ * Ported from arch/ppc/cpu/ppc4xx/i2c.c by AS HARNOIS by
* Travis B. Sawyer
* Sandburst Corporation.
*/
diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
index 34dce83..c174398 100644
--- a/board/sandburst/karef/u-boot.lds.debug
+++ b/board/sandburst/karef/u-boot.lds.debug
@@ -56,14 +56,14 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
board/sandburst/karef/init.o (.text)
- cpu/ppc4xx/kgdb.o (.text)
- cpu/ppc4xx/traps.o (.text)
- cpu/ppc4xx/interrupts.o (.text)
- cpu/ppc4xx/4xx_uart.o (.text)
- cpu/ppc4xx/cpu_init.o (.text)
- cpu/ppc4xx/speed.o (.text)
+ arch/ppc/cpu/ppc4xx/kgdb.o (.text)
+ arch/ppc/cpu/ppc4xx/traps.o (.text)
+ arch/ppc/cpu/ppc4xx/interrupts.o (.text)
+ arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/ppc/cpu/ppc4xx/speed.o (.text)
drivers/net/4xx_enet.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug
index fa976c2..8458416 100644
--- a/board/sandburst/metrobox/u-boot.lds.debug
+++ b/board/sandburst/metrobox/u-boot.lds.debug
@@ -56,14 +56,14 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
board/sandburst/metrobox/init.o (.text)
- cpu/ppc4xx/kgdb.o (.text)
- cpu/ppc4xx/traps.o (.text)
- cpu/ppc4xx/interrupts.o (.text)
- cpu/ppc4xx/4xx_uart.o (.text)
- cpu/ppc4xx/cpu_init.o (.text)
- cpu/ppc4xx/speed.o (.text)
+ arch/ppc/cpu/ppc4xx/kgdb.o (.text)
+ arch/ppc/cpu/ppc4xx/traps.o (.text)
+ arch/ppc/cpu/ppc4xx/interrupts.o (.text)
+ arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/ppc/cpu/ppc4xx/speed.o (.text)
drivers/net/4xx_enet.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds
index 7f04124..2f8730b 100644
--- a/board/sbc8641d/u-boot.lds
+++ b/board/sbc8641d/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc86xx/start.o (.text)
- cpu/mpc86xx/traps.o (.text)
- cpu/mpc86xx/interrupts.o (.text)
- cpu/mpc86xx/cpu_init.o (.text)
- cpu/mpc86xx/cpu.o (.text)
- cpu/mpc86xx/speed.o (.text)
+ arch/ppc/cpu/mpc86xx/start.o (.text)
+ arch/ppc/cpu/mpc86xx/traps.o (.text)
+ arch/ppc/cpu/mpc86xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
+ arch/ppc/cpu/mpc86xx/cpu.o (.text)
+ arch/ppc/cpu/mpc86xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
arch/ppc/lib/extable.o (.text)
diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds
index fc7464e..573fbee 100644
--- a/board/sc3/u-boot.lds
+++ b/board/sc3/u-boot.lds
@@ -60,14 +60,14 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
board/sc3/init.o (.text)
- cpu/ppc4xx/kgdb.o (.text)
- cpu/ppc4xx/traps.o (.text)
- cpu/ppc4xx/interrupts.o (.text)
- cpu/ppc4xx/4xx_uart.o (.text)
- cpu/ppc4xx/cpu_init.o (.text)
- cpu/ppc4xx/speed.o (.text)
+ arch/ppc/cpu/ppc4xx/kgdb.o (.text)
+ arch/ppc/cpu/ppc4xx/traps.o (.text)
+ arch/ppc/cpu/ppc4xx/interrupts.o (.text)
+ arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/ppc/cpu/ppc4xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
arch/ppc/lib/extable.o (.text)
diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds
index 51e95d5..5bd5a75 100644
--- a/board/siemens/CCM/u-boot.lds
+++ b/board/siemens/CCM/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug
index 2a6abfa..460a983 100644
--- a/board/siemens/CCM/u-boot.lds.debug
+++ b/board/siemens/CCM/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds
index 877cf9a..904d45f 100644
--- a/board/siemens/IAD210/u-boot.lds
+++ b/board/siemens/IAD210/u-boot.lds
@@ -55,10 +55,10 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
- cpu/mpc8xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc8xx/interrupts.o (.text)
arch/ppc/lib/time.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/siemens/pcu_e/u-boot.lds b/board/siemens/pcu_e/u-boot.lds
index cc8ad7d..ff2f566 100644
--- a/board/siemens/pcu_e/u-boot.lds
+++ b/board/siemens/pcu_e/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
*(.got1)
diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug
index 251ee9b..fcf2cbb 100644
--- a/board/siemens/pcu_e/u-boot.lds.debug
+++ b/board/siemens/pcu_e/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/sixnet/u-boot.lds b/board/sixnet/u-boot.lds
index dd632a4..c3e7f50 100644
--- a/board/sixnet/u-boot.lds
+++ b/board/sixnet/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
*(.got1)
diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds
index 271d74a..f2154c4 100644
--- a/board/snmc/qs850/u-boot.lds
+++ b/board/snmc/qs850/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds
index 271d74a..f2154c4 100644
--- a/board/snmc/qs860t/u-boot.lds
+++ b/board/snmc/qs860t/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds
index f95f695..c000746 100644
--- a/board/spc1920/u-boot.lds
+++ b/board/spc1920/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/spd8xx/u-boot.lds b/board/spd8xx/u-boot.lds
index 7b9455b..c4d8357 100644
--- a/board/spd8xx/u-boot.lds
+++ b/board/spd8xx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
*(.got1)
diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug
index 4f179c7..61c0d68 100644
--- a/board/spd8xx/u-boot.lds.debug
+++ b/board/spd8xx/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds
index ff11ad0..c4df378 100644
--- a/board/stx/stxxtc/u-boot.lds
+++ b/board/stx/stxxtc/u-boot.lds
@@ -52,8 +52,8 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/stx/stxxtc/u-boot.lds.debug b/board/stx/stxxtc/u-boot.lds.debug
index 1397511..ec479b1 100644
--- a/board/stx/stxxtc/u-boot.lds.debug
+++ b/board/stx/stxxtc/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds
index 6de7488..9027095 100644
--- a/board/svm_sc8xx/u-boot.lds
+++ b/board/svm_sc8xx/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug
index dcad818..a2b7bc7 100644
--- a/board/svm_sc8xx/u-boot.lds.debug
+++ b/board/svm_sc8xx/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds
index ceaac00..a2277c2 100644
--- a/board/tqc/tqm8xx/u-boot.lds
+++ b/board/tqc/tqm8xx/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug
index f559df7..57cc305 100644
--- a/board/tqc/tqm8xx/u-boot.lds.debug
+++ b/board/tqc/tqm8xx/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds
index 960b2a5..f67b1d9 100644
--- a/board/uc100/u-boot.lds
+++ b/board/uc100/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/uc100/u-boot.lds.debug b/board/uc100/u-boot.lds.debug
index 116a972..84b338a 100644
--- a/board/uc100/u-boot.lds.debug
+++ b/board/uc100/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/uc101/config.mk b/board/uc101/config.mk
index 4fe1831..aebf304 100644
--- a/board/uc101/config.mk
+++ b/board/uc101/config.mk
@@ -39,4 +39,4 @@ TEXT_BASE = 0xFFF00000
endif
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/cpu/mpc5xxx/u-boot-customlayout.lds
+LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index 248f488..bc47060 100644
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds
@@ -55,8 +55,8 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
- cpu/mpc8xx/traps.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/w7o/w7o.c b/board/w7o/w7o.c
index a818808..96a12d7 100644
--- a/board/w7o/w7o.c
+++ b/board/w7o/w7o.c
@@ -157,7 +157,7 @@ phys_size_t initdram (int board_type)
/*
* ToDo: Move the asm init routine sdram_init() to this C file,
* or even better use some common ppc4xx code available
- * in cpu/ppc4xx
+ * in arch/ppc/cpu/ppc4xx
*/
sdram_init();
diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds
index 51e95d5..5bd5a75 100644
--- a/board/westel/amx860/u-boot.lds
+++ b/board/westel/amx860/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
arch/ppc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug
index 282738b..b331d5a 100644
--- a/board/westel/amx860/u-boot.lds.debug
+++ b/board/westel/amx860/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/mpc8xx/start.o (.text)
+ arch/ppc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug
index 555e1ac..c3f6fef 100644
--- a/board/xes/xpedite1000/u-boot.lds.debug
+++ b/board/xes/xpedite1000/u-boot.lds.debug
@@ -55,14 +55,14 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- cpu/ppc4xx/start.o (.text)
+ arch/ppc/cpu/ppc4xx/start.o (.text)
board/xes/xpedite1000/init.o (.text)
- cpu/ppc4xx/kgdb.o (.text)
- cpu/ppc4xx/traps.o (.text)
- cpu/ppc4xx/interrupts.o (.text)
- cpu/ppc4xx/4xx_uart.o (.text)
- cpu/ppc4xx/cpu_init.o (.text)
- cpu/ppc4xx/speed.o (.text)
+ arch/ppc/cpu/ppc4xx/kgdb.o (.text)
+ arch/ppc/cpu/ppc4xx/traps.o (.text)
+ arch/ppc/cpu/ppc4xx/interrupts.o (.text)
+ arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/ppc/cpu/ppc4xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
arch/ppc/lib/extable.o (.text)
diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds
index 7f04124..2f8730b 100644
--- a/board/xes/xpedite5170/u-boot.lds
+++ b/board/xes/xpedite5170/u-boot.lds
@@ -50,12 +50,12 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- cpu/mpc86xx/start.o (.text)
- cpu/mpc86xx/traps.o (.text)
- cpu/mpc86xx/interrupts.o (.text)
- cpu/mpc86xx/cpu_init.o (.text)
- cpu/mpc86xx/cpu.o (.text)
- cpu/mpc86xx/speed.o (.text)
+ arch/ppc/cpu/mpc86xx/start.o (.text)
+ arch/ppc/cpu/mpc86xx/traps.o (.text)
+ arch/ppc/cpu/mpc86xx/interrupts.o (.text)
+ arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
+ arch/ppc/cpu/mpc86xx/cpu.o (.text)
+ arch/ppc/cpu/mpc86xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
arch/ppc/lib/extable.o (.text)
diff --git a/board/xilinx/ppc405-generic/u-boot-rom.lds b/board/xilinx/ppc405-generic/u-boot-rom.lds
index 02044e4..8fafbd5 100644
--- a/board/xilinx/ppc405-generic/u-boot-rom.lds
+++ b/board/xilinx/ppc405-generic/u-boot-rom.lds
@@ -33,7 +33,7 @@ SECTIONS
.bootpg 0xFFFFF000 :
{
- cpu/ppc4xx/start.o (.bootpg)
+ arch/ppc/cpu/ppc4xx/start.o (.bootpg)
} = 0xffff
/* Read-only sections, merged into text segment: */
diff --git a/board/xilinx/ppc440-generic/u-boot-rom.lds b/board/xilinx/ppc440-generic/u-boot-rom.lds
index 57c809e..0cbed8e 100644
--- a/board/xilinx/ppc440-generic/u-boot-rom.lds
+++ b/board/xilinx/ppc440-generic/u-boot-rom.lds
@@ -33,7 +33,7 @@ SECTIONS
.bootpg 0xFFFFF000 :
{
- cpu/ppc4xx/start.o (.bootpg)
+ arch/ppc/cpu/ppc4xx/start.o (.bootpg)
} = 0xffff
/* Read-only sections, merged into text segment: */
diff --git a/config.mk b/config.mk
index 85b524e..73b5195 100644
--- a/config.mk
+++ b/config.mk
@@ -112,7 +112,12 @@ sinclude $(OBJTREE)/include/autoconf.mk
# Some architecture config.mk files need to know what CPUDIR is set to,
# so calculate CPUDIR before including ARCH/SOC/CPU config.mk files.
-CPUDIR=cpu/$(CPU)
+# Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains
+# CPU-specific code.
+CPUDIR=arch/$(ARCH)/cpu/$(CPU)
+ifneq ($(SRCTREE)/$(CPUDIR),$(wildcard $(SRCTREE)/$(CPUDIR)))
+CPUDIR=arch/$(ARCH)/cpu
+endif
sinclude $(TOPDIR)/arch/$(ARCH)/config.mk # include architecture dependend rules
sinclude $(TOPDIR)/$(CPUDIR)/config.mk # include CPU specific rules
diff --git a/doc/README.PIP405 b/doc/README.PIP405
index d8b3f9c..e8a6541 100644
--- a/doc/README.PIP405
+++ b/doc/README.PIP405
@@ -17,11 +17,11 @@ Changed files:
added console settings from environment
- common/devices.c added ISA keyboard init
- common/main.c corrected the read of bootdelay
-- cpu/ppc4xx/405gp_pci.c excluded file from PIP405
-- cpu/ppc4xx/i2c.c added 16bit read write I2C support
+- arch/ppc/cpu/ppc4xx/405gp_pci.c excluded file from PIP405
+- arch/ppc/cpu/ppc4xx/i2c.c added 16bit read write I2C support
added page write
-- cpu/ppc4xx/speed.c added get_PCI_freq
-- cpu/ppc4xx/start.S added CONFIG_IDENT_STRING
+- arch/ppc/cpu/ppc4xx/speed.c added get_PCI_freq
+- arch/ppc/cpu/ppc4xx/start.S added CONFIG_IDENT_STRING
- disk/Makefile added part_iso for CD support
- disk/part.c changed to work with block device description
added ISO CD support
@@ -275,7 +275,7 @@ Added the config variable CONFIG_IDENT_STRING which will be added to the
"U_BOOT_VERSION __TIME__ DATE___ " String, to allows to identify intermidiate
and custom versions.
Changed files:
-- cpu/ppc4xx/start.s
+- arch/ppc/cpu/ppc4xx/start.s
Firmware Image:
---------------
@@ -288,11 +288,11 @@ Changed files:
Correct PCI Frequency for PPC405:
---------------------------------
-Added function (in cpu/ppc4xx/speed.c) to get the PCI frequency for PPC405 CPU.
+Added function (in arch/ppc/cpu/ppc4xx/speed.c) to get the PCI frequency for PPC405 CPU.
The PCI Frequency will now be set correct in the board description in common/board.c.
(was set to the busfreq before).
Changed files:
-- cpu/ppc4xx/speed.c
+- arch/ppc/cpu/ppc4xx/speed.c
- common/board.c
I2C Stuff:
@@ -301,7 +301,7 @@ Added defined(CONFIG_PIP405) at several points in common/cmd_i2c.c.
Added 16bit read/write support for I2C (PPC405), and page write to
I2C EEPROM if defined CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE.
Changed files:
-- cpu/ppc4xx/i2c.c
+- arch/ppc/cpu/ppc4xx/i2c.c
- common/cmd_i2c.c
Environment / Console:
diff --git a/doc/README.POST b/doc/README.POST
index a81e079..0d5e20e 100644
--- a/doc/README.POST
+++ b/doc/README.POST
@@ -713,7 +713,7 @@ use external loopback for testing. That will need appropriate
reconfiguration of the physical interface chip.
The test routines for the SCC ethernet tests will be located in
-cpu/mpc8xx/scc.c.
+arch/ppc/cpu/mpc8xx/scc.c.
2.2.3.2. UART tests (SMC/SCC)
@@ -725,7 +725,7 @@ will be transmitted. These tests may be enhanced to make to perform
test will be executed manually.
The test routine for the SMC/SCC UART tests will be located in
-cpu/mpc8xx/serial.c.
+arch/ppc/cpu/mpc8xx/serial.c.
2.2.3.3. USB test
diff --git a/doc/README.RPXlite b/doc/README.RPXlite
index c0238ae..0aa4d11 100644
--- a/doc/README.RPXlite
+++ b/doc/README.RPXlite
@@ -116,7 +116,7 @@
board/RPXLITE/RPXLITE.c /* DRAM-related routines */
board/RPXLITE/flash.c /* flash-related routines */
board/RPXLITE/config.mk /* set text base address */
- cpu/mpc8xx/serial.c /* board specific register setting */
+ arch/ppc/cpu/mpc8xx/serial.c /* board specific register setting */
include/config_RPXLITE.h /* board specific registers */
See 'reg_config.txt' for register values in detail.
diff --git a/doc/README.TQM8260 b/doc/README.TQM8260
index b93a1cb..e64e64a 100644
--- a/doc/README.TQM8260
+++ b/doc/README.TQM8260
@@ -14,10 +14,10 @@ The following common files have been modified by this project:
MAKEALL - TQM8260 entry added
Makefile - TQM8260_config entry added
-cpu/mpc8260/Makefile - soft_i2c.o module added
-cpu/mpc8260/ether_scc.c - TQM8260-specific definitions added, an obvious
+arch/ppc/cpu/mpc8260/Makefile - soft_i2c.o module added
+arch/ppc/cpu/mpc8260/ether_scc.c - TQM8260-specific definitions added, an obvious
bug fixed (fcr -> scr)
-cpu/mpc8260/ether_fcc.c - TQM8260-specific definitions added
+arch/ppc/cpu/mpc8260/ether_fcc.c - TQM8260-specific definitions added
include/flash.h - added definitions for the AM29LV640D Flash chip
@@ -33,7 +33,7 @@ board/tqm8260/config.mk - config file
board/tqm8260/flash.c - flash driver (for AM29LV640D)
board/tqm8260/ppcboot.lds - linker script
board/tqm8260/tqm8260.c - ioport and memory initialization
-cpu/mpc8260/soft_i2c.c - software i2c EEPROM driver
+arch/ppc/cpu/mpc8260/soft_i2c.c - software i2c EEPROM driver
include/config_TQM8260.h - main configuration file
diff --git a/doc/README.alaska8220 b/doc/README.alaska8220
index 279dac6..9249cfb 100644
--- a/doc/README.alaska8220
+++ b/doc/README.alaska8220
@@ -37,24 +37,24 @@ Added files:
- board/alaska/config.mk config make
- board/alaska/u-boot.lds Linker description
-- cpu/mpc8220/dma.h multi-channel dma header file
-- cpu/mpc8220/dramSetup.h dram setup header file
-- cpu/mpc8220/fec.h MPC8220 FEC header file
-- cpu/mpc8220/cpu.c cpu specific code
-- cpu/mpc8220/cpu_init.c Flexbus ChipSelect and Mux pins setup
-- cpu/mpc8220/dramSetup.c MPC8220 DDR SDRAM setup
-- cpu/mpc8220/fec.c MPC8220 FEC driver
-- cpu/mpc8220/i2c.c MPC8220 I2C driver
-- cpu/mpc8220/interrupts.c interrupt support (not enable)
-- cpu/mpc8220/loadtask.c load dma
-- cpu/mpc8220/speed.c system, pci, flexbus, pev, and cpu clock
-- cpu/mpc8220/traps.c exception
-- cpu/mpc8220/uart.c MPC8220 UART driver
-- cpu/mpc8220/Makefile Makefile
-- cpu/mpc8220/config.mk config make
-- cpu/mpc8220/fec_dma_task.S MPC8220 FEC multi-channel dma program
-- cpu/mpc8220/io.S io functions
-- cpu/mpc8220/start.S start up
+- arch/ppc/cpu/mpc8220/dma.h multi-channel dma header file
+- arch/ppc/cpu/mpc8220/dramSetup.h dram setup header file
+- arch/ppc/cpu/mpc8220/fec.h MPC8220 FEC header file
+- arch/ppc/cpu/mpc8220/cpu.c cpu specific code
+- arch/ppc/cpu/mpc8220/cpu_init.c Flexbus ChipSelect and Mux pins setup
+- arch/ppc/cpu/mpc8220/dramSetup.c MPC8220 DDR SDRAM setup
+- arch/ppc/cpu/mpc8220/fec.c MPC8220 FEC driver
+- arch/ppc/cpu/mpc8220/i2c.c MPC8220 I2C driver
+- arch/ppc/cpu/mpc8220/interrupts.c interrupt support (not enable)
+- arch/ppc/cpu/mpc8220/loadtask.c load dma
+- arch/ppc/cpu/mpc8220/speed.c system, pci, flexbus, pev, and cpu clock
+- arch/ppc/cpu/mpc8220/traps.c exception
+- arch/ppc/cpu/mpc8220/uart.c MPC8220 UART driver
+- arch/ppc/cpu/mpc8220/Makefile Makefile
+- arch/ppc/cpu/mpc8220/config.mk config make
+- arch/ppc/cpu/mpc8220/fec_dma_task.S MPC8220 FEC multi-channel dma program
+- arch/ppc/cpu/mpc8220/io.S io functions
+- arch/ppc/cpu/mpc8220/start.S start up
- include/mpc8220.h
diff --git a/doc/README.bedbug b/doc/README.bedbug
index 2616acc..4c1e6c4 100644
--- a/doc/README.bedbug
+++ b/doc/README.bedbug
@@ -18,15 +18,15 @@ can be easily implemented.
./common/board.c
Added call to initialize debugger on startup.
-./cpu/ppc4xx/Makefile
+./arch/ppc/cpu/ppc4xx/Makefile
Added bedbug_405.c to the Makefile.
-./cpu/ppc4xx/start.S
+./arch/ppc/cpu/ppc4xx/start.S
Added code to handle the debug exception (0x2000) on the 405.
Also added code to handle critical exceptions since the debug
is treated as critical on the 405.
-./cpu/ppc4xx/traps.c
+./arch/ppc/cpu/ppc4xx/traps.c
Added more detailed output for the program exception to tell
if it is an illegal instruction, privileged instruction or
a trap. Also added debug trap handler.
@@ -51,7 +51,7 @@ can be easily implemented.
hardware breakpoints and stepping through code. These
routines are common to all PowerPC processors.
-./cpu/ppc4xx/bedbug_405.c
+./arch/ppc/cpu/ppc4xx/bedbug_405.c
AMCC PPC405 specific debugger routines.
@@ -63,16 +63,16 @@ Changes:
common/cmd_bedbug.c
Added call to initialize 860 debugger.
- cpu/mpc8xx/Makefile
+ arch/ppc/cpu/mpc8xx/Makefile
Added new file "bedbug_860.c" to the makefile
- cpu/mpc8xx/start.S
+ arch/ppc/cpu/mpc8xx/start.S
Added handler for InstructionBreakpoint (0xfd00)
- cpu/mpc8xx/traps.c
+ arch/ppc/cpu/mpc8xx/traps.c
Added new routine DebugException()
New Files:
- cpu/mpc8xx/bedbug_860.c
+ arch/ppc/cpu/mpc8xx/bedbug_860.c
CPU-specific routines for 860 debug registers.
diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx
index 2e12174..26fb0c2 100644
--- a/doc/README.mpc5xx
+++ b/doc/README.mpc5xx
@@ -25,7 +25,7 @@ Added or Changed Files:
u-boot-0.2.0/common/cmd_boot.c
u-boot-0.2.0/common/cmd_reginfo.c
u-boot-0.2.0/common/environment.c
-u-boot-0.2.0/cpu/mpc5xx/*
+u-boot-0.2.0/arch/ppc/cpu/mpc5xx/*
u-boot-0.2.0/include/cmd_reginfo.h
u-boot-0.2.0/include/common.h
u-boot-0.2.0/include/ppc_asm.tmpl
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index c4214d9..c1cc23b 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -47,7 +47,7 @@
/*--------------------------------------------------------------------+
* Fixed PHY (PHY-less) support for Ethernet Ports.
*
- * Copied from cpu/ppc4xx/4xx_enet.c
+ * Copied from arch/ppc/cpu/ppc4xx/4xx_enet.c
*--------------------------------------------------------------------*/
/*
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index c4b36f0..687ffe6 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2006 Ben Warren, Qstreams Networks Inc.
- * With help from the common/soft_spi and cpu/mpc8260 drivers
+ * With help from the common/soft_spi and arch/ppc/cpu/mpc8260 drivers
*
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/examples/standalone/mem_to_mem_idma2intr.c b/examples/standalone/mem_to_mem_idma2intr.c
index 15779d0..eeff5f5 100644
--- a/examples/standalone/mem_to_mem_idma2intr.c
+++ b/examples/standalone/mem_to_mem_idma2intr.c
@@ -1,5 +1,5 @@
/* The dpalloc function used and implemented in this file was derieved
- * from PPCBoot/U-Boot file "cpu/mpc8260/commproc.c".
+ * from PPCBoot/U-Boot file "arch/ppc/cpu/mpc8260/commproc.c".
*/
/* Author: Arun Dharankar <ADharankar at ATTBI.Com>
diff --git a/include/configs/aria.h b/include/configs/aria.h
index f89fc57..06763c5 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -190,7 +190,7 @@
/*
* Backward compatible definitions,
- * so we do not have to change cpu/mpc512x/fixed_sdram.c
+ * so we do not have to change arch/ppc/cpu/mpc512x/fixed_sdram.c
*/
#define CONFIG_SYS_DDRCMD_EM2 (CONFIG_SYS_MICRON_EMR2)
#define CONFIG_SYS_DDRCMD_EM3 (CONFIG_SYS_MICRON_EMR3)
diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index 4be28b2..44669ea 100644
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -141,7 +141,7 @@
#define CONFIG_SYS_FLASH_BASE 0xfe000000
/*
- * The flash size is autoconfigured, but cpu/mpc5xxx/cpu_init.c needs this
+ * The flash size is autoconfigured, but arch/ppc/cpu/mpc5xxx/cpu_init.c needs this
* variable defined
*/
#define CONFIG_SYS_FLASH_SIZE 0x02000000
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index a79feec..e5537da 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -230,7 +230,7 @@
* SDRAM Controller DDR autocalibration values and takes a lot longer
* to run than Method_B.
* (See the Method_A and Method_B algorithm discription in the file:
- * cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c)
+ * arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c)
* Define CONFIG_PPC4xx_DDR_METHOD_A to use DDR autocalibration Method_A
*
* DDR Autocalibration Method_B is the default.
diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index 16b464c..3958d09 100644
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -290,7 +290,7 @@
* taken from the orignal Linkstation boot code
*
* Most of the low level configuration setttings are normally used
- * in cpu/mpc824x/cpu_init.c which is NOT used by this implementation.
+ * in arch/ppc/cpu/mpc824x/cpu_init.c which is NOT used by this implementation.
* Low level initialisation is done in board/linkstation/early_init.S
* The values below are included for reference purpose only
*/
diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 403837e..2472187 100644
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -233,7 +233,7 @@
* Definitions for initial stack pointer and data area (in data cache)
*/
/* use on chip memory (OCM) for temperary stack until sdram is tested */
-/* see ./cpu/ppc4xx/start.S */
+/* see ./arch/ppc/cpu/ppc4xx/start.S */
#define CONFIG_SYS_TEMP_STACK_OCM 1
/* On Chip Memory location */
@@ -251,7 +251,7 @@
* Taken from PPCBoot board/icecube/icecube.h
*/
-/* see ./cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */
+/* see ./arch/ppc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */
#define CONFIG_SYS_EBC_PB0AP 0x04002480
/* AMD NOR flash - this corresponds to FLASH_BASE so may be correct */
#define CONFIG_SYS_EBC_PB0CR 0xFFC5A000
@@ -269,7 +269,7 @@
*
* Taken in part from PPCBoot board/icecube/icecube.h
*/
-/* see ./cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */
+/* see ./arch/ppc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */
#define CONFIG_SYS_GPIO0_OSRH 0x55555550
#define CONFIG_SYS_GPIO0_OSRL 0x00000110
#define CONFIG_SYS_GPIO0_ISR1H 0x00000000
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index d00f248..7423663 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -456,7 +456,7 @@
* - internal SRAM (OCM=On Chip Memory) is placed to CONFIG_SYS_OCM_DATA_ADDR
* - Stackpointer will be located to
* (CONFIG_SYS_INIT_RAM_ADDR&0xFFFF0000) | (CONFIG_SYS_INIT_SP_OFFSET&0x0000FFFF)
- * in cpu/ppc4xx/start.S
+ * in arch/ppc/cpu/ppc4xx/start.S
*/
#undef CONFIG_SYS_INIT_DCACHE_CS
@@ -495,7 +495,7 @@
#define BOOTFLAG_WARM 0x02 /* Software reboot */
/* ################################################################################### */
-/* These defines will be used in cpu/ppc4xx/cpu_init.c to setup external chip selects */
+/* These defines will be used in arch/ppc/cpu/ppc4xx/cpu_init.c to setup external chip selects */
/* They are currently undefined cause they are initiaized in board/solidcard3/init.S */
/* This chip select accesses the boot device */
diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile
index f37425e..fce4582 100644
--- a/nand_spl/board/amcc/acadia/Makefile
+++ b/nand_spl/board/amcc/acadia/Makefile
@@ -68,11 +68,11 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# from cpu directory
$(obj)cache.S:
@rm -f $(obj)cache.S
- ln -s $(SRCTREE)/cpu/ppc4xx/cache.S $(obj)cache.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/cache.S $(obj)cache.S
$(obj)gpio.c:
@rm -f $(obj)gpio.c
- ln -s $(SRCTREE)/cpu/ppc4xx/gpio.c $(obj)gpio.c
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/gpio.c $(obj)gpio.c
$(obj)ndfc.c:
@rm -f $(obj)ndfc.c
@@ -80,11 +80,11 @@ $(obj)ndfc.c:
$(obj)resetvec.S:
@rm -f $(obj)resetvec.S
- ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
$(obj)start.S:
@rm -f $(obj)start.S
- ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
# from board directory
$(obj)memory.c:
diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile
index 5fcf290..48fde1d 100644
--- a/nand_spl/board/amcc/bamboo/Makefile
+++ b/nand_spl/board/amcc/bamboo/Makefile
@@ -66,11 +66,11 @@ $(obj)ndfc.c:
$(obj)resetvec.S:
@rm -f $(obj)resetvec.S
- ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
$(obj)start.S:
@rm -f $(obj)start.S
- ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
# from board directory
$(obj)init.S:
diff --git a/nand_spl/board/amcc/canyonlands/Makefile b/nand_spl/board/amcc/canyonlands/Makefile
index f77e459..0012a9c 100644
--- a/nand_spl/board/amcc/canyonlands/Makefile
+++ b/nand_spl/board/amcc/canyonlands/Makefile
@@ -71,11 +71,11 @@ $(obj)ndfc.c:
$(obj)resetvec.S:
@rm -f $(obj)resetvec.S
- ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
$(obj)start.S:
@rm -f $(obj)start.S
- ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
# from board directory
$(obj)init.S:
diff --git a/nand_spl/board/amcc/kilauea/Makefile b/nand_spl/board/amcc/kilauea/Makefile
index bc21744..de4980a 100644
--- a/nand_spl/board/amcc/kilauea/Makefile
+++ b/nand_spl/board/amcc/kilauea/Makefile
@@ -62,15 +62,15 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# from cpu directory
$(obj)44x_spd_ddr2.c: $(obj)ecc.h
@rm -f $(obj)44x_spd_ddr2.c
- ln -s $(SRCTREE)/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c
$(obj)cache.S:
@rm -f $(obj)cache.S
- ln -s $(SRCTREE)/cpu/ppc4xx/cache.S $(obj)cache.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/cache.S $(obj)cache.S
$(obj)ecc.h:
@rm -f $(obj)ecc.h
- ln -s $(SRCTREE)/cpu/ppc4xx/ecc.h $(obj)ecc.h
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/ecc.h $(obj)ecc.h
$(obj)ndfc.c:
@rm -f $(obj)ndfc.c
@@ -78,11 +78,11 @@ $(obj)ndfc.c:
$(obj)resetvec.S:
@rm -f $(obj)resetvec.S
- ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
$(obj)start.S:
@rm -f $(obj)start.S
- ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
# from nand_spl directory
$(obj)nand_boot.c:
diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile
index 54ea7c7..e6f96fd 100644
--- a/nand_spl/board/amcc/sequoia/Makefile
+++ b/nand_spl/board/amcc/sequoia/Makefile
@@ -62,7 +62,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# from cpu directory
$(obj)denali_data_eye.c:
@rm -f $(obj)denali_data_eye.c
- ln -s $(SRCTREE)/cpu/ppc4xx/denali_data_eye.c $(obj)denali_data_eye.c
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/denali_data_eye.c $(obj)denali_data_eye.c
$(obj)ndfc.c:
@rm -f $(obj)ndfc.c
@@ -70,11 +70,11 @@ $(obj)ndfc.c:
$(obj)resetvec.S:
@rm -f $(obj)resetvec.S
- ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
$(obj)start.S:
@rm -f $(obj)start.S
- ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S
+ ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
# from board directory
$(obj)init.S:
diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile
index ee1dc4b..a23176c 100644
--- a/nand_spl/board/freescale/mpc8313erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8313erdb/Makefile
@@ -65,7 +65,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# create symbolic links for common files
$(obj)start.S:
- ln -sf $(SRCTREE)/cpu/mpc83xx/start.S $(obj)start.S
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $(obj)start.S
$(obj)nand_boot_fsl_elbc.c:
ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \
@@ -81,7 +81,7 @@ $(obj)ns16550.c:
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
$(obj)nand_init.c:
- ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
$(obj)cache.c:
ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index ee1dc4b..a23176c 100644
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -65,7 +65,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# create symbolic links for common files
$(obj)start.S:
- ln -sf $(SRCTREE)/cpu/mpc83xx/start.S $(obj)start.S
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $(obj)start.S
$(obj)nand_boot_fsl_elbc.c:
ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \
@@ -81,7 +81,7 @@ $(obj)ns16550.c:
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
$(obj)nand_init.c:
- ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
$(obj)cache.c:
ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index ff8b8be..7f75afc 100644
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -68,11 +68,11 @@ $(obj)cache.c:
$(obj)cpu_init_early.c:
@rm -f $(obj)cpu_init_early.c
- ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
$(obj)cpu_init_nand.c:
@rm -f $(obj)cpu_init_nand.c
- ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
$(obj)fsl_law.c:
@rm -f $(obj)fsl_law.c
@@ -97,15 +97,15 @@ $(obj)resetvec.S:
$(obj)fixed_ivor.S:
@rm -f $(obj)fixed_ivor.S
- ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
$(obj)start.S: $(obj)fixed_ivor.S
@rm -f $(obj)start.S
- ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S
$(obj)tlb.c:
@rm -f $(obj)tlb.c
- ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c
$(obj)tlb_table.c:
@rm -f $(obj)tlb_table.c
diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index ff8b8be..7f75afc 100644
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -68,11 +68,11 @@ $(obj)cache.c:
$(obj)cpu_init_early.c:
@rm -f $(obj)cpu_init_early.c
- ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
$(obj)cpu_init_nand.c:
@rm -f $(obj)cpu_init_nand.c
- ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
$(obj)fsl_law.c:
@rm -f $(obj)fsl_law.c
@@ -97,15 +97,15 @@ $(obj)resetvec.S:
$(obj)fixed_ivor.S:
@rm -f $(obj)fixed_ivor.S
- ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
$(obj)start.S: $(obj)fixed_ivor.S
@rm -f $(obj)start.S
- ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S
$(obj)tlb.c:
@rm -f $(obj)tlb.c
- ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c
$(obj)tlb_table.c:
@rm -f $(obj)tlb_table.c
diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index ff8b8be..7f75afc 100644
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -68,11 +68,11 @@ $(obj)cache.c:
$(obj)cpu_init_early.c:
@rm -f $(obj)cpu_init_early.c
- ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
$(obj)cpu_init_nand.c:
@rm -f $(obj)cpu_init_nand.c
- ln -sf $(SRCTREE)/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
$(obj)fsl_law.c:
@rm -f $(obj)fsl_law.c
@@ -97,15 +97,15 @@ $(obj)resetvec.S:
$(obj)fixed_ivor.S:
@rm -f $(obj)fixed_ivor.S
- ln -sf $(SRCTREE)/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
$(obj)start.S: $(obj)fixed_ivor.S
@rm -f $(obj)start.S
- ln -sf $(SRCTREE)/cpu/mpc85xx/start.S $(obj)start.S
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S
$(obj)tlb.c:
@rm -f $(obj)tlb.c
- ln -sf $(SRCTREE)/cpu/mpc85xx/tlb.c $(obj)tlb.c
+ ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c
$(obj)tlb_table.c:
@rm -f $(obj)tlb_table.c
diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index 48c22f8..3ad6250 100644
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -66,7 +66,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
$(obj)start.S:
@rm -f $@
- ln -s $(SRCTREE)/cpu/mpc83xx/start.S $@
+ ln -s $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $@
$(obj)nand_boot_fsl_elbc.c:
@rm -f $@
@@ -86,7 +86,7 @@ $(obj)ns16550.c:
$(obj)nand_init.c:
@rm -f $@
- ln -s $(SRCTREE)/cpu/mpc83xx/nand_init.c $@
+ ln -s $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $@
$(obj)cache.c:
@rm -f $@
diff --git a/post/cpu/ppc4xx/spr.c b/post/cpu/ppc4xx/spr.c
index ecb87b5..6ff5c79 100644
--- a/post/cpu/ppc4xx/spr.c
+++ b/post/cpu/ppc4xx/spr.c
@@ -69,7 +69,7 @@ static struct {
/* Additional Special-Purpose Registers.
* The values must match the initialization
- * values from cpu/ppc4xx/start.S
+ * values from arch/ppc/cpu/ppc4xx/start.S
*/
{0x30, "PID", 0x00000000, 0x00000000},
{0x3a, "CSRR0", 0x00000000, 0x00000000},
--
1.6.2.1
More information about the U-Boot
mailing list