Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Mon, 10 May 2010 06:20:50 +0000 (15:20 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 10 May 2010 06:20:50 +0000 (15:20 +0900)
Conflicts:
arch/arm/include/asm/mach-types.h
common/serial.c

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
682 files changed:
MAINTAINERS
MAKEALL
Makefile
README
api/api_platform-powerpc.c [moved from api/api_platform-ppc.c with 100% similarity]
arch/arm/include/asm/mach-types.h
arch/microblaze/cpu/cache.c
arch/microblaze/cpu/interrupts.c
arch/microblaze/cpu/irq.S
arch/microblaze/cpu/timer.c
arch/microblaze/lib/Makefile
arch/microblaze/lib/board.c
arch/microblaze/lib/bootm.c
arch/nios2/config.mk
arch/nios2/cpu/start.S
arch/nios2/cpu/u-boot.lds [moved from board/altera/ep1c20/u-boot.lds with 98% similarity]
arch/nios2/include/asm/byteorder.h
arch/nios2/include/asm/dma-mapping.h [new file with mode: 0644]
arch/nios2/lib/board.c
arch/powerpc/config.mk [moved from arch/ppc/config.mk with 100% similarity]
arch/powerpc/cpu/74xx_7xx/Makefile [moved from arch/ppc/cpu/74xx_7xx/Makefile with 100% similarity]
arch/powerpc/cpu/74xx_7xx/cache.S [moved from arch/ppc/cpu/74xx_7xx/cache.S with 100% similarity]
arch/powerpc/cpu/74xx_7xx/config.mk [moved from arch/ppc/cpu/74xx_7xx/config.mk with 100% similarity]
arch/powerpc/cpu/74xx_7xx/cpu.c [moved from arch/ppc/cpu/74xx_7xx/cpu.c with 100% similarity]
arch/powerpc/cpu/74xx_7xx/cpu_init.c [moved from arch/ppc/cpu/74xx_7xx/cpu_init.c with 100% similarity]
arch/powerpc/cpu/74xx_7xx/interrupts.c [moved from arch/ppc/cpu/74xx_7xx/interrupts.c with 100% similarity]
arch/powerpc/cpu/74xx_7xx/io.S [moved from arch/ppc/cpu/74xx_7xx/io.S with 100% similarity]
arch/powerpc/cpu/74xx_7xx/kgdb.S [moved from arch/ppc/cpu/74xx_7xx/kgdb.S with 100% similarity]
arch/powerpc/cpu/74xx_7xx/speed.c [moved from arch/ppc/cpu/74xx_7xx/speed.c with 100% similarity]
arch/powerpc/cpu/74xx_7xx/start.S [moved from arch/ppc/cpu/74xx_7xx/start.S with 100% similarity]
arch/powerpc/cpu/74xx_7xx/traps.c [moved from arch/ppc/cpu/74xx_7xx/traps.c with 99% similarity]
arch/powerpc/cpu/mpc512x/Makefile [moved from arch/ppc/cpu/mpc512x/Makefile with 98% similarity]
arch/powerpc/cpu/mpc512x/asm-offsets.h [moved from arch/ppc/cpu/mpc512x/asm-offsets.h with 87% similarity]
arch/powerpc/cpu/mpc512x/common.c [new file with mode: 0644]
arch/powerpc/cpu/mpc512x/config.mk [moved from arch/ppc/cpu/mpc512x/config.mk with 94% similarity]
arch/powerpc/cpu/mpc512x/cpu.c [moved from arch/ppc/cpu/mpc512x/cpu.c with 100% similarity]
arch/powerpc/cpu/mpc512x/cpu_init.c [moved from arch/ppc/cpu/mpc512x/cpu_init.c with 100% similarity]
arch/powerpc/cpu/mpc512x/diu.c [moved from arch/ppc/cpu/mpc512x/diu.c with 94% similarity]
arch/powerpc/cpu/mpc512x/fixed_sdram.c [moved from arch/ppc/cpu/mpc512x/fixed_sdram.c with 94% similarity]
arch/powerpc/cpu/mpc512x/i2c.c [moved from arch/ppc/cpu/mpc512x/i2c.c with 100% similarity]
arch/powerpc/cpu/mpc512x/ide.c [moved from arch/ppc/cpu/mpc512x/ide.c with 100% similarity]
arch/powerpc/cpu/mpc512x/iim.c [moved from arch/ppc/cpu/mpc512x/iim.c with 100% similarity]
arch/powerpc/cpu/mpc512x/interrupts.c [moved from arch/ppc/cpu/mpc512x/interrupts.c with 100% similarity]
arch/powerpc/cpu/mpc512x/iopin.c [moved from arch/ppc/cpu/mpc512x/iopin.c with 100% similarity]
arch/powerpc/cpu/mpc512x/pci.c [moved from arch/ppc/cpu/mpc512x/pci.c with 100% similarity]
arch/powerpc/cpu/mpc512x/serial.c [new file with mode: 0644]
arch/powerpc/cpu/mpc512x/speed.c [moved from arch/ppc/cpu/mpc512x/speed.c with 100% similarity]
arch/powerpc/cpu/mpc512x/start.S [moved from arch/ppc/cpu/mpc512x/start.S with 100% similarity]
arch/powerpc/cpu/mpc512x/traps.c [moved from arch/ppc/cpu/mpc512x/traps.c with 100% similarity]
arch/powerpc/cpu/mpc512x/u-boot.lds [moved from arch/ppc/cpu/mpc512x/u-boot.lds with 98% similarity]
arch/powerpc/cpu/mpc5xx/Makefile [moved from arch/ppc/cpu/mpc5xx/Makefile with 93% similarity]
arch/powerpc/cpu/mpc5xx/config.mk [moved from arch/ppc/cpu/mpc5xx/config.mk with 95% similarity]
arch/powerpc/cpu/mpc5xx/cpu.c [moved from arch/ppc/cpu/mpc5xx/cpu.c with 100% similarity]
arch/powerpc/cpu/mpc5xx/cpu_init.c [moved from arch/ppc/cpu/mpc5xx/cpu_init.c with 100% similarity]
arch/powerpc/cpu/mpc5xx/interrupts.c [moved from arch/ppc/cpu/mpc5xx/interrupts.c with 100% similarity]
arch/powerpc/cpu/mpc5xx/serial.c [moved from arch/ppc/cpu/mpc5xx/serial.c with 100% similarity]
arch/powerpc/cpu/mpc5xx/speed.c [moved from arch/ppc/cpu/mpc5xx/speed.c with 100% similarity]
arch/powerpc/cpu/mpc5xx/spi.c [moved from arch/ppc/cpu/mpc5xx/spi.c with 100% similarity]
arch/powerpc/cpu/mpc5xx/start.S [moved from arch/ppc/cpu/mpc5xx/start.S with 100% similarity]
arch/powerpc/cpu/mpc5xx/traps.c [moved from arch/ppc/cpu/mpc5xx/traps.c with 99% similarity]
arch/powerpc/cpu/mpc5xx/u-boot.lds [moved from arch/ppc/cpu/mpc5xx/u-boot.lds with 98% similarity]
arch/powerpc/cpu/mpc5xxx/Makefile [moved from arch/ppc/cpu/mpc5xxx/Makefile with 100% similarity]
arch/powerpc/cpu/mpc5xxx/config.mk [moved from arch/ppc/cpu/mpc5xxx/config.mk with 94% similarity]
arch/powerpc/cpu/mpc5xxx/cpu.c [moved from arch/ppc/cpu/mpc5xxx/cpu.c with 100% similarity]
arch/powerpc/cpu/mpc5xxx/cpu_init.c [moved from arch/ppc/cpu/mpc5xxx/cpu_init.c with 100% similarity]
arch/powerpc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S [moved from arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S with 100% similarity]
arch/powerpc/cpu/mpc5xxx/i2c.c [moved from arch/ppc/cpu/mpc5xxx/i2c.c with 100% similarity]
arch/powerpc/cpu/mpc5xxx/ide.c [moved from arch/ppc/cpu/mpc5xxx/ide.c with 100% similarity]
arch/powerpc/cpu/mpc5xxx/interrupts.c [moved from arch/ppc/cpu/mpc5xxx/interrupts.c with 99% similarity]
arch/powerpc/cpu/mpc5xxx/io.S [moved from arch/ppc/cpu/mpc5xxx/io.S with 100% similarity]
arch/powerpc/cpu/mpc5xxx/loadtask.c [moved from arch/ppc/cpu/mpc5xxx/loadtask.c with 100% similarity]
arch/powerpc/cpu/mpc5xxx/pci_mpc5200.c [moved from arch/ppc/cpu/mpc5xxx/pci_mpc5200.c with 100% similarity]
arch/powerpc/cpu/mpc5xxx/serial.c [moved from arch/ppc/cpu/mpc5xxx/serial.c with 98% similarity]
arch/powerpc/cpu/mpc5xxx/speed.c [moved from arch/ppc/cpu/mpc5xxx/speed.c with 100% similarity]
arch/powerpc/cpu/mpc5xxx/start.S [moved from arch/ppc/cpu/mpc5xxx/start.S with 99% similarity]
arch/powerpc/cpu/mpc5xxx/traps.c [moved from arch/ppc/cpu/mpc5xxx/traps.c with 99% similarity]
arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds [moved from arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds with 94% similarity]
arch/powerpc/cpu/mpc5xxx/u-boot.lds [moved from arch/ppc/cpu/mpc5xxx/u-boot.lds with 98% similarity]
arch/powerpc/cpu/mpc5xxx/usb.c [moved from arch/ppc/cpu/mpc5xxx/usb.c with 100% similarity]
arch/powerpc/cpu/mpc5xxx/usb_ohci.c [moved from arch/ppc/cpu/mpc5xxx/usb_ohci.c with 100% similarity]
arch/powerpc/cpu/mpc5xxx/usb_ohci.h [moved from arch/ppc/cpu/mpc5xxx/usb_ohci.h with 100% similarity]
arch/powerpc/cpu/mpc8220/Makefile [moved from arch/ppc/cpu/mpc8220/Makefile with 100% similarity]
arch/powerpc/cpu/mpc8220/config.mk [moved from arch/ppc/cpu/mpc8220/config.mk with 94% similarity]
arch/powerpc/cpu/mpc8220/cpu.c [moved from arch/ppc/cpu/mpc8220/cpu.c with 100% similarity]
arch/powerpc/cpu/mpc8220/cpu_init.c [moved from arch/ppc/cpu/mpc8220/cpu_init.c with 100% similarity]
arch/powerpc/cpu/mpc8220/dma.h [moved from arch/ppc/cpu/mpc8220/dma.h with 100% similarity]
arch/powerpc/cpu/mpc8220/dramSetup.c [moved from arch/ppc/cpu/mpc8220/dramSetup.c with 100% similarity]
arch/powerpc/cpu/mpc8220/dramSetup.h [moved from arch/ppc/cpu/mpc8220/dramSetup.h with 100% similarity]
arch/powerpc/cpu/mpc8220/fec.c [moved from arch/ppc/cpu/mpc8220/fec.c with 100% similarity]
arch/powerpc/cpu/mpc8220/fec.h [moved from arch/ppc/cpu/mpc8220/fec.h with 100% similarity]
arch/powerpc/cpu/mpc8220/fec_dma_tasks.S [moved from arch/ppc/cpu/mpc8220/fec_dma_tasks.S with 100% similarity]
arch/powerpc/cpu/mpc8220/i2c.c [moved from arch/ppc/cpu/mpc8220/i2c.c with 100% similarity]
arch/powerpc/cpu/mpc8220/i2cCore.c [moved from arch/ppc/cpu/mpc8220/i2cCore.c with 100% similarity]
arch/powerpc/cpu/mpc8220/i2cCore.h [moved from arch/ppc/cpu/mpc8220/i2cCore.h with 100% similarity]
arch/powerpc/cpu/mpc8220/interrupts.c [moved from arch/ppc/cpu/mpc8220/interrupts.c with 100% similarity]
arch/powerpc/cpu/mpc8220/io.S [moved from arch/ppc/cpu/mpc8220/io.S with 100% similarity]
arch/powerpc/cpu/mpc8220/loadtask.c [moved from arch/ppc/cpu/mpc8220/loadtask.c with 100% similarity]
arch/powerpc/cpu/mpc8220/pci.c [moved from arch/ppc/cpu/mpc8220/pci.c with 100% similarity]
arch/powerpc/cpu/mpc8220/speed.c [moved from arch/ppc/cpu/mpc8220/speed.c with 100% similarity]
arch/powerpc/cpu/mpc8220/start.S [moved from arch/ppc/cpu/mpc8220/start.S with 99% similarity]
arch/powerpc/cpu/mpc8220/traps.c [moved from arch/ppc/cpu/mpc8220/traps.c with 99% similarity]
arch/powerpc/cpu/mpc8220/u-boot.lds [moved from arch/ppc/cpu/mpc8220/u-boot.lds with 98% similarity]
arch/powerpc/cpu/mpc8220/uart.c [moved from arch/ppc/cpu/mpc8220/uart.c with 100% similarity]
arch/powerpc/cpu/mpc824x/.gitignore [moved from arch/ppc/cpu/mpc824x/.gitignore with 100% similarity]
arch/powerpc/cpu/mpc824x/Makefile [moved from arch/ppc/cpu/mpc824x/Makefile with 100% similarity]
arch/powerpc/cpu/mpc824x/config.mk [moved from arch/ppc/cpu/mpc824x/config.mk with 94% similarity]
arch/powerpc/cpu/mpc824x/cpu.c [moved from arch/ppc/cpu/mpc824x/cpu.c with 100% similarity]
arch/powerpc/cpu/mpc824x/cpu_init.c [moved from arch/ppc/cpu/mpc824x/cpu_init.c with 100% similarity]
arch/powerpc/cpu/mpc824x/drivers/epic.h [moved from arch/ppc/cpu/mpc824x/drivers/epic.h with 100% similarity]
arch/powerpc/cpu/mpc824x/drivers/epic/README [moved from arch/ppc/cpu/mpc824x/drivers/epic/README with 100% similarity]
arch/powerpc/cpu/mpc824x/drivers/epic/epic.h [moved from arch/ppc/cpu/mpc824x/drivers/epic/epic.h with 100% similarity]
arch/powerpc/cpu/mpc824x/drivers/epic/epic1.c [moved from arch/ppc/cpu/mpc824x/drivers/epic/epic1.c with 100% similarity]
arch/powerpc/cpu/mpc824x/drivers/epic/epic2.S [moved from arch/ppc/cpu/mpc824x/drivers/epic/epic2.S with 100% similarity]
arch/powerpc/cpu/mpc824x/drivers/epic/epicutil.S [moved from arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S with 100% similarity]
arch/powerpc/cpu/mpc824x/drivers/errors.h [moved from arch/ppc/cpu/mpc824x/drivers/errors.h with 100% similarity]
arch/powerpc/cpu/mpc824x/drivers/i2c/i2c.c [moved from arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c with 100% similarity]
arch/powerpc/cpu/mpc824x/drivers/i2c_export.h [moved from arch/ppc/cpu/mpc824x/drivers/i2c_export.h with 100% similarity]
arch/powerpc/cpu/mpc824x/interrupts.c [moved from arch/ppc/cpu/mpc824x/interrupts.c with 100% similarity]
arch/powerpc/cpu/mpc824x/pci.c [moved from arch/ppc/cpu/mpc824x/pci.c with 97% similarity]
arch/powerpc/cpu/mpc824x/speed.c [moved from arch/ppc/cpu/mpc824x/speed.c with 100% similarity]
arch/powerpc/cpu/mpc824x/start.S [moved from arch/ppc/cpu/mpc824x/start.S with 100% similarity]
arch/powerpc/cpu/mpc824x/traps.c [moved from arch/ppc/cpu/mpc824x/traps.c with 99% similarity]
arch/powerpc/cpu/mpc824x/u-boot.lds [moved from arch/ppc/cpu/mpc8260/u-boot.lds with 98% similarity]
arch/powerpc/cpu/mpc8260/Makefile [moved from arch/ppc/cpu/mpc8260/Makefile with 100% similarity]
arch/powerpc/cpu/mpc8260/bedbug_603e.c [moved from arch/ppc/cpu/mpc8260/bedbug_603e.c with 100% similarity]
arch/powerpc/cpu/mpc8260/commproc.c [moved from arch/ppc/cpu/mpc8260/commproc.c with 98% similarity]
arch/powerpc/cpu/mpc8260/config.mk [moved from arch/ppc/cpu/mpc8260/config.mk with 94% similarity]
arch/powerpc/cpu/mpc8260/cpu.c [moved from arch/ppc/cpu/mpc8260/cpu.c with 100% similarity]
arch/powerpc/cpu/mpc8260/cpu_init.c [moved from arch/ppc/cpu/mpc8260/cpu_init.c with 100% similarity]
arch/powerpc/cpu/mpc8260/ether_fcc.c [moved from arch/ppc/cpu/mpc8260/ether_fcc.c with 100% similarity]
arch/powerpc/cpu/mpc8260/ether_scc.c [moved from arch/ppc/cpu/mpc8260/ether_scc.c with 100% similarity]
arch/powerpc/cpu/mpc8260/i2c.c [moved from arch/ppc/cpu/mpc8260/i2c.c with 100% similarity]
arch/powerpc/cpu/mpc8260/interrupts.c [moved from arch/ppc/cpu/mpc8260/interrupts.c with 97% similarity]
arch/powerpc/cpu/mpc8260/kgdb.S [moved from arch/ppc/cpu/mpc8260/kgdb.S with 100% similarity]
arch/powerpc/cpu/mpc8260/pci.c [moved from arch/ppc/cpu/mpc8260/pci.c with 100% similarity]
arch/powerpc/cpu/mpc8260/serial_scc.c [moved from arch/ppc/cpu/mpc8260/serial_scc.c with 100% similarity]
arch/powerpc/cpu/mpc8260/serial_smc.c [moved from arch/ppc/cpu/mpc8260/serial_smc.c with 99% similarity]
arch/powerpc/cpu/mpc8260/speed.c [moved from arch/ppc/cpu/mpc8260/speed.c with 100% similarity]
arch/powerpc/cpu/mpc8260/speed.h [moved from arch/ppc/cpu/mpc8260/speed.h with 100% similarity]
arch/powerpc/cpu/mpc8260/spi.c [moved from arch/ppc/cpu/mpc8260/spi.c with 100% similarity]
arch/powerpc/cpu/mpc8260/start.S [moved from arch/ppc/cpu/mpc8260/start.S with 99% similarity]
arch/powerpc/cpu/mpc8260/traps.c [moved from arch/ppc/cpu/mpc8260/traps.c with 99% similarity]
arch/powerpc/cpu/mpc8260/u-boot.lds [moved from arch/ppc/cpu/mpc824x/u-boot.lds with 98% similarity]
arch/powerpc/cpu/mpc83xx/Makefile [moved from arch/ppc/cpu/mpc83xx/Makefile with 100% similarity]
arch/powerpc/cpu/mpc83xx/config.mk [moved from arch/ppc/cpu/mpc83xx/config.mk with 94% similarity]
arch/powerpc/cpu/mpc83xx/cpu.c [moved from arch/ppc/cpu/mpc83xx/cpu.c with 98% similarity]
arch/powerpc/cpu/mpc83xx/cpu_init.c [moved from arch/ppc/cpu/mpc83xx/cpu_init.c with 100% similarity]
arch/powerpc/cpu/mpc83xx/ecc.c [moved from arch/ppc/cpu/mpc83xx/ecc.c with 100% similarity]
arch/powerpc/cpu/mpc83xx/fdt.c [moved from arch/ppc/cpu/mpc83xx/fdt.c with 100% similarity]
arch/powerpc/cpu/mpc83xx/interrupts.c [moved from arch/ppc/cpu/mpc83xx/interrupts.c with 100% similarity]
arch/powerpc/cpu/mpc83xx/nand_init.c [moved from arch/ppc/cpu/mpc83xx/nand_init.c with 100% similarity]
arch/powerpc/cpu/mpc83xx/pci.c [moved from arch/ppc/cpu/mpc83xx/pci.c with 100% similarity]
arch/powerpc/cpu/mpc83xx/pcie.c [moved from arch/ppc/cpu/mpc83xx/pcie.c with 100% similarity]
arch/powerpc/cpu/mpc83xx/qe_io.c [moved from arch/ppc/cpu/mpc83xx/qe_io.c with 100% similarity]
arch/powerpc/cpu/mpc83xx/serdes.c [moved from arch/ppc/cpu/mpc83xx/serdes.c with 99% similarity]
arch/powerpc/cpu/mpc83xx/spd_sdram.c [moved from arch/ppc/cpu/mpc83xx/spd_sdram.c with 100% similarity]
arch/powerpc/cpu/mpc83xx/speed.c [moved from arch/ppc/cpu/mpc83xx/speed.c with 98% similarity]
arch/powerpc/cpu/mpc83xx/start.S [moved from arch/ppc/cpu/mpc83xx/start.S with 99% similarity]
arch/powerpc/cpu/mpc83xx/traps.c [moved from arch/ppc/cpu/mpc83xx/traps.c with 100% similarity]
arch/powerpc/cpu/mpc83xx/u-boot.lds [moved from arch/ppc/cpu/mpc83xx/u-boot.lds with 98% similarity]
arch/powerpc/cpu/mpc85xx/Makefile [moved from arch/ppc/cpu/mpc85xx/Makefile with 100% similarity]
arch/powerpc/cpu/mpc85xx/commproc.c [moved from arch/ppc/cpu/mpc85xx/commproc.c with 98% similarity]
arch/powerpc/cpu/mpc85xx/config.mk [moved from arch/ppc/cpu/mpc85xx/config.mk with 95% similarity]
arch/powerpc/cpu/mpc85xx/cpu.c [moved from arch/ppc/cpu/mpc85xx/cpu.c with 97% similarity]
arch/powerpc/cpu/mpc85xx/cpu_init.c [moved from arch/ppc/cpu/mpc85xx/cpu_init.c with 88% similarity]
arch/powerpc/cpu/mpc85xx/cpu_init_early.c [moved from arch/ppc/cpu/mpc85xx/cpu_init_early.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/cpu_init_nand.c [moved from arch/ppc/cpu/mpc85xx/cpu_init_nand.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/ddr-gen1.c [moved from arch/ppc/cpu/mpc85xx/ddr-gen1.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/ddr-gen2.c [moved from arch/ppc/cpu/mpc85xx/ddr-gen2.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/ddr-gen3.c [moved from arch/ppc/cpu/mpc85xx/ddr-gen3.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/ether_fcc.c [moved from arch/ppc/cpu/mpc85xx/ether_fcc.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/fdt.c [moved from arch/ppc/cpu/mpc85xx/fdt.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/fixed_ivor.S [moved from arch/ppc/cpu/mpc85xx/fixed_ivor.S with 100% similarity]
arch/powerpc/cpu/mpc85xx/interrupts.c [moved from arch/ppc/cpu/mpc85xx/interrupts.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/mp.c [moved from arch/ppc/cpu/mpc85xx/mp.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/mp.h [moved from arch/ppc/cpu/mpc85xx/mp.h with 100% similarity]
arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c [moved from arch/ppc/cpu/mpc85xx/mpc8536_serdes.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/pci.c [moved from arch/ppc/cpu/mpc85xx/pci.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/qe_io.c [moved from arch/ppc/cpu/mpc85xx/qe_io.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/release.S [moved from arch/ppc/cpu/mpc85xx/release.S with 100% similarity]
arch/powerpc/cpu/mpc85xx/resetvec.S [moved from arch/ppc/cpu/mpc85xx/resetvec.S with 100% similarity]
arch/powerpc/cpu/mpc85xx/serial_scc.c [moved from arch/ppc/cpu/mpc85xx/serial_scc.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/speed.c [moved from arch/ppc/cpu/mpc85xx/speed.c with 92% similarity]
arch/powerpc/cpu/mpc85xx/start.S [moved from arch/ppc/cpu/mpc85xx/start.S with 100% similarity]
arch/powerpc/cpu/mpc85xx/tlb.c [moved from arch/ppc/cpu/mpc85xx/tlb.c with 100% similarity]
arch/powerpc/cpu/mpc85xx/traps.c [moved from arch/ppc/cpu/mpc85xx/traps.c with 99% similarity]
arch/powerpc/cpu/mpc85xx/u-boot-nand.lds [moved from arch/ppc/cpu/mpc85xx/u-boot-nand.lds with 98% similarity]
arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds [moved from arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds with 99% similarity]
arch/powerpc/cpu/mpc85xx/u-boot.lds [moved from arch/ppc/cpu/mpc85xx/u-boot.lds with 98% similarity]
arch/powerpc/cpu/mpc86xx/Makefile [moved from arch/ppc/cpu/mpc86xx/Makefile with 100% similarity]
arch/powerpc/cpu/mpc86xx/cache.S [moved from arch/ppc/cpu/mpc86xx/cache.S with 100% similarity]
arch/powerpc/cpu/mpc86xx/config.mk [moved from arch/ppc/cpu/mpc86xx/config.mk with 100% similarity]
arch/powerpc/cpu/mpc86xx/cpu.c [moved from arch/ppc/cpu/mpc86xx/cpu.c with 100% similarity]
arch/powerpc/cpu/mpc86xx/cpu_init.c [moved from arch/ppc/cpu/mpc86xx/cpu_init.c with 100% similarity]
arch/powerpc/cpu/mpc86xx/ddr-8641.c [moved from arch/ppc/cpu/mpc86xx/ddr-8641.c with 100% similarity]
arch/powerpc/cpu/mpc86xx/fdt.c [moved from arch/ppc/cpu/mpc86xx/fdt.c with 100% similarity]
arch/powerpc/cpu/mpc86xx/interrupts.c [moved from arch/ppc/cpu/mpc86xx/interrupts.c with 100% similarity]
arch/powerpc/cpu/mpc86xx/mp.c [moved from arch/ppc/cpu/mpc86xx/mp.c with 100% similarity]
arch/powerpc/cpu/mpc86xx/release.S [moved from arch/ppc/cpu/mpc86xx/release.S with 100% similarity]
arch/powerpc/cpu/mpc86xx/speed.c [moved from arch/ppc/cpu/mpc86xx/speed.c with 100% similarity]
arch/powerpc/cpu/mpc86xx/start.S [moved from arch/ppc/cpu/mpc86xx/start.S with 100% similarity]
arch/powerpc/cpu/mpc86xx/traps.c [moved from arch/ppc/cpu/mpc86xx/traps.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/Makefile [moved from arch/ppc/cpu/mpc8xx/Makefile with 100% similarity]
arch/powerpc/cpu/mpc8xx/bedbug_860.c [moved from arch/ppc/cpu/mpc8xx/bedbug_860.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/commproc.c [moved from arch/ppc/cpu/mpc8xx/commproc.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/config.mk [moved from arch/ppc/cpu/mpc8xx/config.mk with 100% similarity]
arch/powerpc/cpu/mpc8xx/cpu.c [moved from arch/ppc/cpu/mpc8xx/cpu.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/cpu_init.c [moved from arch/ppc/cpu/mpc8xx/cpu_init.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/fdt.c [moved from arch/ppc/cpu/mpc8xx/fdt.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/fec.c [moved from arch/ppc/cpu/mpc8xx/fec.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/fec.h [moved from arch/ppc/cpu/mpc8xx/fec.h with 100% similarity]
arch/powerpc/cpu/mpc8xx/i2c.c [moved from arch/ppc/cpu/mpc8xx/i2c.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/interrupts.c [moved from arch/ppc/cpu/mpc8xx/interrupts.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/kgdb.S [moved from arch/ppc/cpu/mpc8xx/kgdb.S with 100% similarity]
arch/powerpc/cpu/mpc8xx/lcd.c [moved from arch/ppc/cpu/mpc8xx/lcd.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/plprcr_write.S [moved from arch/ppc/cpu/mpc8xx/plprcr_write.S with 100% similarity]
arch/powerpc/cpu/mpc8xx/scc.c [moved from arch/ppc/cpu/mpc8xx/scc.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/serial.c [moved from arch/ppc/cpu/mpc8xx/serial.c with 99% similarity]
arch/powerpc/cpu/mpc8xx/speed.c [moved from arch/ppc/cpu/mpc8xx/speed.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/spi.c [moved from arch/ppc/cpu/mpc8xx/spi.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/start.S [moved from arch/ppc/cpu/mpc8xx/start.S with 100% similarity]
arch/powerpc/cpu/mpc8xx/traps.c [moved from arch/ppc/cpu/mpc8xx/traps.c with 99% similarity]
arch/powerpc/cpu/mpc8xx/upatch.c [moved from arch/ppc/cpu/mpc8xx/upatch.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/video.c [moved from arch/ppc/cpu/mpc8xx/video.c with 100% similarity]
arch/powerpc/cpu/mpc8xx/wlkbd.c [moved from arch/ppc/cpu/mpc8xx/wlkbd.c with 100% similarity]
arch/powerpc/cpu/mpc8xxx/Makefile [moved from arch/ppc/cpu/mpc8xxx/Makefile with 100% similarity]
arch/powerpc/cpu/mpc8xxx/cpu.c [moved from arch/ppc/cpu/mpc8xxx/cpu.c with 96% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/Makefile [moved from arch/ppc/cpu/mpc8xxx/ddr/Makefile with 100% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/common_timing_params.h [moved from arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h with 100% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c [moved from arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c with 99% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/ddr.h [moved from arch/ppc/cpu/mpc8xxx/ddr/ddr.h with 100% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c [moved from arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c with 100% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c [moved from arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c with 100% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c [moved from arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c with 100% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c [moved from arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c with 100% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/main.c [moved from arch/ppc/cpu/mpc8xxx/ddr/main.c with 100% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/options.c [moved from arch/ppc/cpu/mpc8xxx/ddr/options.c with 100% similarity]
arch/powerpc/cpu/mpc8xxx/ddr/util.c [moved from arch/ppc/cpu/mpc8xxx/ddr/util.c with 100% similarity]
arch/powerpc/cpu/mpc8xxx/fdt.c [moved from arch/ppc/cpu/mpc8xxx/fdt.c with 93% similarity]
arch/powerpc/cpu/mpc8xxx/pci_cfg.c [moved from arch/ppc/cpu/mpc8xxx/pci_cfg.c with 93% similarity]
arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c [moved from arch/ppc/cpu/ppc4xx/40x_spd_sdram.c with 99% similarity]
arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c [moved from arch/ppc/cpu/ppc4xx/44x_spd_ddr.c with 99% similarity]
arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c [moved from arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with 99% similarity]
arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c [moved from arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c with 99% similarity]
arch/powerpc/cpu/ppc4xx/4xx_pci.c [moved from arch/ppc/cpu/ppc4xx/4xx_pci.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/4xx_pcie.c [moved from arch/ppc/cpu/ppc4xx/4xx_pcie.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/4xx_uart.c [moved from arch/ppc/cpu/ppc4xx/4xx_uart.c with 99% similarity]
arch/powerpc/cpu/ppc4xx/Makefile [moved from arch/ppc/cpu/ppc4xx/Makefile with 100% similarity]
arch/powerpc/cpu/ppc4xx/bedbug_405.c [moved from arch/ppc/cpu/ppc4xx/bedbug_405.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/cache.S [moved from arch/ppc/cpu/ppc4xx/cache.S with 100% similarity]
arch/powerpc/cpu/ppc4xx/cmd_chip_config.c [moved from arch/ppc/cpu/ppc4xx/cmd_chip_config.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/commproc.c [moved from arch/ppc/cpu/ppc4xx/commproc.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/config.mk [moved from arch/ppc/cpu/ppc4xx/config.mk with 95% similarity]
arch/powerpc/cpu/ppc4xx/cpu.c [moved from arch/ppc/cpu/ppc4xx/cpu.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/cpu_init.c [moved from arch/ppc/cpu/ppc4xx/cpu_init.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/dcr.S [moved from arch/ppc/cpu/ppc4xx/dcr.S with 100% similarity]
arch/powerpc/cpu/ppc4xx/denali_data_eye.c [moved from arch/ppc/cpu/ppc4xx/denali_data_eye.c with 99% similarity]
arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c [moved from arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c with 99% similarity]
arch/powerpc/cpu/ppc4xx/ecc.c [moved from arch/ppc/cpu/ppc4xx/ecc.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/ecc.h [moved from arch/ppc/cpu/ppc4xx/ecc.h with 100% similarity]
arch/powerpc/cpu/ppc4xx/fdt.c [moved from arch/ppc/cpu/ppc4xx/fdt.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/gpio.c [moved from arch/ppc/cpu/ppc4xx/gpio.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/interrupts.c [moved from arch/ppc/cpu/ppc4xx/interrupts.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/iop480_uart.c [moved from arch/ppc/cpu/ppc4xx/iop480_uart.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/kgdb.S [moved from arch/ppc/cpu/ppc4xx/kgdb.S with 100% similarity]
arch/powerpc/cpu/ppc4xx/miiphy.c [moved from arch/ppc/cpu/ppc4xx/miiphy.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/reginfo.c [moved from arch/ppc/cpu/ppc4xx/reginfo.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/resetvec.S [moved from arch/ppc/cpu/ppc4xx/resetvec.S with 100% similarity]
arch/powerpc/cpu/ppc4xx/sdram.c [moved from arch/ppc/cpu/ppc4xx/sdram.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/sdram.h [moved from arch/ppc/cpu/ppc4xx/sdram.h with 100% similarity]
arch/powerpc/cpu/ppc4xx/speed.c [moved from arch/ppc/cpu/ppc4xx/speed.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/start.S [moved from arch/ppc/cpu/ppc4xx/start.S with 100% similarity]
arch/powerpc/cpu/ppc4xx/tlb.c [moved from arch/ppc/cpu/ppc4xx/tlb.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/traps.c [moved from arch/ppc/cpu/ppc4xx/traps.c with 99% similarity]
arch/powerpc/cpu/ppc4xx/u-boot.lds [moved from arch/ppc/cpu/ppc4xx/u-boot.lds with 98% similarity]
arch/powerpc/cpu/ppc4xx/uic.c [moved from arch/ppc/cpu/ppc4xx/uic.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/usb.c [moved from arch/ppc/cpu/ppc4xx/usb.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/usb_ohci.c [moved from arch/ppc/cpu/ppc4xx/usb_ohci.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/usb_ohci.h [moved from arch/ppc/cpu/ppc4xx/usb_ohci.h with 100% similarity]
arch/powerpc/cpu/ppc4xx/usbdev.c [moved from arch/ppc/cpu/ppc4xx/usbdev.c with 100% similarity]
arch/powerpc/cpu/ppc4xx/usbdev.h [moved from arch/ppc/cpu/ppc4xx/usbdev.h with 100% similarity]
arch/powerpc/cpu/ppc4xx/xilinx_irq.c [moved from arch/ppc/cpu/ppc4xx/xilinx_irq.c with 100% similarity]
arch/powerpc/include/asm/4xx_pci.h [moved from arch/ppc/include/asm/4xx_pci.h with 100% similarity]
arch/powerpc/include/asm/4xx_pcie.h [moved from arch/ppc/include/asm/4xx_pcie.h with 100% similarity]
arch/powerpc/include/asm/5xx_immap.h [moved from arch/ppc/include/asm/5xx_immap.h with 100% similarity]
arch/powerpc/include/asm/8xx_immap.h [moved from arch/ppc/include/asm/8xx_immap.h with 100% similarity]
arch/powerpc/include/asm/atomic.h [moved from arch/ppc/include/asm/atomic.h with 100% similarity]
arch/powerpc/include/asm/bitops.h [moved from arch/ppc/include/asm/bitops.h with 100% similarity]
arch/powerpc/include/asm/byteorder.h [moved from arch/ppc/include/asm/byteorder.h with 100% similarity]
arch/powerpc/include/asm/cache.h [moved from arch/ppc/include/asm/cache.h with 100% similarity]
arch/powerpc/include/asm/config.h [moved from arch/ppc/include/asm/config.h with 100% similarity]
arch/powerpc/include/asm/cpm_8260.h [moved from arch/ppc/include/asm/cpm_8260.h with 100% similarity]
arch/powerpc/include/asm/cpm_85xx.h [moved from arch/ppc/include/asm/cpm_85xx.h with 100% similarity]
arch/powerpc/include/asm/e300.h [moved from arch/ppc/include/asm/e300.h with 100% similarity]
arch/powerpc/include/asm/errno.h [moved from arch/ppc/include/asm/errno.h with 100% similarity]
arch/powerpc/include/asm/fsl_ddr_dimm_params.h [moved from arch/ppc/include/asm/fsl_ddr_dimm_params.h with 100% similarity]
arch/powerpc/include/asm/fsl_ddr_sdram.h [moved from arch/ppc/include/asm/fsl_ddr_sdram.h with 95% similarity]
arch/powerpc/include/asm/fsl_dma.h [moved from arch/ppc/include/asm/fsl_dma.h with 100% similarity]
arch/powerpc/include/asm/fsl_i2c.h [moved from arch/ppc/include/asm/fsl_i2c.h with 100% similarity]
arch/powerpc/include/asm/fsl_law.h [moved from arch/ppc/include/asm/fsl_law.h with 100% similarity]
arch/powerpc/include/asm/fsl_lbc.h [moved from arch/ppc/include/asm/fsl_lbc.h with 98% similarity]
arch/powerpc/include/asm/fsl_mpc83xx_serdes.h [moved from arch/microblaze/lib/cache.c with 58% similarity]
arch/powerpc/include/asm/fsl_pci.h [moved from arch/ppc/include/asm/fsl_pci.h with 100% similarity]
arch/powerpc/include/asm/fsl_serdes.h [moved from arch/ppc/include/asm/fsl_serdes.h with 100% similarity]
arch/powerpc/include/asm/global_data.h [moved from arch/ppc/include/asm/global_data.h with 100% similarity]
arch/powerpc/include/asm/gpio.h [moved from arch/ppc/include/asm/gpio.h with 100% similarity]
arch/powerpc/include/asm/immap_512x.h [moved from arch/ppc/include/asm/immap_512x.h with 95% similarity]
arch/powerpc/include/asm/immap_8220.h [moved from arch/ppc/include/asm/immap_8220.h with 100% similarity]
arch/powerpc/include/asm/immap_8260.h [moved from arch/ppc/include/asm/immap_8260.h with 100% similarity]
arch/powerpc/include/asm/immap_83xx.h [moved from arch/ppc/include/asm/immap_83xx.h with 100% similarity]
arch/powerpc/include/asm/immap_85xx.h [moved from arch/ppc/include/asm/immap_85xx.h with 97% similarity]
arch/powerpc/include/asm/immap_86xx.h [moved from arch/ppc/include/asm/immap_86xx.h with 100% similarity]
arch/powerpc/include/asm/immap_qe.h [moved from arch/ppc/include/asm/immap_qe.h with 100% similarity]
arch/powerpc/include/asm/interrupt.h [moved from arch/ppc/include/asm/interrupt.h with 100% similarity]
arch/powerpc/include/asm/io.h [moved from arch/ppc/include/asm/io.h with 100% similarity]
arch/powerpc/include/asm/iopin_8260.h [moved from arch/ppc/include/asm/iopin_8260.h with 100% similarity]
arch/powerpc/include/asm/iopin_85xx.h [moved from arch/ppc/include/asm/iopin_85xx.h with 100% similarity]
arch/powerpc/include/asm/iopin_8xx.h [moved from arch/ppc/include/asm/iopin_8xx.h with 100% similarity]
arch/powerpc/include/asm/m8260_pci.h [moved from arch/ppc/include/asm/m8260_pci.h with 100% similarity]
arch/powerpc/include/asm/mc146818rtc.h [moved from arch/ppc/include/asm/mc146818rtc.h with 100% similarity]
arch/powerpc/include/asm/mmu.h [moved from arch/ppc/include/asm/mmu.h with 99% similarity]
arch/powerpc/include/asm/mp.h [moved from arch/ppc/include/asm/mp.h with 100% similarity]
arch/powerpc/include/asm/mpc512x.h [moved from arch/ppc/include/asm/mpc512x.h with 100% similarity]
arch/powerpc/include/asm/mpc8349_pci.h [moved from arch/ppc/include/asm/mpc8349_pci.h with 100% similarity]
arch/powerpc/include/asm/mpc8xxx_spi.h [moved from arch/ppc/include/asm/mpc8xxx_spi.h with 100% similarity]
arch/powerpc/include/asm/pci_io.h [moved from arch/ppc/include/asm/pci_io.h with 100% similarity]
arch/powerpc/include/asm/pnp.h [moved from arch/ppc/include/asm/pnp.h with 100% similarity]
arch/powerpc/include/asm/posix_types.h [moved from arch/ppc/include/asm/posix_types.h with 100% similarity]
arch/powerpc/include/asm/ppc4xx-ebc.h [moved from arch/ppc/include/asm/ppc4xx-ebc.h with 100% similarity]
arch/powerpc/include/asm/ppc4xx-isram.h [moved from arch/ppc/include/asm/ppc4xx-isram.h with 100% similarity]
arch/powerpc/include/asm/ppc4xx-sdram.h [moved from arch/ppc/include/asm/ppc4xx-sdram.h with 100% similarity]
arch/powerpc/include/asm/ppc4xx-uic.h [moved from arch/ppc/include/asm/ppc4xx-uic.h with 100% similarity]
arch/powerpc/include/asm/ppc4xx_config.h [moved from arch/ppc/include/asm/ppc4xx_config.h with 100% similarity]
arch/powerpc/include/asm/processor.h [moved from arch/ppc/include/asm/processor.h with 100% similarity]
arch/powerpc/include/asm/ptrace.h [moved from arch/ppc/include/asm/ptrace.h with 97% similarity]
arch/powerpc/include/asm/residual.h [moved from arch/ppc/include/asm/residual.h with 100% similarity]
arch/powerpc/include/asm/sigcontext.h [moved from arch/ppc/include/asm/sigcontext.h with 100% similarity]
arch/powerpc/include/asm/signal.h [moved from arch/ppc/include/asm/signal.h with 100% similarity]
arch/powerpc/include/asm/status_led.h [moved from arch/ppc/include/asm/status_led.h with 100% similarity]
arch/powerpc/include/asm/string.h [moved from arch/ppc/include/asm/string.h with 100% similarity]
arch/powerpc/include/asm/types.h [moved from arch/ppc/include/asm/types.h with 100% similarity]
arch/powerpc/include/asm/u-boot.h [moved from arch/ppc/include/asm/u-boot.h with 100% similarity]
arch/powerpc/include/asm/unaligned.h [moved from arch/ppc/include/asm/unaligned.h with 100% similarity]
arch/powerpc/include/asm/xilinx_irq.h [moved from arch/ppc/include/asm/xilinx_irq.h with 100% similarity]
arch/powerpc/lib/Makefile [moved from arch/ppc/lib/Makefile with 100% similarity]
arch/powerpc/lib/bat_rw.c [moved from arch/ppc/lib/bat_rw.c with 100% similarity]
arch/powerpc/lib/board.c [moved from arch/ppc/lib/board.c with 99% similarity]
arch/powerpc/lib/bootm.c [moved from arch/ppc/lib/bootm.c with 100% similarity]
arch/powerpc/lib/cache.c [moved from arch/ppc/lib/cache.c with 100% similarity]
arch/powerpc/lib/extable.c [moved from arch/ppc/lib/extable.c with 100% similarity]
arch/powerpc/lib/interrupts.c [moved from arch/ppc/lib/interrupts.c with 100% similarity]
arch/powerpc/lib/kgdb.c [moved from arch/ppc/lib/kgdb.c with 100% similarity]
arch/powerpc/lib/ppccache.S [moved from arch/ppc/lib/ppccache.S with 100% similarity]
arch/powerpc/lib/ppcstring.S [moved from arch/ppc/lib/ppcstring.S with 100% similarity]
arch/powerpc/lib/reloc.S [moved from arch/ppc/lib/reloc.S with 100% similarity]
arch/powerpc/lib/ticks.S [moved from arch/ppc/lib/ticks.S with 100% similarity]
arch/powerpc/lib/time.c [moved from arch/ppc/lib/time.c with 100% similarity]
arch/ppc/cpu/mpc512x/serial.c [deleted file]
board/LEOX/elpt860/u-boot.lds
board/LEOX/elpt860/u-boot.lds.debug
board/MAI/AmigaOneG3SE/u-boot.lds
board/Marvell/common/ns16550.c
board/Marvell/common/ns16550.h
board/Marvell/db64360/mv_eth.c
board/Marvell/db64360/u-boot.lds
board/Marvell/db64460/mv_eth.c
board/Marvell/db64460/u-boot.lds
board/RPXClassic/u-boot.lds
board/RPXClassic/u-boot.lds.debug
board/RPXlite/u-boot.lds
board/RPXlite/u-boot.lds.debug
board/RPXlite_dw/u-boot.lds
board/RPXlite_dw/u-boot.lds.debug
board/RRvision/u-boot.lds
board/adder/u-boot.lds
board/altera/common/cfide.c [new file with mode: 0644]
board/altera/ep1s10/u-boot.lds [deleted file]
board/altera/ep1s40/u-boot.lds [deleted file]
board/altera/nios2-generic/Makefile [new file with mode: 0644]
board/altera/nios2-generic/config.mk [new file with mode: 0644]
board/altera/nios2-generic/custom_fpga.h [new file with mode: 0644]
board/altera/nios2-generic/nios2-generic.c [new file with mode: 0644]
board/altera/nios2-generic/text_base.S [new file with mode: 0644]
board/altera/nios2-generic/u-boot.lds [moved from board/psyent/pci5441/u-boot.lds with 98% similarity]
board/amcc/acadia/u-boot-nand.lds
board/amcc/bamboo/init.S
board/amcc/bamboo/u-boot-nand.lds
board/amcc/canyonlands/canyonlands.c
board/amcc/canyonlands/init.S
board/amcc/canyonlands/u-boot-nand.lds
board/amcc/ebony/init.S
board/amcc/katmai/init.S
board/amcc/katmai/katmai.c
board/amcc/kilauea/u-boot-nand.lds
board/amcc/luan/init.S
board/amcc/luan/luan.c
board/amcc/ocotea/init.S
board/amcc/redwood/init.S
board/amcc/sequoia/init.S
board/amcc/sequoia/sdram.c
board/amcc/sequoia/u-boot-nand.lds
board/amcc/sequoia/u-boot-ram.lds
board/amcc/taishan/init.S
board/amcc/yosemite/init.S
board/amcc/yucca/init.S
board/amcc/yucca/yucca.c
board/amirix/ap1000/u-boot.lds
board/bmw/ns16550.c
board/bmw/ns16550.h
board/c2mon/u-boot.lds
board/c2mon/u-boot.lds.debug
board/cm5200/u-boot.lds
board/cogent/u-boot.lds.debug
board/cray/L1/u-boot.lds.debug
board/csb272/csb272.c
board/csb472/csb472.c
board/eltec/bab7xx/u-boot.lds
board/eltec/elppc/u-boot.lds
board/eltec/mhpc/u-boot.lds
board/eltec/mhpc/u-boot.lds.debug
board/emk/top860/u-boot.lds
board/emk/top860/u-boot.lds.debug
board/ep88x/u-boot.lds
board/eric/eric.c
board/esd/cpci750/mv_eth.c
board/esd/cpci750/u-boot.lds
board/esd/dasa_sim/u-boot.lds
board/esd/du440/init.S
board/esd/pmc440/init.S
board/esd/pmc440/u-boot-nand.lds
board/esteem192e/u-boot.lds
board/etx094/u-boot.lds
board/etx094/u-boot.lds.debug
board/evb64260/u-boot.lds
board/fads/u-boot.lds
board/fads/u-boot.lds.debug
board/flagadm/u-boot.lds
board/flagadm/u-boot.lds.debug
board/freescale/common/fsl_diu_fb.c
board/freescale/mpc7448hpc2/tsi108_init.c
board/freescale/mpc7448hpc2/u-boot.lds
board/freescale/mpc837xemds/mpc837xemds.c
board/freescale/mpc837xemds/pci.c
board/freescale/mpc837xerdb/mpc837xerdb.c
board/freescale/mpc8610hpcd/u-boot.lds
board/freescale/mpc8641hpcn/u-boot.lds
board/freescale/p1_p2_rdb/p1_p2_rdb.c
board/gdsys/gdppc440etx/init.S
board/gdsys/intip/init.S
board/gen860t/ioport.c
board/gen860t/u-boot-flashenv.lds
board/gen860t/u-boot.lds
board/genietv/u-boot.lds
board/genietv/u-boot.lds.debug
board/gth/u-boot.lds
board/hermes/u-boot.lds
board/hermes/u-boot.lds.debug
board/hmi1001/config.mk
board/hymod/u-boot.lds
board/hymod/u-boot.lds.debug
board/icu862/u-boot.lds
board/icu862/u-boot.lds.debug
board/inka4x0/config.mk
board/ip860/u-boot.lds
board/ip860/u-boot.lds.debug
board/ivm/u-boot.lds
board/ivm/u-boot.lds.debug
board/jse/jse.c
board/jse/sdram.c
board/keymile/common/keymile_hdlc_enet.c
board/keymile/km8xx/km8xx_hdlc_enet.c
board/keymile/km8xx/u-boot.lds
board/keymile/mgcoge/mgcoge_hdlc_enet.c
board/korat/init.S
board/korat/u-boot-F7FC.lds
board/kup/kup4k/u-boot.lds
board/kup/kup4k/u-boot.lds.debug
board/kup/kup4x/u-boot.lds
board/kup/kup4x/u-boot.lds.debug
board/lantec/u-boot.lds
board/lantec/u-boot.lds.debug
board/logicpd/zoom2/zoom2_serial.c
board/logicpd/zoom2/zoom2_serial.h
board/lwmon/u-boot.lds
board/lwmon/u-boot.lds.debug
board/lwmon5/init.S
board/matrix_vision/mvsmr/u-boot.lds
board/mbx8xx/u-boot.lds
board/mbx8xx/u-boot.lds.debug
board/mbx8xx/vpd.c
board/ml2/u-boot.lds
board/ml2/u-boot.lds.debug
board/mousse/u-boot.lds
board/mousse/u-boot.lds.ram
board/mousse/u-boot.lds.rom
board/mpl/pip405/u-boot.lds.debug
board/mucmc52/config.mk
board/munices/u-boot.lds
board/nc650/u-boot.lds
board/nc650/u-boot.lds.debug
board/netphone/u-boot.lds
board/netphone/u-boot.lds.debug
board/netstal/hcu4/hcu4.c
board/netstal/hcu5/README.txt
board/netstal/hcu5/hcu5.c
board/netstal/hcu5/init.S
board/netstal/mcu25/mcu25.c
board/netta/u-boot.lds
board/netta/u-boot.lds.debug
board/netta2/u-boot.lds
board/netta2/u-boot.lds.debug
board/netvia/u-boot.lds
board/netvia/u-boot.lds.debug
board/nx823/u-boot.lds
board/nx823/u-boot.lds.debug
board/pcippc2/u-boot.lds
board/pcs440ep/init.S
board/pcs440ep/pcs440ep.c
board/pdm360ng/Makefile [new file with mode: 0644]
board/pdm360ng/config.mk [new file with mode: 0644]
board/pdm360ng/pdm360ng.c [new file with mode: 0644]
board/ppmc7xx/u-boot.lds
board/prodrive/alpr/init.S
board/prodrive/p3mx/mv_eth.c
board/prodrive/p3mx/u-boot.lds
board/prodrive/p3p440/init.S
board/psyent/pk1c20/u-boot.lds [deleted file]
board/quantum/u-boot.lds
board/quantum/u-boot.lds.debug
board/r360mpi/u-boot.lds
board/rbc823/u-boot.lds
board/rmu/u-boot.lds
board/rmu/u-boot.lds.debug
board/rsdproto/u-boot.lds
board/sandburst/common/ppc440gx_i2c.c
board/sandburst/karef/init.S
board/sandburst/karef/u-boot.lds.debug
board/sandburst/metrobox/init.S
board/sandburst/metrobox/u-boot.lds.debug
board/sbc8641d/u-boot.lds
board/sc3/u-boot.lds
board/siemens/CCM/u-boot.lds
board/siemens/CCM/u-boot.lds.debug
board/siemens/IAD210/u-boot.lds
board/siemens/pcu_e/u-boot.lds
board/siemens/pcu_e/u-boot.lds.debug
board/sixnet/u-boot.lds
board/snmc/qs850/u-boot.lds
board/snmc/qs860t/u-boot.lds
board/spc1920/u-boot.lds
board/spd8xx/u-boot.lds
board/spd8xx/u-boot.lds.debug
board/stx/stxssa/stxssa.c
board/stx/stxxtc/u-boot.lds
board/stx/stxxtc/u-boot.lds.debug
board/svm_sc8xx/u-boot.lds
board/svm_sc8xx/u-boot.lds.debug
board/tqc/tqm8xx/u-boot.lds
board/tqc/tqm8xx/u-boot.lds.debug
board/uc100/u-boot.lds
board/uc100/u-boot.lds.debug
board/uc101/config.mk
board/v37/u-boot.lds
board/w7o/u-boot.lds.debug
board/w7o/w7o.c
board/westel/amx860/u-boot.lds
board/westel/amx860/u-boot.lds.debug
board/xes/xpedite1000/init.S
board/xes/xpedite1000/u-boot.lds.debug
board/xes/xpedite5170/u-boot.lds
board/xilinx/microblaze-generic/microblaze-generic.c
board/xilinx/ppc405-generic/u-boot-rom.lds
board/xilinx/ppc440-generic/u-boot-rom.lds
common/kgdb.c
common/serial.c
doc/README.IPHASE4539
doc/README.PIP405
doc/README.POST
doc/README.RPXlite
doc/README.TQM8260
doc/README.alaska8220
doc/README.bedbug
doc/README.mpc5xx
doc/README.mpc85xxads
drivers/block/fsl_sata.c
drivers/block/fsl_sata.h
drivers/i2c/fsl_i2c.c
drivers/mmc/fsl_esdhc.c
drivers/pci/pci_auto.c
drivers/qe/uec_phy.c
drivers/serial/altera_jtag_uart.c
drivers/serial/ns16550.c
drivers/serial/serial.c
drivers/serial/serial_pxa.c
drivers/serial/serial_s3c24x0.c
drivers/serial/serial_s5p.c
drivers/spi/mpc8xxx_spi.c
drivers/video/mx3fb.c
examples/api/Makefile
examples/standalone/mem_to_mem_idma2intr.c
include/configs/MPC8313ERDB.h
include/configs/MPC8315ERDB.h
include/configs/MPC8323ERDB.h
include/configs/MPC832XEMDS.h
include/configs/MPC8349EMDS.h
include/configs/MPC8349ITX.h
include/configs/MPC8360EMDS.h
include/configs/MPC8360ERDK.h
include/configs/MPC837XEMDS.h
include/configs/MPC837XERDB.h
include/configs/MVBLM7.h
include/configs/SIMPC8313.h
include/configs/TQM834x.h
include/configs/aria.h
include/configs/galaxy5200.h
include/configs/kilauea.h
include/configs/kmeter1.h
include/configs/linkstation.h
include/configs/mecp5123.h
include/configs/mpc5121-common.h [new file with mode: 0644]
include/configs/mpc5121ads.h
include/configs/nios2-generic.h [new file with mode: 0644]
include/configs/pdm360ng.h [new file with mode: 0644]
include/configs/qong.h
include/configs/quad100hd.h
include/configs/sbc8349.h
include/configs/sc3.h
include/configs/socrates.h
include/configs/vme8349.h
include/fsl_esdhc.h
include/i2c.h
include/ns16550.h
include/post.h
include/serial.h
lib/div64.c
nand_spl/board/amcc/acadia/Makefile
nand_spl/board/amcc/bamboo/Makefile
nand_spl/board/amcc/canyonlands/Makefile
nand_spl/board/amcc/kilauea/Makefile
nand_spl/board/amcc/sequoia/Makefile
nand_spl/board/freescale/mpc8313erdb/Makefile
nand_spl/board/freescale/mpc8315erdb/Makefile
nand_spl/board/freescale/mpc8536ds/Makefile
nand_spl/board/freescale/mpc8569mds/Makefile
nand_spl/board/freescale/p1_p2_rdb/Makefile
nand_spl/board/sheldon/simpc8313/Makefile
post/board/pdm360ng/Makefile [new file with mode: 0644]
post/board/pdm360ng/coproc_com.c [new file with mode: 0644]
post/cpu/ppc4xx/spr.c
post/lib_powerpc/Makefile [moved from post/lib_ppc/Makefile with 98% similarity]
post/lib_powerpc/andi.c [moved from post/lib_ppc/andi.c with 100% similarity]
post/lib_powerpc/asm.S [moved from post/lib_ppc/asm.S with 100% similarity]
post/lib_powerpc/b.c [moved from post/lib_ppc/b.c with 100% similarity]
post/lib_powerpc/cmp.c [moved from post/lib_ppc/cmp.c with 100% similarity]
post/lib_powerpc/cmpi.c [moved from post/lib_ppc/cmpi.c with 100% similarity]
post/lib_powerpc/complex.c [moved from post/lib_ppc/complex.c with 100% similarity]
post/lib_powerpc/cpu.c [moved from post/lib_ppc/cpu.c with 100% similarity]
post/lib_powerpc/cpu_asm.h [moved from post/lib_ppc/cpu_asm.h with 100% similarity]
post/lib_powerpc/cr.c [moved from post/lib_ppc/cr.c with 100% similarity]
post/lib_powerpc/fpu/20001122-1.c [moved from post/lib_ppc/fpu/20001122-1.c with 100% similarity]
post/lib_powerpc/fpu/20010114-2.c [moved from post/lib_ppc/fpu/20010114-2.c with 100% similarity]
post/lib_powerpc/fpu/20010226-1.c [moved from post/lib_ppc/fpu/20010226-1.c with 100% similarity]
post/lib_powerpc/fpu/980619-1.c [moved from post/lib_ppc/fpu/980619-1.c with 100% similarity]
post/lib_powerpc/fpu/Makefile [moved from post/lib_ppc/fpu/Makefile with 97% similarity]
post/lib_powerpc/fpu/acc1.c [moved from post/lib_ppc/fpu/acc1.c with 100% similarity]
post/lib_powerpc/fpu/compare-fp-1.c [moved from post/lib_ppc/fpu/compare-fp-1.c with 100% similarity]
post/lib_powerpc/fpu/fpu.c [moved from post/lib_ppc/fpu/fpu.c with 100% similarity]
post/lib_powerpc/fpu/mul-subnormal-single-1.c [moved from post/lib_ppc/fpu/mul-subnormal-single-1.c with 100% similarity]
post/lib_powerpc/load.c [moved from post/lib_ppc/load.c with 100% similarity]
post/lib_powerpc/multi.c [moved from post/lib_ppc/multi.c with 100% similarity]
post/lib_powerpc/rlwimi.c [moved from post/lib_ppc/rlwimi.c with 100% similarity]
post/lib_powerpc/rlwinm.c [moved from post/lib_ppc/rlwinm.c with 100% similarity]
post/lib_powerpc/rlwnm.c [moved from post/lib_ppc/rlwnm.c with 100% similarity]
post/lib_powerpc/srawi.c [moved from post/lib_ppc/srawi.c with 100% similarity]
post/lib_powerpc/store.c [moved from post/lib_ppc/store.c with 100% similarity]
post/lib_powerpc/string.c [moved from post/lib_ppc/string.c with 100% similarity]
post/lib_powerpc/three.c [moved from post/lib_ppc/three.c with 100% similarity]
post/lib_powerpc/threei.c [moved from post/lib_ppc/threei.c with 100% similarity]
post/lib_powerpc/threex.c [moved from post/lib_ppc/threex.c with 100% similarity]
post/lib_powerpc/two.c [moved from post/lib_ppc/two.c with 100% similarity]
post/lib_powerpc/twox.c [moved from post/lib_ppc/twox.c with 100% similarity]
post/tests.c

index f3f59f4..7f688c3 100644 (file)
@@ -471,6 +471,10 @@ Josef Wagner <Wagner@Microsys.de>
        CPC45           MPC8245
        PM520           MPC5200
 
+Michael Weiss <michael.weiss@ifm.com>
+
+       PDM360NG        MPC5121e
+
 Stephen Williams <steve@icarus.com>
 
        JSE             PPC405GPr
@@ -866,6 +870,7 @@ Scott McNutt <smcnutt@psyent.com>
        EP1C20          Nios-II
        EP1S10          Nios-II
        EP1S40          Nios-II
+       nios2-generic   Nios-II
 
 #########################################################################
 # MicroBlaze Systems:                                                  #
diff --git a/MAKEALL b/MAKEALL
index 593203f..326bde0 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -92,6 +92,7 @@ LIST_512x="           \
        aria            \
        mecp5123        \
        mpc5121ads      \
+       pdm360ng        \
 "
 
 #########################################################################
@@ -489,7 +490,7 @@ LIST_TSEC="         \
        ${LIST_86xx}    \
 "
 
-LIST_ppc="             \
+LIST_powerpc="         \
        ${LIST_5xx}     \
        ${LIST_512x}    \
        ${LIST_5xxx}    \
@@ -505,6 +506,12 @@ LIST_ppc="         \
        ${LIST_7xx}     \
 "
 
+# Alias "ppc" -> "powerpc" to not break compatibility with older scripts
+# still using "ppc" instead of "powerpc"
+LIST_ppc="             \
+       ${LIST_powerpc} \
+"
+
 #########################################################################
 ## StrongARM Systems
 #########################################################################
@@ -826,6 +833,7 @@ LIST_nios2="                \
        EP1S40          \
        PCI5441         \
        PK1C20          \
+       nios2-generic   \
 "
 
 #########################################################################
@@ -951,8 +959,8 @@ LIST_sparc="gr_xc3s_1500    gr_cpci_ax2000  gr_ep2s60       grsim   grsim_leon2"
 
 #-----------------------------------------------------------------------
 
-#----- for now, just run PPC by default -----
-[ $# = 0 ] && set $LIST_ppc
+#----- for now, just run PowerPC by default -----
+[ $# = 0 ] && set $LIST_powerpc
 
 #-----------------------------------------------------------------------
 
@@ -1008,7 +1016,7 @@ do
        |microblaze \
        |mips|mips_el \
        |nios|nios2 \
-       |ppc|5xx|5xxx|512x|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx|TSEC \
+       |ppc|powerpc|5xx|5xxx|512x|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx|TSEC \
        |sh|sh2|sh3|sh4 \
        |sparc \
        |x86|I486 \
index 0467147..e49def3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -133,10 +133,6 @@ unexport CDPATH
 
 #########################################################################
 
-ifeq ($(ARCH),powerpc)
-ARCH = ppc
-endif
-
 # The "tools" are needed early, so put this first
 # Don't include stuff already done in $(LIBS)
 SUBDIRS        = tools \
@@ -227,12 +223,12 @@ LIBS += drivers/qe/qe.a
 endif
 ifeq ($(CPU),mpc85xx)
 LIBS += drivers/qe/qe.a
-LIBS += arch/ppc/cpu/mpc8xxx/ddr/libddr.a
-LIBS += arch/ppc/cpu/mpc8xxx/lib8xxx.a
+LIBS += arch/powerpc/cpu/mpc8xxx/ddr/libddr.a
+LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.a
 endif
 ifeq ($(CPU),mpc86xx)
-LIBS += arch/ppc/cpu/mpc8xxx/ddr/libddr.a
-LIBS += arch/ppc/cpu/mpc8xxx/lib8xxx.a
+LIBS += arch/powerpc/cpu/mpc8xxx/ddr/libddr.a
+LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.a
 endif
 LIBS += drivers/rtc/librtc.a
 LIBS += drivers/serial/libserial.a
@@ -491,29 +487,29 @@ unconfig:
 #########################################################################
 
 canmb_config:  unconfig
-       @$(MKCONFIG) -a canmb ppc mpc5xxx canmb
+       @$(MKCONFIG) -a canmb powerpc mpc5xxx canmb
 
 cmi_mpc5xx_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc5xx cmi
+       @$(MKCONFIG) $(@:_config=) powerpc mpc5xx cmi
 
 PATI_config:           unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc5xx pati mpl
+       @$(MKCONFIG) $(@:_config=) powerpc mpc5xx pati mpl
 
 #########################################################################
 ## MPC5xxx Systems
 #########################################################################
 
 aev_config: unconfig
-       @$(MKCONFIG) -a aev ppc mpc5xxx tqm5200 tqc
+       @$(MKCONFIG) -a aev powerpc mpc5xxx tqm5200 tqc
 
 BC3450_config: unconfig
-       @$(MKCONFIG) -a BC3450 ppc mpc5xxx bc3450
+       @$(MKCONFIG) -a BC3450 powerpc mpc5xxx bc3450
 
 cm5200_config: unconfig
-       @$(MKCONFIG) -a cm5200 ppc mpc5xxx cm5200
+       @$(MKCONFIG) -a cm5200 powerpc mpc5xxx cm5200
 
 cpci5200_config:  unconfig
-       @$(MKCONFIG) -a cpci5200  ppc mpc5xxx cpci5200 esd
+       @$(MKCONFIG) -a cpci5200  powerpc mpc5xxx cpci5200 esd
 
 digsy_mtc_config \
 digsy_mtc_LOWBOOT_config       \
@@ -529,16 +525,16 @@ digsy_mtc_RAMBOOT_config: unconfig
                { echo "TEXT_BASE = 0x00100000" >$(obj)board/digsy_mtc/config.tmp ; \
                  echo "... with RAMBOOT configuration" ; \
                }
-       @$(MKCONFIG) -a digsy_mtc  ppc mpc5xxx digsy_mtc
+       @$(MKCONFIG) -a digsy_mtc  powerpc mpc5xxx digsy_mtc
 
 galaxy5200_LOWBOOT_config \
 galaxy5200_config:     unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
-       @$(MKCONFIG) -a galaxy5200 ppc mpc5xxx galaxy5200
+       @$(MKCONFIG) -a galaxy5200 powerpc mpc5xxx galaxy5200
 
 hmi1001_config:        unconfig
-       @$(MKCONFIG) hmi1001 ppc mpc5xxx hmi1001
+       @$(MKCONFIG) hmi1001 powerpc mpc5xxx hmi1001
 
 Lite5200_config                                \
 Lite5200_LOWBOOT_config                        \
@@ -567,16 +563,16 @@ icecube_5200_DDR_LOWBOOT08_config:        unconfig
                { echo "#define CONFIG_MPC5200_DDR"     >>$(obj)include/config.h ; \
                  $(XECHO) "... DDR memory revision" ; \
                }
-       @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube
+       @$(MKCONFIG) -a IceCube powerpc mpc5xxx icecube
 
 jupiter_config:        unconfig
-       @$(MKCONFIG) jupiter ppc mpc5xxx jupiter
+       @$(MKCONFIG) jupiter powerpc mpc5xxx jupiter
 
 inka4x0_config:        unconfig
-       @$(MKCONFIG) inka4x0 ppc mpc5xxx inka4x0
+       @$(MKCONFIG) inka4x0 powerpc mpc5xxx inka4x0
 
 ipek01_config: unconfig
-       @$(MKCONFIG) -a ipek01 ppc mpc5xxx ipek01
+       @$(MKCONFIG) -a ipek01 powerpc mpc5xxx ipek01
 
 lite5200b_config       \
 lite5200b_PM_config    \
@@ -594,7 +590,7 @@ lite5200b_LOWBOOT_config:   unconfig
                { echo "TEXT_BASE = 0xFF000000" >$(obj)board/icecube/config.tmp ; \
                  $(XECHO) "... with LOWBOOT configuration" ; \
                }
-       @$(MKCONFIG) -a IceCube  ppc mpc5xxx icecube
+       @$(MKCONFIG) -a IceCube  powerpc mpc5xxx icecube
 
 mcc200_config  \
 mcc200_SDRAM_config    \
@@ -642,19 +638,19 @@ prs200_highboot_DDR_config:       unconfig
        @[ -z "$(findstring prs200,$@)" ] || \
                { echo "#define CONFIG_PRS200"  >>$(obj)include/config.h ;\
                }
-       @$(MKCONFIG) -n $@ -a mcc200 ppc mpc5xxx mcc200
+       @$(MKCONFIG) -n $@ -a mcc200 powerpc mpc5xxx mcc200
 
 mecp5200_config:  unconfig
-       @$(MKCONFIG) mecp5200  ppc mpc5xxx mecp5200 esd
+       @$(MKCONFIG) mecp5200  powerpc mpc5xxx mecp5200 esd
 
 motionpro_config:      unconfig
-       @$(MKCONFIG) motionpro ppc mpc5xxx motionpro
+       @$(MKCONFIG) motionpro powerpc mpc5xxx motionpro
 
 mucmc52_config:                unconfig
-       @$(MKCONFIG) mucmc52 ppc mpc5xxx mucmc52
+       @$(MKCONFIG) mucmc52 powerpc mpc5xxx mucmc52
 
 munices_config:        unconfig
-       @$(MKCONFIG) munices ppc mpc5xxx munices
+       @$(MKCONFIG) munices powerpc mpc5xxx munices
 
 MVBC_P_config: unconfig
        @mkdir -p $(obj)include
@@ -662,15 +658,15 @@ MVBC_P_config: unconfig
        @ >$(obj)include/config.h
        @[ -z "$(findstring MVBC_P,$@)" ] || \
        {       echo "#define CONFIG_MVBC_P"    >>$(obj)include/config.h; }
-       @$(MKCONFIG) -n $@ -a MVBC_P ppc mpc5xxx mvbc_p matrix_vision
+       @$(MKCONFIG) -n $@ -a MVBC_P powerpc mpc5xxx mvbc_p matrix_vision
 
 MVSMR_config: unconfig
        @mkdir -p $(obj)include
        @mkdir -p $(obj)board/matrix_vision/mvsmr
-       @$(MKCONFIG) $(@:_config=) ppc mpc5xxx mvsmr matrix_vision
+       @$(MKCONFIG) $(@:_config=) powerpc mpc5xxx mvsmr matrix_vision
 
 o2dnt_config:  unconfig
-       @$(MKCONFIG) o2dnt ppc mpc5xxx o2dnt
+       @$(MKCONFIG) o2dnt powerpc mpc5xxx o2dnt
 
 pcm030_config \
 pcm030_LOWBOOT_config: unconfig
@@ -680,10 +676,10 @@ pcm030_LOWBOOT_config:    unconfig
                { echo "TEXT_BASE = 0xFF000000" >$(obj)board/phytec/pcm030/config.tmp ; \
                  echo "... with LOWBOOT configuration" ; \
                }
-       @$(MKCONFIG) -a pcm030 ppc mpc5xxx pcm030 phytec
+       @$(MKCONFIG) -a pcm030 powerpc mpc5xxx pcm030 phytec
 
 pf5200_config: unconfig
-       @$(MKCONFIG) pf5200  ppc mpc5xxx pf5200 esd
+       @$(MKCONFIG) pf5200  powerpc mpc5xxx pf5200 esd
 
 PM520_config \
 PM520_DDR_config \
@@ -698,13 +694,13 @@ PM520_ROMBOOT_DDR_config: unconfig
                { echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
                  $(XECHO) "... booting from 8-bit flash" ; \
                }
-       @$(MKCONFIG) -a PM520 ppc mpc5xxx pm520
+       @$(MKCONFIG) -a PM520 powerpc mpc5xxx pm520
 
 smmaco4_config: unconfig
-       @$(MKCONFIG) -a smmaco4 ppc mpc5xxx tqm5200 tqc
+       @$(MKCONFIG) -a smmaco4 powerpc mpc5xxx tqm5200 tqc
 
 spieval_config:        unconfig
-       @$(MKCONFIG) -a spieval ppc mpc5xxx tqm5200 tqc
+       @$(MKCONFIG) -a spieval powerpc mpc5xxx tqm5200 tqc
 
 TB5200_B_config \
 TB5200_config: unconfig
@@ -713,14 +709,14 @@ TB5200_config:    unconfig
                { echo "#define CONFIG_TQM5200_B"       >>$(obj)include/config.h ; \
                  $(XECHO) "... with MPC5200B processor" ; \
                }
-       @$(MKCONFIG) -n $@ -a TB5200 ppc mpc5xxx tqm5200 tqc
+       @$(MKCONFIG) -n $@ -a TB5200 powerpc mpc5xxx tqm5200 tqc
 
 MINI5200_config        \
 EVAL5200_config        \
 TOP5200_config:        unconfig
        @mkdir -p $(obj)include
        @ echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a TOP5200 ppc mpc5xxx top5200 emk
+       @$(MKCONFIG) -n $@ -a TOP5200 powerpc mpc5xxx top5200 emk
 
 Total5200_config               \
 Total5200_lowboot_config       \
@@ -740,7 +736,7 @@ Total5200_Rev2_lowboot_config:      unconfig
                { echo "TEXT_BASE = 0xFE000000" >$(obj)board/total5200/config.tmp ; \
                  $(XECHO) "... with lowboot configuration" ; \
                }
-       @$(MKCONFIG) -a Total5200 ppc mpc5xxx total5200
+       @$(MKCONFIG) -a Total5200 powerpc mpc5xxx total5200
 
 cam5200_config \
 cam5200_niosflash_config \
@@ -786,23 +782,23 @@ TQM5200_STK100_config:    unconfig
        @[ -z "$(findstring HIGHBOOT,$@)" ] || \
                { echo "TEXT_BASE = 0xFFF00000" >$(obj)board/tqm5200/config.tmp ; \
                }
-       @$(MKCONFIG) -n $@ -a TQM5200 ppc mpc5xxx tqm5200 tqc
+       @$(MKCONFIG) -n $@ -a TQM5200 powerpc mpc5xxx tqm5200 tqc
 
 uc101_config:          unconfig
-       @$(MKCONFIG) uc101 ppc mpc5xxx uc101
+       @$(MKCONFIG) uc101 powerpc mpc5xxx uc101
 
 v38b_config: unconfig
-       @$(MKCONFIG) -a v38b ppc mpc5xxx v38b
+       @$(MKCONFIG) -a v38b powerpc mpc5xxx v38b
 
 #########################################################################
 ## MPC512x Systems
 #########################################################################
 
 aria_config:   unconfig
-       @$(MKCONFIG) -a aria ppc mpc512x aria davedenx
+       @$(MKCONFIG) -a aria powerpc mpc512x aria davedenx
 
 mecp5123_config:       unconfig
-       @$(MKCONFIG) -a mecp5123 ppc mpc512x mecp5123 esd
+       @$(MKCONFIG) -a mecp5123 powerpc mpc512x mecp5123 esd
 
 mpc5121ads_config \
 mpc5121ads_rev2_config \
@@ -811,7 +807,10 @@ mpc5121ads_rev2_config     \
        @if [ "$(findstring rev2,$@)" ] ; then \
                echo "#define CONFIG_ADS5121_REV2 1" > $(obj)include/config.h; \
        fi
-       @$(MKCONFIG) -a mpc5121ads ppc mpc512x mpc5121ads freescale
+       @$(MKCONFIG) -a mpc5121ads powerpc mpc512x mpc5121ads freescale
+
+pdm360ng_config:       unconfig
+       @$(MKCONFIG) -a pdm360ng powerpc mpc512x pdm360ng
 
 #########################################################################
 ## MPC8xx Systems
@@ -824,10 +823,10 @@ AdderII_config    \
        @mkdir -p $(obj)include
        $(if $(findstring AdderII,$@), \
        @echo "#define CONFIG_MPC852T" > $(obj)include/config.h)
-       @$(MKCONFIG) -a Adder ppc mpc8xx adder
+       @$(MKCONFIG) -a Adder powerpc mpc8xx adder
 
 AdderUSB_config:       unconfig
-       @$(MKCONFIG) -a AdderUSB ppc mpc8xx adder
+       @$(MKCONFIG) -a AdderUSB powerpc mpc8xx adder
 
 ADS860_config    \
 FADS823_config   \
@@ -835,34 +834,34 @@ FADS850SAR_config \
 MPC86xADS_config  \
 MPC885ADS_config  \
 FADS860T_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx fads
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx fads
 
 AMX860_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx amx860 westel
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx amx860 westel
 
 c2mon_config:          unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx c2mon
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx c2mon
 
 CCM_config:            unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx CCM siemens
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx CCM siemens
 
 cogent_mpc8xx_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx cogent
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx cogent
 
 ELPT860_config:                unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx elpt860 LEOX
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx elpt860 LEOX
 
 EP88x_config:          unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx ep88x
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx ep88x
 
 ESTEEM192E_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx esteem192e
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx esteem192e
 
 ETX094_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx etx094
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx etx094
 
 FLAGADM_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx flagadm
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx flagadm
 
 xtract_GEN860T = $(subst _SC,,$(subst _config,,$1))
 
@@ -873,22 +872,22 @@ GEN860T_config: unconfig
                { echo "#define CONFIG_SC" >>$(obj)include/config.h ; \
                  $(XECHO) "With reduced H/W feature set (SC)..." ; \
                }
-       @$(MKCONFIG) -a $(call xtract_GEN860T,$@) ppc mpc8xx gen860t
+       @$(MKCONFIG) -a $(call xtract_GEN860T,$@) powerpc mpc8xx gen860t
 
 GENIETV_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx genietv
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx genietv
 
 GTH_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx gth
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx gth
 
 hermes_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx hermes
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx hermes
 
 HMI10_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx tqm8xx tqc
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx tqm8xx tqc
 
 IAD210_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx IAD210 siemens
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx IAD210 siemens
 
 xtract_ICU862 = $(subst _100MHz,,$(subst _config,,$1))
 
@@ -899,10 +898,10 @@ ICU862_config: unconfig
                { echo "#define CONFIG_100MHz"  >>$(obj)include/config.h ; \
                  $(XECHO) "... with 100MHz system clock" ; \
                }
-       @$(MKCONFIG) -a $(call xtract_ICU862,$@) ppc mpc8xx icu862
+       @$(MKCONFIG) -a $(call xtract_ICU862,$@) powerpc mpc8xx icu862
 
 IP860_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx ip860
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx ip860
 
 IVML24_256_config \
 IVML24_128_config \
@@ -917,7 +916,7 @@ IVML24_config:      unconfig
        @[ -z "$(findstring IVML24_256_config,$@)" ] || \
                 { echo "#define CONFIG_IVML24_64M"     >>$(obj)include/config.h ; \
                 }
-       @$(MKCONFIG) -a IVML24 ppc mpc8xx ivm
+       @$(MKCONFIG) -a IVML24 powerpc mpc8xx ivm
 
 IVMS8_256_config \
 IVMS8_128_config \
@@ -932,32 +931,32 @@ IVMS8_config:     unconfig
        @[ -z "$(findstring IVMS8_256_config,$@)" ] || \
                 { echo "#define CONFIG_IVMS8_64M"      >>$(obj)include/config.h ; \
                 }
-       @$(MKCONFIG) -a IVMS8 ppc mpc8xx ivm
+       @$(MKCONFIG) -a IVMS8 powerpc mpc8xx ivm
 
 kmsupx4_config:                unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx km8xx keymile
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx km8xx keymile
 
 KUP4K_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx kup4k kup
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx kup4k kup
 
 KUP4X_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx kup4x kup
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx kup4x kup
 
 LANTEC_config  :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx lantec
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx lantec
 
 lwmon_config:          unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx lwmon
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx lwmon
 
 MBX_config     \
 MBX860T_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx mbx8xx
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx mbx8xx
 
 mgsuvd_config:         unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx km8xx keymile
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx km8xx keymile
 
 MHPC_config:           unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx mhpc eltec
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx mhpc eltec
 
 xtract_NETVIA = $(subst _V2,,$(subst _config,,$1))
 
@@ -972,7 +971,7 @@ NETVIA_config:              unconfig
                 { echo "#define CONFIG_NETVIA_VERSION 2" >>$(obj)include/config.h ; \
                  $(XECHO) "... Version 2" ; \
                 }
-       @$(MKCONFIG) -a $(call xtract_NETVIA,$@) ppc mpc8xx netvia
+       @$(MKCONFIG) -a $(call xtract_NETVIA,$@) powerpc mpc8xx netvia
 
 xtract_NETPHONE = $(subst _V2,,$(subst _config,,$1))
 
@@ -985,7 +984,7 @@ NETPHONE_config:    unconfig
        @[ -z "$(findstring NETPHONE_V2_config,$@)" ] || \
                 { echo "#define CONFIG_NETPHONE_VERSION 2" >>$(obj)include/config.h ; \
                 }
-       @$(MKCONFIG) -a $(call xtract_NETPHONE,$@) ppc mpc8xx netphone
+       @$(MKCONFIG) -a $(call xtract_NETPHONE,$@) powerpc mpc8xx netphone
 
 xtract_NETTA = $(subst _SWAPHOOK,,$(subst _6412,,$(subst _ISDN,,$(subst _config,,$1))))
 
@@ -1016,7 +1015,7 @@ NETTA_config:             unconfig
        @[ -n "$(findstring SWAPHOOK_,$@)" ] || \
                 { echo "#undef CONFIG_NETTA_SWAPHOOK" >>$(obj)include/config.h ; \
                 }
-       @$(MKCONFIG) -a $(call xtract_NETTA,$@) ppc mpc8xx netta
+       @$(MKCONFIG) -a $(call xtract_NETTA,$@) powerpc mpc8xx netta
 
 xtract_NETTA2 = $(subst _V2,,$(subst _config,,$1))
 
@@ -1029,7 +1028,7 @@ NETTA2_config:            unconfig
        @[ -z "$(findstring NETTA2_V2_config,$@)" ] || \
                 { echo "#define CONFIG_NETTA2_VERSION 2" >>$(obj)include/config.h ; \
                 }
-       @$(MKCONFIG) -a $(call xtract_NETTA2,$@) ppc mpc8xx netta2
+       @$(MKCONFIG) -a $(call xtract_NETTA2,$@) powerpc mpc8xx netta2
 
 NC650_Rev1_config \
 NC650_Rev2_config \
@@ -1045,37 +1044,37 @@ CP850_config:   unconfig
        @[ -z "$(findstring Rev2,$@)" ] || \
                 { echo "#define CONFIG_IDS852_REV2 1" >>$(obj)include/config.h ; \
                 }
-       @$(MKCONFIG) -a NC650 ppc mpc8xx nc650
+       @$(MKCONFIG) -a NC650 powerpc mpc8xx nc650
 
 NX823_config:          unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx nx823
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx nx823
 
 pcu_e_config:          unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx pcu_e siemens
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx pcu_e siemens
 
 QS850_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx qs850 snmc
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx qs850 snmc
 
 QS823_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx qs850 snmc
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx qs850 snmc
 
 QS860T_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx qs860t snmc
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx qs860t snmc
 
 quantum_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx quantum
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx quantum
 
 R360MPI_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx r360mpi
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx r360mpi
 
 RBC823_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx rbc823
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx rbc823
 
 RPXClassic_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx RPXClassic
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx RPXClassic
 
 RPXlite_config:                unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx RPXlite
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx RPXlite
 
 RPXlite_DW_64_config           \
 RPXlite_DW_LCD_config          \
@@ -1099,41 +1098,41 @@ RPXlite_DW_config:      unconfig
                { echo "#define  CONFIG_ENV_IS_IN_NVRAM"        >>$(obj)include/config.h ; \
                  $(XECHO) "... with ENV in NVRAM ..."; \
                }
-       @$(MKCONFIG) -a RPXlite_DW ppc mpc8xx RPXlite_dw
+       @$(MKCONFIG) -a RPXlite_DW powerpc mpc8xx RPXlite_dw
 
 rmu_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx rmu
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx rmu
 
 RRvision_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx RRvision
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx RRvision
 
 RRvision_LCD_config:   unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_LCD" >$(obj)include/config.h
        @echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
-       @$(MKCONFIG) -a RRvision ppc mpc8xx RRvision
+       @$(MKCONFIG) -a RRvision powerpc mpc8xx RRvision
 
 SM850_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx tqm8xx tqc
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx tqm8xx tqc
 
 spc1920_config:                unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx spc1920
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx spc1920
 
 SPD823TS_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx spd8xx
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx spd8xx
 
 stxxtc_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx stxxtc stx
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx stxxtc stx
 
 svm_sc8xx_config:      unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx svm_sc8xx
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx svm_sc8xx
 
 SXNI855T_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx sixnet
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx sixnet
 
 # EMK MPC8xx based modules
 TOP860_config:         unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx top860 emk
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx top860 emk
 
 # Play some tricks for configuration selection
 # Only 855 and 860 boards may come with FEC
@@ -1164,28 +1163,28 @@ virtlab2_config:        unconfig
                  echo "#define CONFIG_NEC_NL6448BC20"  >>$(obj)include/config.h ; \
                  $(XECHO) "... with LCD display" ; \
                }
-       @$(MKCONFIG) -a $(call xtract_8xx,$@) ppc mpc8xx tqm8xx tqc
+       @$(MKCONFIG) -a $(call xtract_8xx,$@) powerpc mpc8xx tqm8xx tqc
 
 TTTech_config: unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_LCD" >$(obj)include/config.h
        @echo "#define CONFIG_SHARP_LQ104V7DS01" >>$(obj)include/config.h
-       @$(MKCONFIG) -a TQM823L ppc mpc8xx tqm8xx tqc
+       @$(MKCONFIG) -a TQM823L powerpc mpc8xx tqm8xx tqc
 
 uc100_config   :       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx uc100
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx uc100
 
 v37_config:    unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_LCD" >$(obj)include/config.h
        @echo "#define CONFIG_SHARP_LQ084V1DG21" >>$(obj)include/config.h
-       @$(MKCONFIG) $(@:_config=) ppc mpc8xx v37
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8xx v37
 
 wtk_config:    unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_LCD" >$(obj)include/config.h
        @echo "#define CONFIG_SHARP_LQ065T9DR51U" >>$(obj)include/config.h
-       @$(MKCONFIG) -a TQM823L ppc mpc8xx tqm8xx tqc
+       @$(MKCONFIG) -a TQM823L powerpc mpc8xx tqm8xx tqc
 
 #########################################################################
 ## PPC4xx Systems
@@ -1193,50 +1192,50 @@ wtk_config:     unconfig
 xtract_4xx = $(subst _25,,$(subst _33,,$(subst _BA,,$(subst _ME,,$(subst _HI,,$(subst _config,,$1))))))
 
 acadia_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx acadia amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx acadia amcc
 
 acadia_nand_config:    unconfig
        @mkdir -p $(obj)include $(obj)board/amcc/acadia
        @mkdir -p $(obj)nand_spl/board/amcc/acadia
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a acadia ppc ppc4xx acadia amcc
+       @$(MKCONFIG) -n $@ -a acadia powerpc ppc4xx acadia amcc
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/acadia/config.tmp
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
 ADCIOP_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx adciop esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx adciop esd
 
 alpr_config:   unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx alpr prodrive
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx alpr prodrive
 
 AP1000_config:unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx ap1000 amirix
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx ap1000 amirix
 
 APC405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx apc405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx apc405 esd
 
 AR405_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx ar405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx ar405 esd
 
 ASH405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx ash405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx ash405 esd
 
 bamboo_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx bamboo amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx bamboo amcc
 
 bamboo_nand_config:    unconfig
        @mkdir -p $(obj)include $(obj)board/amcc/bamboo
        @mkdir -p $(obj)nand_spl/board/amcc/bamboo
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a bamboo ppc ppc4xx bamboo amcc
+       @$(MKCONFIG) -n $@ -a bamboo powerpc ppc4xx bamboo amcc
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/bamboo/config.tmp
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
 bubinga_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx bubinga amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx bubinga amcc
 
 CANBT_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx canbt esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx canbt esd
 
 # Arches, Canyonlands & Glacier use different U-Boot images
 arches_config \
@@ -1245,7 +1244,7 @@ glacier_config:   unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
                tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a canyonlands ppc ppc4xx canyonlands amcc
+       @$(MKCONFIG) -n $@ -a canyonlands powerpc ppc4xx canyonlands amcc
 
 canyonlands_nand_config \
 glacier_nand_config:   unconfig
@@ -1254,7 +1253,7 @@ glacier_nand_config:      unconfig
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_nand_config=)) | \
                tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a canyonlands ppc ppc4xx canyonlands amcc
+       @$(MKCONFIG) -n $@ -a canyonlands powerpc ppc4xx canyonlands amcc
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/canyonlands/config.tmp
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
@@ -1272,53 +1271,53 @@ CATcenter_33_config:    unconfig
                { echo "#define CONFIG_PPCHAMELEON_CLK_33" >> $(obj)include/config.h ; \
                  $(XECHO) "SysClk = 33MHz" ; \
                }
-       @$(MKCONFIG) -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
+       @$(MKCONFIG) -a $(call xtract_4xx,$@) powerpc ppc4xx PPChameleonEVB dave
 
 CMS700_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cms700 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx cms700 esd
 
 CPCI2DP_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci2dp esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx cpci2dp esd
 
 CPCI405_config         \
 CPCI4052_config                \
 CPCI405DT_config       \
 CPCI405AB_config:      unconfig
        @mkdir -p $(obj)board/esd/cpci405
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx cpci405 esd
 
 CPCIISER4_config:      unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpciiser4 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx cpciiser4 esd
 
 CRAYL1_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx L1 cray
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx L1 cray
 
 csb272_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx csb272
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx csb272
 
 csb472_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx csb472
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx csb472
 
 DASA_SIM_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx dasa_sim esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx dasa_sim esd
 
 dlvision_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx dlvision gdsys
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx dlvision gdsys
 
 DP405_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx dp405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx dp405 esd
 
 DU405_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx du405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx du405 esd
 
 DU440_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx du440 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx du440 esd
 
 ebony_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx ebony amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx ebony amcc
 
 ERIC_config:   unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx eric
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx eric
 
 fx12mm_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
@@ -1327,7 +1326,7 @@ fx12mm_flash_config: unconfig
                > $(obj)board/avnet/fx12mm/config.tmp
        @echo "TEXT_BASE := 0xFFCB0000" \
                >> $(obj)board/avnet/fx12mm/config.tmp
-       @$(MKCONFIG) fx12mm ppc ppc4xx fx12mm avnet
+       @$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet
 
 fx12mm_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
@@ -1336,27 +1335,27 @@ fx12mm_config: unconfig
                > $(obj)board/avnet/fx12mm/config.tmp
        @echo "TEXT_BASE := 0x03000000" \
                >> $(obj)board/avnet/fx12mm/config.tmp
-       @$(MKCONFIG) fx12mm ppc ppc4xx fx12mm avnet
+       @$(MKCONFIG) fx12mm powerpc ppc4xx fx12mm avnet
 
 G2000_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx g2000
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx g2000
 
 gdppc440etx_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx gdppc440etx gdsys
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx gdppc440etx gdsys
 
 hcu4_config:   unconfig
        @mkdir -p $(obj)board/netstal/common
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu4 netstal
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx hcu4 netstal
 
 hcu5_config:   unconfig
        @mkdir -p $(obj)board/netstal/common
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx hcu5 netstal
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx hcu5 netstal
 
 HH405_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx hh405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx hh405 esd
 
 HUB405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx hub405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx hub405 esd
 
 # Compact-Center(codename intip) & DevCon-Center use different U-Boot images
 intip_config \
@@ -1364,61 +1363,61 @@ devconcenter_config:    unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
                tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a intip ppc ppc4xx intip gdsys
+       @$(MKCONFIG) -n $@ -a intip powerpc ppc4xx intip gdsys
 
 JSE_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx jse
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx jse
 
 KAREF_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx karef sandburst
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx karef sandburst
 
 katmai_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx katmai amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx katmai amcc
 
 # Kilauea & Haleakala images are identical (recognized via PVR)
 kilauea_config \
 haleakala_config: unconfig
-       @$(MKCONFIG) -n $@ -a kilauea ppc ppc4xx kilauea amcc
+       @$(MKCONFIG) -n $@ -a kilauea powerpc ppc4xx kilauea amcc
 
 kilauea_nand_config \
 haleakala_nand_config: unconfig
        @mkdir -p $(obj)include $(obj)board/amcc/kilauea
        @mkdir -p $(obj)nand_spl/board/amcc/kilauea
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a kilauea ppc ppc4xx kilauea amcc
+       @$(MKCONFIG) -n $@ -a kilauea powerpc ppc4xx kilauea amcc
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/kilauea/config.tmp
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
 korat_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx korat
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx korat
 
 luan_config:   unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx luan amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx luan amcc
 
 lwmon5_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx lwmon5
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx lwmon5
 
 makalu_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx makalu amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx makalu amcc
 
 mcu25_config:  unconfig
        @mkdir -p $(obj)board/netstal/common
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx mcu25 netstal
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx mcu25 netstal
 
 METROBOX_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx metrobox sandburst
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx metrobox sandburst
 
 MIP405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx mip405 mpl
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx mip405 mpl
 
 MIP405T_config:        unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_MIP405T" >$(obj)include/config.h
        @$(XECHO) "Enable subset config for MIP405T"
-       @$(MKCONFIG) -a MIP405 ppc ppc4xx mip405 mpl
+       @$(MKCONFIG) -a MIP405 powerpc ppc4xx mip405 mpl
 
 ML2_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml2
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx ml2
 
 ml507_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
@@ -1427,7 +1426,7 @@ ml507_flash_config: unconfig
                > $(obj)board/xilinx/ml507/config.tmp
        @echo "TEXT_BASE := 0xFE360000" \
                >> $(obj)board/xilinx/ml507/config.tmp
-       @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
+       @$(MKCONFIG) ml507 powerpc ppc4xx ml507 xilinx
 
 ml507_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
@@ -1436,41 +1435,41 @@ ml507_config: unconfig
                > $(obj)board/xilinx/ml507/config.tmp
        @echo "TEXT_BASE := 0x04000000"  \
                >> $(obj)board/xilinx/ml507/config.tmp
-       @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
+       @$(MKCONFIG) ml507 powerpc ppc4xx ml507 xilinx
 
 neo_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx neo gdsys
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx neo gdsys
 
 ocotea_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx ocotea amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx ocotea amcc
 
 OCRTC_config           \
 ORSG_config:   unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx ocrtc esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx ocrtc esd
 
 p3p440_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx p3p440 prodrive
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx p3p440 prodrive
 
 PCI405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx pci405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx pci405 esd
 
 pcs440ep_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx pcs440ep
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx pcs440ep
 
 PIP405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx pip405 mpl
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx pip405 mpl
 
 PLU405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx plu405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx plu405 esd
 
 PMC405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx pmc405 esd
 
 PMC405DE_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc405de esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx pmc405de esd
 
 PMC440_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc440 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx pmc440 esd
 
 PPChameleonEVB_config          \
 PPChameleonEVB_BA_25_config    \
@@ -1500,26 +1499,26 @@ PPChameleonEVB_HI_33_config:    unconfig
                { echo "#define CONFIG_PPCHAMELEON_CLK_33" >>$(obj)include/config.h ; \
                  $(XECHO) "SysClk = 33MHz" ; \
                }
-       @$(MKCONFIG) -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
+       @$(MKCONFIG) -a $(call xtract_4xx,$@) powerpc ppc4xx PPChameleonEVB dave
 
 quad100hd_config:      unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx quad100hd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx quad100hd
 
 redwood_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx redwood amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx redwood amcc
 
 sbc405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx sbc405
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx sbc405
 
 sc3_config:unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx sc3
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx sc3
 
 sequoia_config \
 rainier_config: unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
                tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a sequoia ppc ppc4xx sequoia amcc
+       @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
 
 sequoia_nand_config \
 rainier_nand_config: unconfig
@@ -1528,7 +1527,7 @@ rainier_nand_config: unconfig
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
                tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a sequoia ppc ppc4xx sequoia amcc
+       @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
@@ -1538,16 +1537,16 @@ rainier_ramboot_config: unconfig
        @echo "#define CONFIG_SYS_RAMBOOT" > $(obj)include/config.h
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
                tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a sequoia ppc ppc4xx sequoia amcc
+       @$(MKCONFIG) -n $@ -a sequoia powerpc ppc4xx sequoia amcc
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/sequoia/config.tmp
        @echo "LDSCRIPT = board/amcc/sequoia/u-boot-ram.lds" >> \
                $(obj)board/amcc/sequoia/config.tmp
 
 taihu_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx taihu amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx taihu amcc
 
 taishan_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx taishan amcc
 
 v5fx30teval_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
@@ -1556,7 +1555,7 @@ v5fx30teval_config: unconfig
                > $(obj)board/avnet/v5fx30teval/config.tmp
        @echo "TEXT_BASE := 0x03000000" \
                >> $(obj)board/avnet/v5fx30teval/config.tmp
-       @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet
+       @$(MKCONFIG) v5fx30teval powerpc ppc4xx v5fx30teval avnet
 
 v5fx30teval_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
@@ -1565,25 +1564,25 @@ v5fx30teval_flash_config: unconfig
                > $(obj)board/avnet/v5fx30teval/config.tmp
        @echo "TEXT_BASE := 0xFF1C0000" \
                >> $(obj)board/avnet/v5fx30teval/config.tmp
-       @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet
+       @$(MKCONFIG) v5fx30teval powerpc ppc4xx v5fx30teval avnet
 
 VOH405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx voh405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx voh405 esd
 
 VOM405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx vom405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx vom405 esd
 
 W7OLMC_config  \
 W7OLMG_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx w7o
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx w7o
 
 # Walnut & Sycamore images are identical (recognized via PVR)
 walnut_config \
 sycamore_config: unconfig
-       @$(MKCONFIG) -n $@ -a walnut ppc ppc4xx walnut amcc
+       @$(MKCONFIG) -n $@ -a walnut powerpc ppc4xx walnut amcc
 
 WUH405_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx wuh405 esd
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx wuh405 esd
 
 xilinx-ppc405-generic_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
@@ -1591,7 +1590,7 @@ xilinx-ppc405-generic_flash_config: unconfig
                > $(obj)board/xilinx/ppc405-generic/config.tmp
        @echo "TEXT_BASE := 0xFE360000" \
                >> $(obj)board/xilinx/ppc405-generic/config.tmp
-       @$(MKCONFIG) xilinx-ppc405-generic ppc ppc4xx ppc405-generic xilinx
+       @$(MKCONFIG) xilinx-ppc405-generic powerpc ppc4xx ppc405-generic xilinx
 
 xilinx-ppc405-generic_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc405-generic
@@ -1599,7 +1598,7 @@ xilinx-ppc405-generic_config: unconfig
                > $(obj)board/xilinx/ppc405-generic/config.tmp
        @echo "TEXT_BASE := 0x04000000" \
                >> $(obj)board/xilinx/ppc405-generic/config.tmp
-       @$(MKCONFIG) xilinx-ppc405-generic ppc ppc4xx ppc405-generic xilinx
+       @$(MKCONFIG) xilinx-ppc405-generic powerpc ppc4xx ppc405-generic xilinx
 
 xilinx-ppc440-generic_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
@@ -1607,7 +1606,7 @@ xilinx-ppc440-generic_flash_config: unconfig
                > $(obj)board/xilinx/ppc440-generic/config.tmp
        @echo "TEXT_BASE := 0xFE360000" \
                >> $(obj)board/xilinx/ppc440-generic/config.tmp
-       @$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx
+       @$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx
 
 xilinx-ppc440-generic_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic
@@ -1615,23 +1614,23 @@ xilinx-ppc440-generic_config: unconfig
                > $(obj)board/xilinx/ppc440-generic/config.tmp
        @echo "TEXT_BASE := 0x04000000" \
                >> $(obj)board/xilinx/ppc440-generic/config.tmp
-       @$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx
+       @$(MKCONFIG) xilinx-ppc440-generic powerpc ppc4xx ppc440-generic xilinx
 
 XPEDITE1000_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx xpedite1000 xes
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx xpedite1000 xes
 
 yosemite_config \
 yellowstone_config: unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
                tr '[:lower:]' '[:upper:]')" >$(obj)include/config.h
-       @$(MKCONFIG) -n $@ -a yosemite ppc ppc4xx yosemite amcc
+       @$(MKCONFIG) -n $@ -a yosemite powerpc ppc4xx yosemite amcc
 
 yucca_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx yucca amcc
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx yucca amcc
 
 zeus_config:   unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx zeus
+       @$(MKCONFIG) $(@:_config=) powerpc ppc4xx zeus
 
 #########################################################################
 ## MPC8220 Systems
@@ -1639,10 +1638,10 @@ zeus_config:    unconfig
 
 Alaska8220_config      \
 Yukon8220_config:      unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8220 alaska
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8220 alaska
 
 sorcery_config:                unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8220 sorcery
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8220 sorcery
 
 #########################################################################
 ## MPC824x Systems
@@ -1650,17 +1649,17 @@ sorcery_config:         unconfig
 xtract_82xx = $(subst _BIGFLASH,,$(subst _ROMBOOT,,$(subst _L2,,$(subst _266MHz,,$(subst _300MHz,,$(subst _config,,$1))))))
 
 A3000_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x a3000
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x a3000
 
 barco_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x barco
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x barco
 
 BMW_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x bmw
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x bmw
 
 CPC45_config   \
 CPC45_ROMBOOT_config:  unconfig
-       @$(MKCONFIG) $(call xtract_82xx,$@) ppc mpc824x cpc45
+       @$(MKCONFIG) $(call xtract_82xx,$@) powerpc mpc824x cpc45
        @cd $(obj)include ;                             \
        if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
@@ -1672,19 +1671,19 @@ CPC45_ROMBOOT_config:   unconfig
        echo "export CONFIG_BOOT_ROM" >> config.mk;
 
 CU824_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x cu824
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x cu824
 
 debris_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x debris etin
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x debris etin
 
 eXalion_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x eXalion
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x eXalion
 
 HIDDEN_DRAGON_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x hidden_dragon
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x hidden_dragon
 
 kvme080_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x kvme080 etin
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x kvme080 etin
 
 # HDLAN is broken ATM. Should be fixed as soon as hardware is available and as
 # time permits.
@@ -1696,48 +1695,48 @@ linkstation_HGLAN_config: unconfig
                *HGLAN*) echo "#define CONFIG_HGLAN 1" >$(obj)include/config.h; ;; \
                *HDLAN*) echo "#define CONFIG_HLAN 1" >$(obj)include/config.h; ;; \
        esac
-       @$(MKCONFIG) -n $@ -a linkstation ppc mpc824x linkstation
+       @$(MKCONFIG) -n $@ -a linkstation powerpc mpc824x linkstation
 
 MOUSSE_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x mousse
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x mousse
 
 MUSENKI_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x musenki
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x musenki
 
 MVBLUE_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x mvblue
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x mvblue
 
 OXC_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x oxc
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x oxc
 
 PN62_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x pn62
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x pn62
 
 Sandpoint8240_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x sandpoint
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x sandpoint
 
 Sandpoint8245_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x sandpoint
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x sandpoint
 
 sbc8240_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x sbc8240
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x sbc8240
 
 utx8245_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc824x utx8245
+       @$(MKCONFIG) $(@:_config=) powerpc mpc824x utx8245
 
 #########################################################################
 ## MPC8260 Systems
 #########################################################################
 
 atc_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 atc
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 atc
 
 cogent_mpc8260_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 cogent
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 cogent
 
 CPU86_config   \
 CPU86_ROMBOOT_config: unconfig
-       @$(MKCONFIG) $(call xtract_82xx,$@) ppc mpc8260 cpu86
+       @$(MKCONFIG) $(call xtract_82xx,$@) powerpc mpc8260 cpu86
        @cd $(obj)include ;                             \
        if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
@@ -1750,7 +1749,7 @@ CPU86_ROMBOOT_config: unconfig
 
 CPU87_config   \
 CPU87_ROMBOOT_config: unconfig
-       @$(MKCONFIG) $(call xtract_82xx,$@) ppc mpc8260 cpu87
+       @$(MKCONFIG) $(call xtract_82xx,$@) powerpc mpc8260 cpu87
        @cd $(obj)include ;                             \
        if [ "$(findstring _ROMBOOT_,$@)" ] ; then \
                echo "CONFIG_BOOT_ROM = y" >> config.mk ; \
@@ -1763,25 +1762,25 @@ CPU87_ROMBOOT_config: unconfig
 
 ep8248_config  \
 ep8248E_config :       unconfig
-       @$(MKCONFIG) ep8248 ppc mpc8260 ep8248
+       @$(MKCONFIG) ep8248 powerpc mpc8260 ep8248
 
 ep8260_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 ep8260
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 ep8260
 
 ep82xxm_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 ep82xxm
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 ep82xxm
 
 gw8260_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 gw8260
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 gw8260
 
 hymod_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 hymod
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 hymod
 
 IDS8247_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 ids8247
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 ids8247
 
 IPHASE4539_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 iphase4539
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 iphase4539
 
 ISPAN_config           \
 ISPAN_REVB_config:     unconfig
@@ -1789,10 +1788,10 @@ ISPAN_REVB_config:      unconfig
        @if [ "$(findstring _REVB_,$@)" ] ; then \
                echo "#define CONFIG_SYS_REV_B" > $(obj)include/config.h ; \
        fi
-       @$(MKCONFIG) -a ISPAN ppc mpc8260 ispan
+       @$(MKCONFIG) -a ISPAN powerpc mpc8260 ispan
 
 mgcoge_config  :       unconfig
-       @$(MKCONFIG) mgcoge ppc mpc8260 mgcoge keymile
+       @$(MKCONFIG) mgcoge powerpc mpc8260 mgcoge keymile
 
 MPC8260ADS_config      \
 MPC8260ADS_lowboot_config      \
@@ -1824,10 +1823,10 @@ PQ2FADS-ZU_66MHz_lowboot_config \
                { echo "TEXT_BASE = 0xFF800000" >$(obj)board/freescale/mpc8260ads/config.tmp ; \
                  $(XECHO) "... with lowboot configuration" ; \
                }
-       @$(MKCONFIG) -a MPC8260ADS ppc mpc8260 mpc8260ads freescale
+       @$(MKCONFIG) -a MPC8260ADS powerpc mpc8260 mpc8260ads freescale
 
 MPC8266ADS_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 mpc8266ads freescale
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 mpc8266ads freescale
 
 muas3001_dev_config \
 muas3001_config        :       unconfig
@@ -1836,7 +1835,7 @@ muas3001_config   :       unconfig
        @if [ "$(findstring dev,$@)" ] ; then \
                echo "#define CONFIG_MUAS_DEV_BOARD" > $(obj)include/config.h ; \
        fi
-       @$(MKCONFIG) -a muas3001 ppc mpc8260 muas3001
+       @$(MKCONFIG) -a muas3001 powerpc mpc8260 muas3001
 
 # PM825/PM826 default configuration:  small (= 8 MB) Flash / boot from 64-bit flash
 PM825_config   \
@@ -1872,7 +1871,7 @@ PM826_ROMBOOT_BIGFLASH_config:    unconfig
                        echo "TEXT_BASE = 0xFF000000" >$(obj)board/pm826/config.tmp ; \
                fi; \
        fi
-       @$(MKCONFIG) -a PM826 ppc mpc8260 pm826
+       @$(MKCONFIG) -a PM826 powerpc mpc8260 pm826
 
 PM828_config   \
 PM828_PCI_config       \
@@ -1889,32 +1888,32 @@ PM828_ROMBOOT_PCI_config:       unconfig
                echo "#define CONFIG_BOOT_ROM" >>$(obj)include/config.h ; \
                echo "TEXT_BASE = 0xFF800000" >$(obj)board/pm826/config.tmp ; \
        fi
-       @$(MKCONFIG) -a PM828 ppc mpc8260 pm828
+       @$(MKCONFIG) -a PM828 powerpc mpc8260 pm828
 
 ppmc8260_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 ppmc8260
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 ppmc8260
 
 Rattler8248_config     \
 Rattler_config:                unconfig
        @mkdir -p $(obj)include
        $(if $(findstring 8248,$@), \
        @echo "#define CONFIG_MPC8248" > $(obj)include/config.h)
-       @$(MKCONFIG) -a Rattler ppc mpc8260 rattler
+       @$(MKCONFIG) -a Rattler powerpc mpc8260 rattler
 
 RPXsuper_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 rpxsuper
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 rpxsuper
 
 rsdproto_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 rsdproto
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 rsdproto
 
 sacsng_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 sacsng
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 sacsng
 
 sbc8260_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 sbc8260
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 sbc8260
 
 SCM_config:            unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 SCM siemens
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 SCM siemens
 
 TQM8255_AA_config \
 TQM8260_AA_config \
@@ -1960,19 +1959,19 @@ TQM8265_AA_config:  unconfig
                echo "#undef CONFIG_BUSMODE_60x"  >>$(obj)include/config.h ; \
                $(XECHO) "... without 60x Bus Mode" ; \
        fi
-       @$(MKCONFIG) -a TQM8260 ppc mpc8260 tqm8260 tqc
+       @$(MKCONFIG) -a TQM8260 powerpc mpc8260 tqm8260 tqc
 
 TQM8272_config: unconfig
-       @$(MKCONFIG) TQM8272 ppc mpc8260 tqm8272 tqc
+       @$(MKCONFIG) TQM8272 powerpc mpc8260 tqm8272 tqc
 
 VoVPN-GW_66MHz_config  \
 VoVPN-GW_100MHz_config:                unconfig
        @mkdir -p $(obj)include
        @echo "#define CONFIG_CLKIN_$(word 2,$(subst _, ,$@))" > $(obj)include/config.h
-       @$(MKCONFIG) -a VoVPN-GW ppc mpc8260 vovpn-gw funkwerk
+       @$(MKCONFIG) -a VoVPN-GW powerpc mpc8260 vovpn-gw funkwerk
 
 ZPC1900_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc8260 zpc1900
+       @$(MKCONFIG) $(@:_config=) powerpc mpc8260 zpc1900
 
 #########################################################################
 ## Coldfire
@@ -2229,7 +2228,7 @@ TASREG_config :           unconfig
 #########################################################################
 
 kmeter1_config: unconfig
-       @$(MKCONFIG) kmeter1 ppc mpc83xx kmeter1 keymile
+       @$(MKCONFIG) kmeter1 powerpc mpc83xx kmeter1 keymile
 
 MPC8313ERDB_33_config \
 MPC8313ERDB_66_config \
@@ -2250,17 +2249,17 @@ MPC8313ERDB_NAND_66_config: unconfig
                echo "TEXT_BASE = 0x00100000" > $(obj)board/freescale/mpc8313erdb/config.tmp ; \
                echo "#define CONFIG_NAND_U_BOOT" >>$(obj)include/config.h ; \
        fi ;
-       @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb freescale
+       @$(MKCONFIG) -a MPC8313ERDB powerpc mpc83xx mpc8313erdb freescale
        @if [ "$(findstring _NAND_,$@)" ] ; then \
                echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk ; \
        fi ;
 
 MPC8315ERDB_NAND_config \
 MPC8315ERDB_config: unconfig
-       @$(MKCONFIG) -t $(@:_config=) MPC8315ERDB ppc mpc83xx mpc8315erdb freescale
+       @$(MKCONFIG) -t $(@:_config=) MPC8315ERDB powerpc mpc83xx mpc8315erdb freescale
 
 MPC8323ERDB_config:    unconfig
-       @$(MKCONFIG) -a MPC8323ERDB ppc mpc83xx mpc8323erdb freescale
+       @$(MKCONFIG) -a MPC8323ERDB powerpc mpc83xx mpc8323erdb freescale
 
 MPC832XEMDS_config \
 MPC832XEMDS_HOST_33_config \
@@ -2292,10 +2291,10 @@ MPC832XEMDS_ATM_config: unconfig
                echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
                echo "#define CONFIG_PQ_MDS_PIB_ATM     1" >>$(obj)include/config.h ; \
        fi ;
-       @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds freescale
+       @$(MKCONFIG) -a MPC832XEMDS powerpc mpc83xx mpc832xemds freescale
 
 MPC8349EMDS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349emds freescale
+       @$(MKCONFIG) $(@:_config=) powerpc mpc83xx mpc8349emds freescale
 
 MPC8349ITX_config \
 MPC8349ITX_LOWBOOT_config \
@@ -2309,7 +2308,7 @@ MPC8349ITXGP_config:      unconfig
        @if [ "$(findstring LOWBOOT,$@)" ] ; then \
                echo "TEXT_BASE = 0xFE000000" >$(obj)board/freescale/mpc8349itx/config.tmp ; \
        fi
-       @$(MKCONFIG) -a -n $(@:_config=) MPC8349ITX ppc mpc83xx mpc8349itx freescale
+       @$(MKCONFIG) -a -n $(@:_config=) MPC8349ITX powerpc mpc83xx mpc8349itx freescale
 
 MPC8360EMDS_config \
 MPC8360EMDS_HOST_33_config \
@@ -2341,7 +2340,7 @@ MPC8360EMDS_ATM_config: unconfig
                echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
                echo "#define CONFIG_PQ_MDS_PIB_ATM     1" >>$(obj)include/config.h ; \
        fi ;
-       @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds freescale
+       @$(MKCONFIG) -a MPC8360EMDS powerpc mpc83xx mpc8360emds freescale
 
 MPC8360ERDK_33_config \
 MPC8360ERDK_66_config \
@@ -2351,7 +2350,7 @@ MPC8360ERDK_config:       unconfig
                $(XECHO) -n "... CLKIN 33MHz " ; \
                echo "#define CONFIG_CLKIN_33MHZ" >>$(obj)include/config.h ;\
        fi ;
-       @$(MKCONFIG) -a MPC8360ERDK ppc mpc83xx mpc8360erdk freescale
+       @$(MKCONFIG) -a MPC8360ERDK powerpc mpc83xx mpc8360erdk freescale
 
 MPC837XEMDS_config \
 MPC837XEMDS_HOST_config:       unconfig
@@ -2360,18 +2359,18 @@ MPC837XEMDS_HOST_config:        unconfig
                $(XECHO) -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ;
-       @$(MKCONFIG) -a MPC837XEMDS ppc mpc83xx mpc837xemds freescale
+       @$(MKCONFIG) -a MPC837XEMDS powerpc mpc83xx mpc837xemds freescale
 
 MPC837XERDB_config:    unconfig
-       @$(MKCONFIG) -a MPC837XERDB ppc mpc83xx mpc837xerdb freescale
+       @$(MKCONFIG) -a MPC837XERDB powerpc mpc83xx mpc837xerdb freescale
 
 MVBLM7_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc83xx mvblm7 matrix_vision
+       @$(MKCONFIG) $(@:_config=) powerpc mpc83xx mvblm7 matrix_vision
 
 sbc8349_config \
 sbc8349_PCI_33_config \
 sbc8349_PCI_66_config: unconfig
-       @$(MKCONFIG) -t $(@:_config=) sbc8349 ppc mpc83xx sbc8349
+       @$(MKCONFIG) -t $(@:_config=) sbc8349 powerpc mpc83xx sbc8349
 
 SIMPC8313_LP_config \
 SIMPC8313_SP_config: unconfig
@@ -2385,15 +2384,15 @@ SIMPC8313_SP_config: unconfig
                $(XECHO) -n "...Small Page NAND..." ; \
                echo "#define CONFIG_NAND_SP" >> $(obj)include/config.h ; \
        fi ;
-       @$(MKCONFIG) -a SIMPC8313 ppc mpc83xx simpc8313 sheldon
+       @$(MKCONFIG) -a SIMPC8313 powerpc mpc83xx simpc8313 sheldon
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
 
 TQM834x_config:        unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc83xx tqm834x tqc
+       @$(MKCONFIG) $(@:_config=) powerpc mpc83xx tqm834x tqc
 
 caddy2_config \
 vme8349_config:                unconfig
-       @$(MKCONFIG) -t $(@:_config=) vme8349 ppc mpc83xx vme8349 esd
+       @$(MKCONFIG) -t $(@:_config=) vme8349 powerpc mpc83xx vme8349 esd
 
 edb9301_config \
 edb9302_config \
@@ -2410,17 +2409,17 @@ edb9315a_config: unconfig
 #########################################################################
 
 ATUM8548_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx atum8548
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx atum8548
 
 MPC8536DS_NAND_config \
 MPC8536DS_SDCARD_config \
 MPC8536DS_SPIFLASH_config \
 MPC8536DS_36BIT_config \
 MPC8536DS_config:       unconfig
-       @$(MKCONFIG) -t $(@:_config=) MPC8536DS ppc mpc85xx mpc8536ds freescale
+       @$(MKCONFIG) -t $(@:_config=) MPC8536DS powerpc mpc85xx mpc8536ds freescale
 
 MPC8540ADS_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads freescale
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx mpc8540ads freescale
 
 MPC8540EVAL_config \
 MPC8540EVAL_33_config \
@@ -2440,10 +2439,10 @@ MPC8540EVAL_66_slave_config:      unconfig
        else \
                $(XECHO) " host" ; \
        fi
-       @$(MKCONFIG) -a MPC8540EVAL ppc mpc85xx mpc8540eval
+       @$(MKCONFIG) -a MPC8540EVAL powerpc mpc85xx mpc8540eval
 
 MPC8560ADS_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8560ads freescale
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx mpc8560ads freescale
 
 MPC8541CDS_legacy_config \
 MPC8541CDS_config:     unconfig
@@ -2452,10 +2451,10 @@ MPC8541CDS_config:      unconfig
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8541CDS ppc mpc85xx mpc8541cds freescale
+       @$(MKCONFIG) -a MPC8541CDS powerpc mpc85xx mpc8541cds freescale
 
 MPC8544DS_config:      unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8544ds freescale
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx mpc8544ds freescale
 
 MPC8548CDS_legacy_config \
 MPC8548CDS_config:     unconfig
@@ -2464,7 +2463,7 @@ MPC8548CDS_config:        unconfig
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8548CDS ppc mpc85xx mpc8548cds freescale
+       @$(MKCONFIG) -a MPC8548CDS powerpc mpc85xx mpc8548cds freescale
 
 MPC8555CDS_legacy_config \
 MPC8555CDS_config:     unconfig
@@ -2473,23 +2472,23 @@ MPC8555CDS_config:      unconfig
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                $(XECHO) "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8555CDS ppc mpc85xx mpc8555cds freescale
+       @$(MKCONFIG) -a MPC8555CDS powerpc mpc85xx mpc8555cds freescale
 
 MPC8568MDS_config:     unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds freescale
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx mpc8568mds freescale
 
 MPC8569MDS_ATM_config \
 MPC8569MDS_NAND_config \
 MPC8569MDS_config:     unconfig
-       @$(MKCONFIG) -t $(@:_config=) MPC8569MDS ppc mpc85xx mpc8569mds freescale
+       @$(MKCONFIG) -t $(@:_config=) MPC8569MDS powerpc mpc85xx mpc8569mds freescale
 
 MPC8572DS_36BIT_config \
 MPC8572DS_config:       unconfig
-       @$(MKCONFIG) -t $(@:_config=) MPC8572DS ppc mpc85xx mpc8572ds freescale
+       @$(MKCONFIG) -t $(@:_config=) MPC8572DS powerpc mpc85xx mpc8572ds freescale
 
 P2020DS_36BIT_config \
 P2020DS_config:                unconfig
-       @$(MKCONFIG) -t $(@:_config=) P2020DS ppc mpc85xx p2020ds freescale
+       @$(MKCONFIG) -t $(@:_config=) P2020DS powerpc mpc85xx p2020ds freescale
 
 P1011RDB_config        \
 P1011RDB_NAND_config \
@@ -2507,36 +2506,36 @@ P2020RDB_config \
 P2020RDB_NAND_config \
 P2020RDB_SDCARD_config \
 P2020RDB_SPIFLASH_config:      unconfig
-       @$(MKCONFIG) -t $(@:_config=) P1_P2_RDB ppc mpc85xx p1_p2_rdb freescale
+       @$(MKCONFIG) -t $(@:_config=) P1_P2_RDB powerpc mpc85xx p1_p2_rdb freescale
 
 PM854_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx pm854
 
 PM856_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm856
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx pm856
 
 sbc8540_config \
 sbc8540_33_config \
 sbc8540_66_config:     unconfig
-       @$(MKCONFIG) -t $(@:_config=) SBC8540 ppc mpc85xx sbc8560
+       @$(MKCONFIG) -t $(@:_config=) SBC8540 powerpc mpc85xx sbc8560
 
 sbc8548_config \
 sbc8548_PCI_33_config \
 sbc8548_PCI_66_config \
 sbc8548_PCI_33_PCIE_config \
 sbc8548_PCI_66_PCIE_config: unconfig
-       @$(MKCONFIG) -t $(@:_config=) sbc8548 ppc mpc85xx sbc8548
+       @$(MKCONFIG) -t $(@:_config=) sbc8548 powerpc mpc85xx sbc8548
 
 sbc8560_config \
 sbc8560_33_config \
 sbc8560_66_config:     unconfig
-       @$(MKCONFIG) -t $(@:_config=) sbc8560 ppc mpc85xx sbc8560
+       @$(MKCONFIG) -t $(@:_config=) sbc8560 powerpc mpc85xx sbc8560
 
 socrates_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx socrates
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx socrates
 
 stxgp3_config:         unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx stxgp3 stx
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx stxgp3 stx
 
 stxssa_config          \
 stxssa_4M_config:      unconfig
@@ -2545,7 +2544,7 @@ stxssa_4M_config: unconfig
                echo "#define CONFIG_STXSSA_4M" >>$(obj)include/config.h ; \
                $(XECHO) "... with 4 MiB flash memory" ; \
        fi
-       @$(MKCONFIG) -a stxssa ppc mpc85xx stxssa stx
+       @$(MKCONFIG) -a stxssa powerpc mpc85xx stxssa stx
 
 TQM8540_config         \
 TQM8541_config         \
@@ -2562,21 +2561,21 @@ TQM8560_config:         unconfig
        echo "#define CONFIG_$${BTYPE}">>$(obj)include/config.h; \
        echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
        echo "#define CONFIG_BOARDNAME \"$${BTYPE}\"">>$(obj)include/config.h;
-       @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx tqc
+       @$(MKCONFIG) -a TQM85xx powerpc mpc85xx tqm85xx tqc
        @echo "CONFIG_$(@:_config=) = y">>$(obj)include/config.mk;
 
 XPEDITE5200_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx xpedite5200 xes
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx xpedite5200 xes
 
 XPEDITE5370_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx xpedite5370 xes
+       @$(MKCONFIG) $(@:_config=) powerpc mpc85xx xpedite5370 xes
 
 #########################################################################
 ## MPC86xx Systems
 #########################################################################
 
 MPC8610HPCD_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8610hpcd freescale
+       @$(MKCONFIG) $(@:_config=) powerpc mpc86xx mpc8610hpcd freescale
 
 MPC8641HPCN_36BIT_config \
 MPC8641HPCN_config:    unconfig
@@ -2585,45 +2584,45 @@ MPC8641HPCN_config:    unconfig
                echo "#define CONFIG_PHYS_64BIT" >>$(obj)include/config.h ; \
                $(XECHO) "... enabling 36-bit physical addressing." ; \
        fi
-       @$(MKCONFIG) -a MPC8641HPCN ppc mpc86xx mpc8641hpcn freescale
+       @$(MKCONFIG) -a MPC8641HPCN powerpc mpc86xx mpc8641hpcn freescale
 
 sbc8641d_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc86xx sbc8641d
+       @$(MKCONFIG) $(@:_config=) powerpc mpc86xx sbc8641d
 
 XPEDITE5170_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc86xx xpedite5170 xes
+       @$(MKCONFIG) $(@:_config=) powerpc mpc86xx xpedite5170 xes
 
 #########################################################################
 ## 74xx/7xx Systems
 #########################################################################
 
 AmigaOneG3SE_config:   unconfig
-       @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx AmigaOneG3SE MAI
+       @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx AmigaOneG3SE MAI
 
 BAB7xx_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx bab7xx eltec
+       @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx bab7xx eltec
 
 CPCI750_config:        unconfig
-       @$(MKCONFIG) CPCI750 ppc 74xx_7xx cpci750 esd
+       @$(MKCONFIG) CPCI750 powerpc 74xx_7xx cpci750 esd
 
 DB64360_config:        unconfig
-       @$(MKCONFIG) DB64360 ppc 74xx_7xx db64360 Marvell
+       @$(MKCONFIG) DB64360 powerpc 74xx_7xx db64360 Marvell
 
 DB64460_config:        unconfig
-       @$(MKCONFIG) DB64460 ppc 74xx_7xx db64460 Marvell
+       @$(MKCONFIG) DB64460 powerpc 74xx_7xx db64460 Marvell
 
 ELPPC_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx elppc eltec
+       @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx elppc eltec
 
 EVB64260_config        \
 EVB64260_750CX_config: unconfig
-       @$(MKCONFIG) EVB64260 ppc 74xx_7xx evb64260
+       @$(MKCONFIG) EVB64260 powerpc 74xx_7xx evb64260
 
 mpc7448hpc2_config:  unconfig
-       @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx mpc7448hpc2 freescale
+       @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx mpc7448hpc2 freescale
 
 P3G4_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx evb64260
+       @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx evb64260
 
 p3m750_config  \
 p3m7448_config:                unconfig
@@ -2633,17 +2632,17 @@ p3m7448_config:         unconfig
        else \
                echo "#define CONFIG_P3M7448" >>$(obj)include/config.h ; \
        fi
-       @$(MKCONFIG) -a p3mx ppc 74xx_7xx p3mx prodrive
+       @$(MKCONFIG) -a p3mx powerpc 74xx_7xx p3mx prodrive
 
 PCIPPC2_config \
 PCIPPC6_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx pcippc2
+       @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx pcippc2
 
 ppmc7xx_config: unconfig
-       @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx ppmc7xx
+       @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx ppmc7xx
 
 ZUMA_config:   unconfig
-       @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx evb64260
+       @$(MKCONFIG) $(@:_config=) powerpc 74xx_7xx evb64260
 
 #========================================================================
 # ARM
@@ -3542,6 +3541,12 @@ PK1C20_config : unconfig
 PCI5441_config : unconfig
        @$(MKCONFIG)  PCI5441 nios2 nios2 pci5441 psyent
 
+# nios2 generic boards
+NIOS2_GENERIC = nios2-generic
+
+$(NIOS2_GENERIC:%=%_config) : unconfig
+       @$(MKCONFIG) $(@:_config=) nios2 nios2 nios2-generic altera
+
 #========================================================================
 ## Microblaze
 #========================================================================
@@ -3772,7 +3777,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)arch/ppc/cpu/mpc824x/bedbug_603e.c
+       @rm -f $(obj)arch/powerpc/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 99320ab..cdd81d4 100644 (file)
--- a/README
+++ b/README
@@ -183,7 +183,7 @@ Directory Hierarchy:
   /nios2               Files generic to Altera NIOS2 architecture
     /cpu               CPU specific files
     /lib               Architecture specific library files
-  /ppc                 Files generic to PowerPC architecture
+  /powerpc             Files generic to PowerPC architecture
     /cpu               CPU specific files
       /74xx_7xx                Files specific to Freescale MPC74xx and 7xx CPUs
       /mpc5xx          Files specific to Freescale MPC5xx CPUs
@@ -1417,7 +1417,7 @@ The following options need to be configured:
                the CPU's i2c node address).
 
                Now, the u-boot i2c code for the mpc8xx
-               (arch/ppc/cpu/mpc8xx/i2c.c) sets the CPU up as a master node
+               (arch/powerpc/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.
@@ -1509,6 +1509,17 @@ The following options need to be configured:
                custom i2c_init_board() routine in boards/xxx/board.c
                is run early in the boot sequence.
 
+               CONFIG_SYS_I2C_BOARD_LATE_INIT
+
+               An alternative to CONFIG_SYS_I2C_INIT_BOARD. If this option is
+               defined a custom i2c_board_late_init() routine in
+               boards/xxx/board.c is run AFTER the operations in i2c_init()
+               is completed. This callpoint can be used to unreset i2c bus
+               using CPU i2c controller register accesses for CPUs whose i2c
+               controller provide such a method. It is called at the end of
+               i2c_init() to allow i2c_init operations to setup the i2c bus
+               controller on the CPU (e.g. setting bus speed & slave address).
+
                CONFIG_I2CFAST (PPC405GP|PPC405EP only)
 
                This option enables configuration of bi_iic_fast[] flags
@@ -1966,7 +1977,7 @@ Legacy uImage format:
 
    15  arch/<arch>/lib/bootm.c All preparation done, transferring control to OS
 
-  -30  arch/ppc/lib/board.c    Fatal error, hang the system
+  -30  arch/powerpc/lib/board.c        Fatal error, hang the system
   -31  post/post.c             POST test failed, detected by post_output_backlog()
   -32  post/post.c             POST test failed, detected by post_run_single()
 
@@ -2727,7 +2738,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 arch/ppc/cpu/mpc8260/pci.c if set.
+               Overrides the default PCI memory map in arch/powerpc/cpu/mpc8260/pci.c if set.
 
 - CONFIG_PCI_DISABLE_PCIE:
                Disable PCI-Express on systems where it is supported but not
@@ -3373,7 +3384,7 @@ configure the Linux device drivers for use with your target hardware
 (no, we don't intend to provide a full virtual machine interface to
 Linux :-).
 
-But now you can ignore ALL boot loader code (in arch/ppc/mbxboot).
+But now you can ignore ALL boot loader code (in arch/powerpc/mbxboot).
 
 Just make sure your machine specific header file (for instance
 include/asm-ppc/tqm8xx.h) includes the same definition of the Board
@@ -3471,7 +3482,7 @@ So a typical call to build a U-Boot image would read:
 
        -> tools/mkimage -n '2.4.4 kernel for TQM850L' \
        > -A ppc -O linux -T kernel -C gzip -a 0 -e 0 \
-       > -d /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/ppc/coffboot/vmlinux.gz \
+       > -d /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/powerpc/coffboot/vmlinux.gz \
        > examples/uImage.TQM850L
        Image Name:   2.4.4 kernel for TQM850L
        Created:      Wed Jul 19 02:34:59 2000
@@ -3495,10 +3506,10 @@ speed for memory and install an UNCOMPRESSED image instead: this
 needs more space in Flash, but boots much faster since it does not
 need to be uncompressed:
 
-       -> gunzip /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/ppc/coffboot/vmlinux.gz
+       -> gunzip /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/powerpc/coffboot/vmlinux.gz
        -> tools/mkimage -n '2.4.4 kernel for TQM850L' \
        > -A ppc -O linux -T kernel -C none -a 0 -e 0 \
-       > -d /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/ppc/coffboot/vmlinux \
+       > -d /opt/elsk/ppc_8xx/usr/src/linux-2.4.4/arch/powerpc/coffboot/vmlinux \
        > examples/uImage.TQM850L-uncompressed
        Image Name:   2.4.4 kernel for TQM850L
        Created:      Wed Jul 19 02:34:59 2000
index b33e97b..513c635 100644 (file)
@@ -2773,6 +2773,57 @@ extern unsigned int __machine_arch_type;
 #define MACH_TYPE_SKAT91_S3E           2790
 #define MACH_TYPE_OMAP4_PANDA          2791
 #define MACH_TYPE_DF7220               2792
+#define MACH_TYPE_NEMINI               2793
+#define MACH_TYPE_T8200                2794
+#define MACH_TYPE_APF51                2795
+#define MACH_TYPE_DR_RC_UNIT           2796
+#define MACH_TYPE_BORDEAUX             2797
+#define MACH_TYPE_CATANIA_B            2798
+#define MACH_TYPE_MX51_OCEAN           2799
+#define MACH_TYPE_TI8168EVM            2800
+#define MACH_TYPE_NEOCOREOMAP          2801
+#define MACH_TYPE_WITHINGS_WBP         2802
+#define MACH_TYPE_DBPS                 2803
+#define MACH_TYPE_SBC9261              2804
+#define MACH_TYPE_PCBFP0001            2805
+#define MACH_TYPE_SPEEDY               2806
+#define MACH_TYPE_CHRYSAOR             2807
+#define MACH_TYPE_TANGO                2808
+#define MACH_TYPE_SYNOLOGY_DSX11       2809
+#define MACH_TYPE_HANLIN_V3EXT         2810
+#define MACH_TYPE_HANLIN_V5            2811
+#define MACH_TYPE_HANLIN_V3PLUS        2812
+#define MACH_TYPE_IRIVER_STORY         2813
+#define MACH_TYPE_IREX_ILIAD           2814
+#define MACH_TYPE_IREX_DR1000          2815
+#define MACH_TYPE_TETON_BGA            2816
+#define MACH_TYPE_SNAPPER9G45          2817
+#define MACH_TYPE_TAM3517              2818
+#define MACH_TYPE_PDC100               2819
+#define MACH_TYPE_EUKREA_CPUIMX25      2820
+#define MACH_TYPE_EUKREA_CPUIMX35      2821
+#define MACH_TYPE_EUKREA_CPUIMX51SD    2822
+#define MACH_TYPE_EUKREA_CPUIMX51      2823
+#define MACH_TYPE_P565                 2824
+#define MACH_TYPE_ACER_A4              2825
+#define MACH_TYPE_DAVINCI_DM368_BIP    2826
+#define MACH_TYPE_ESHARE               2827
+#define MACH_TYPE_HW_OMAPL138_EUROPA   2828
+#define MACH_TYPE_WLBARGN              2829
+#define MACH_TYPE_BM170                2830
+#define MACH_TYPE_NETSPACE_MINI_V2     2831
+#define MACH_TYPE_NETSPACE_PLUG_V2     2832
+#define MACH_TYPE_SIEMENS_L1           2833
+#define MACH_TYPE_ELV_LCU1             2834
+#define MACH_TYPE_MCU1                 2835
+#define MACH_TYPE_OMAP3_TAO3530        2836
+#define MACH_TYPE_OMAP3_PCUTOUCH       2837
+#define MACH_TYPE_SMDKC210             2838
+#define MACH_TYPE_OMAP3_BRAILLO        2839
+#define MACH_TYPE_SPYPLUG              2840
+#define MACH_TYPE_GINGER               2841
+#define MACH_TYPE_TNY_T3530            2842
+#define MACH_TYPE_PCA102               2843
 
 #ifdef CONFIG_ARCH_EBSA110
 # ifdef machine_arch_type
@@ -33573,9 +33624,9 @@ extern unsigned int __machine_arch_type;
 # else
 #  define machine_arch_type    MACH_TYPE_DAVINCI_CIO
 # endif
-# define machine_is_davinci_cio()      (machine_arch_type == MACH_TYPE_DAVINCI_CIO)
+# define machine_is_davinci_dm6467_cio()       (machine_arch_type == MACH_TYPE_DAVINCI_CIO)
 #else
-# define machine_is_davinci_cio()      (0)
+# define machine_is_davinci_dm6467_cio()       (0)
 #endif
 
 #ifdef CONFIG_MACH_SMARTMETER_DL
@@ -35906,6 +35957,618 @@ extern unsigned int __machine_arch_type;
 # define machine_is_df7220()   (0)
 #endif
 
+#ifdef CONFIG_MACH_NEMINI
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_NEMINI
+# endif
+# define machine_is_nemini()   (machine_arch_type == MACH_TYPE_NEMINI)
+#else
+# define machine_is_nemini()   (0)
+#endif
+
+#ifdef CONFIG_MACH_T8200
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_T8200
+# endif
+# define machine_is_t8200()    (machine_arch_type == MACH_TYPE_T8200)
+#else
+# define machine_is_t8200()    (0)
+#endif
+
+#ifdef CONFIG_MACH_APF51
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_APF51
+# endif
+# define machine_is_apf51()    (machine_arch_type == MACH_TYPE_APF51)
+#else
+# define machine_is_apf51()    (0)
+#endif
+
+#ifdef CONFIG_MACH_DR_RC_UNIT
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_DR_RC_UNIT
+# endif
+# define machine_is_dr_rc_unit()       (machine_arch_type == MACH_TYPE_DR_RC_UNIT)
+#else
+# define machine_is_dr_rc_unit()       (0)
+#endif
+
+#ifdef CONFIG_MACH_BORDEAUX
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_BORDEAUX
+# endif
+# define machine_is_bordeaux() (machine_arch_type == MACH_TYPE_BORDEAUX)
+#else
+# define machine_is_bordeaux() (0)
+#endif
+
+#ifdef CONFIG_MACH_CATANIA_B
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_CATANIA_B
+# endif
+# define machine_is_catania_b()        (machine_arch_type == MACH_TYPE_CATANIA_B)
+#else
+# define machine_is_catania_b()        (0)
+#endif
+
+#ifdef CONFIG_MACH_MX51_OCEAN
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_MX51_OCEAN
+# endif
+# define machine_is_mx51_ocean()       (machine_arch_type == MACH_TYPE_MX51_OCEAN)
+#else
+# define machine_is_mx51_ocean()       (0)
+#endif
+
+#ifdef CONFIG_MACH_TI8168EVM
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_TI8168EVM
+# endif
+# define machine_is_ti8168evm()        (machine_arch_type == MACH_TYPE_TI8168EVM)
+#else
+# define machine_is_ti8168evm()        (0)
+#endif
+
+#ifdef CONFIG_MACH_NEOCOREOMAP
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_NEOCOREOMAP
+# endif
+# define machine_is_neocoreomap()      (machine_arch_type == MACH_TYPE_NEOCOREOMAP)
+#else
+# define machine_is_neocoreomap()      (0)
+#endif
+
+#ifdef CONFIG_MACH_WITHINGS_WBP
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_WITHINGS_WBP
+# endif
+# define machine_is_withings_wbp()     (machine_arch_type == MACH_TYPE_WITHINGS_WBP)
+#else
+# define machine_is_withings_wbp()     (0)
+#endif
+
+#ifdef CONFIG_MACH_DBPS
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_DBPS
+# endif
+# define machine_is_dbps()     (machine_arch_type == MACH_TYPE_DBPS)
+#else
+# define machine_is_dbps()     (0)
+#endif
+
+#ifdef CONFIG_MACH_SBC9261
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_SBC9261
+# endif
+# define machine_is_at91sam9261()      (machine_arch_type == MACH_TYPE_SBC9261)
+#else
+# define machine_is_at91sam9261()      (0)
+#endif
+
+#ifdef CONFIG_MACH_PCBFP0001
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_PCBFP0001
+# endif
+# define machine_is_pcbfp0001()        (machine_arch_type == MACH_TYPE_PCBFP0001)
+#else
+# define machine_is_pcbfp0001()        (0)
+#endif
+
+#ifdef CONFIG_MACH_SPEEDY
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_SPEEDY
+# endif
+# define machine_is_speedy()   (machine_arch_type == MACH_TYPE_SPEEDY)
+#else
+# define machine_is_speedy()   (0)
+#endif
+
+#ifdef CONFIG_MACH_CHRYSAOR
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_CHRYSAOR
+# endif
+# define machine_is_chrysaor() (machine_arch_type == MACH_TYPE_CHRYSAOR)
+#else
+# define machine_is_chrysaor() (0)
+#endif
+
+#ifdef CONFIG_MACH_TANGO
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_TANGO
+# endif
+# define machine_is_tango()    (machine_arch_type == MACH_TYPE_TANGO)
+#else
+# define machine_is_tango()    (0)
+#endif
+
+#ifdef CONFIG_MACH_SYNOLOGY_DSX11
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_SYNOLOGY_DSX11
+# endif
+# define machine_is_synology_dsx11()   (machine_arch_type == MACH_TYPE_SYNOLOGY_DSX11)
+#else
+# define machine_is_synology_dsx11()   (0)
+#endif
+
+#ifdef CONFIG_MACH_HANLIN_V3EXT
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_HANLIN_V3EXT
+# endif
+# define machine_is_hanlin_v3ext()     (machine_arch_type == MACH_TYPE_HANLIN_V3EXT)
+#else
+# define machine_is_hanlin_v3ext()     (0)
+#endif
+
+#ifdef CONFIG_MACH_HANLIN_V5
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_HANLIN_V5
+# endif
+# define machine_is_hanlin_v5()        (machine_arch_type == MACH_TYPE_HANLIN_V5)
+#else
+# define machine_is_hanlin_v5()        (0)
+#endif
+
+#ifdef CONFIG_MACH_HANLIN_V3PLUS
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_HANLIN_V3PLUS
+# endif
+# define machine_is_hanlin_v3plus()    (machine_arch_type == MACH_TYPE_HANLIN_V3PLUS)
+#else
+# define machine_is_hanlin_v3plus()    (0)
+#endif
+
+#ifdef CONFIG_MACH_IRIVER_STORY
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_IRIVER_STORY
+# endif
+# define machine_is_iriver_story()     (machine_arch_type == MACH_TYPE_IRIVER_STORY)
+#else
+# define machine_is_iriver_story()     (0)
+#endif
+
+#ifdef CONFIG_MACH_IREX_ILIAD
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_IREX_ILIAD
+# endif
+# define machine_is_irex_iliad()       (machine_arch_type == MACH_TYPE_IREX_ILIAD)
+#else
+# define machine_is_irex_iliad()       (0)
+#endif
+
+#ifdef CONFIG_MACH_IREX_DR1000
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_IREX_DR1000
+# endif
+# define machine_is_irex_dr1000()      (machine_arch_type == MACH_TYPE_IREX_DR1000)
+#else
+# define machine_is_irex_dr1000()      (0)
+#endif
+
+#ifdef CONFIG_MACH_TETON_BGA
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_TETON_BGA
+# endif
+# define machine_is_teton_bga()        (machine_arch_type == MACH_TYPE_TETON_BGA)
+#else
+# define machine_is_teton_bga()        (0)
+#endif
+
+#ifdef CONFIG_MACH_SNAPPER9G45
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_SNAPPER9G45
+# endif
+# define machine_is_snapper9g45()      (machine_arch_type == MACH_TYPE_SNAPPER9G45)
+#else
+# define machine_is_snapper9g45()      (0)
+#endif
+
+#ifdef CONFIG_MACH_TAM3517
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_TAM3517
+# endif
+# define machine_is_tam3517()  (machine_arch_type == MACH_TYPE_TAM3517)
+#else
+# define machine_is_tam3517()  (0)
+#endif
+
+#ifdef CONFIG_MACH_PDC100
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_PDC100
+# endif
+# define machine_is_pdc100()   (machine_arch_type == MACH_TYPE_PDC100)
+#else
+# define machine_is_pdc100()   (0)
+#endif
+
+#ifdef CONFIG_MACH_EUKREA_CPUIMX25
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_EUKREA_CPUIMX25
+# endif
+# define machine_is_eukrea_cpuimx25sd()        (machine_arch_type == MACH_TYPE_EUKREA_CPUIMX25)
+#else
+# define machine_is_eukrea_cpuimx25sd()        (0)
+#endif
+
+#ifdef CONFIG_MACH_EUKREA_CPUIMX35
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_EUKREA_CPUIMX35
+# endif
+# define machine_is_eukrea_cpuimx35sd()        (machine_arch_type == MACH_TYPE_EUKREA_CPUIMX35)
+#else
+# define machine_is_eukrea_cpuimx35sd()        (0)
+#endif
+
+#ifdef CONFIG_MACH_EUKREA_CPUIMX51SD
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_EUKREA_CPUIMX51SD
+# endif
+# define machine_is_eukrea_cpuimx51sd()        (machine_arch_type == MACH_TYPE_EUKREA_CPUIMX51SD)
+#else
+# define machine_is_eukrea_cpuimx51sd()        (0)
+#endif
+
+#ifdef CONFIG_MACH_EUKREA_CPUIMX51
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_EUKREA_CPUIMX51
+# endif
+# define machine_is_eukrea_cpuimx51()  (machine_arch_type == MACH_TYPE_EUKREA_CPUIMX51)
+#else
+# define machine_is_eukrea_cpuimx51()  (0)
+#endif
+
+#ifdef CONFIG_MACH_P565
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_P565
+# endif
+# define machine_is_p565()     (machine_arch_type == MACH_TYPE_P565)
+#else
+# define machine_is_p565()     (0)
+#endif
+
+#ifdef CONFIG_MACH_ACER_A4
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_ACER_A4
+# endif
+# define machine_is_acer_a4()  (machine_arch_type == MACH_TYPE_ACER_A4)
+#else
+# define machine_is_acer_a4()  (0)
+#endif
+
+#ifdef CONFIG_MACH_DAVINCI_DM368_BIP
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_DAVINCI_DM368_BIP
+# endif
+# define machine_is_davinci_dm368_bip()        (machine_arch_type == MACH_TYPE_DAVINCI_DM368_BIP)
+#else
+# define machine_is_davinci_dm368_bip()        (0)
+#endif
+
+#ifdef CONFIG_MACH_ESHARE
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_ESHARE
+# endif
+# define machine_is_eshare()   (machine_arch_type == MACH_TYPE_ESHARE)
+#else
+# define machine_is_eshare()   (0)
+#endif
+
+#ifdef CONFIG_MACH_HW_OMAPL138_EUROPA
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_HW_OMAPL138_EUROPA
+# endif
+# define machine_is_hw_omapl138_europa()       (machine_arch_type == MACH_TYPE_HW_OMAPL138_EUROPA)
+#else
+# define machine_is_hw_omapl138_europa()       (0)
+#endif
+
+#ifdef CONFIG_MACH_WLBARGN
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_WLBARGN
+# endif
+# define machine_is_wlbargn()  (machine_arch_type == MACH_TYPE_WLBARGN)
+#else
+# define machine_is_wlbargn()  (0)
+#endif
+
+#ifdef CONFIG_MACH_BM170
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_BM170
+# endif
+# define machine_is_bm170()    (machine_arch_type == MACH_TYPE_BM170)
+#else
+# define machine_is_bm170()    (0)
+#endif
+
+#ifdef CONFIG_MACH_NETSPACE_MINI_V2
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_NETSPACE_MINI_V2
+# endif
+# define machine_is_netspace_mini_v2() (machine_arch_type == MACH_TYPE_NETSPACE_MINI_V2)
+#else
+# define machine_is_netspace_mini_v2() (0)
+#endif
+
+#ifdef CONFIG_MACH_NETSPACE_PLUG_V2
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_NETSPACE_PLUG_V2
+# endif
+# define machine_is_netspace_plug_v2() (machine_arch_type == MACH_TYPE_NETSPACE_PLUG_V2)
+#else
+# define machine_is_netspace_plug_v2() (0)
+#endif
+
+#ifdef CONFIG_MACH_SIEMENS_L1
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_SIEMENS_L1
+# endif
+# define machine_is_siemens_l1()       (machine_arch_type == MACH_TYPE_SIEMENS_L1)
+#else
+# define machine_is_siemens_l1()       (0)
+#endif
+
+#ifdef CONFIG_MACH_ELV_LCU1
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_ELV_LCU1
+# endif
+# define machine_is_elv_lcu1() (machine_arch_type == MACH_TYPE_ELV_LCU1)
+#else
+# define machine_is_elv_lcu1() (0)
+#endif
+
+#ifdef CONFIG_MACH_MCU1
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_MCU1
+# endif
+# define machine_is_mcu1()     (machine_arch_type == MACH_TYPE_MCU1)
+#else
+# define machine_is_mcu1()     (0)
+#endif
+
+#ifdef CONFIG_MACH_OMAP3_TAO3530
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_OMAP3_TAO3530
+# endif
+# define machine_is_omap3_tao3530()    (machine_arch_type == MACH_TYPE_OMAP3_TAO3530)
+#else
+# define machine_is_omap3_tao3530()    (0)
+#endif
+
+#ifdef CONFIG_MACH_OMAP3_PCUTOUCH
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_OMAP3_PCUTOUCH
+# endif
+# define machine_is_omap3_pcutouch()   (machine_arch_type == MACH_TYPE_OMAP3_PCUTOUCH)
+#else
+# define machine_is_omap3_pcutouch()   (0)
+#endif
+
+#ifdef CONFIG_MACH_SMDKC210
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_SMDKC210
+# endif
+# define machine_is_smdkc210() (machine_arch_type == MACH_TYPE_SMDKC210)
+#else
+# define machine_is_smdkc210() (0)
+#endif
+
+#ifdef CONFIG_MACH_OMAP3_BRAILLO
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_OMAP3_BRAILLO
+# endif
+# define machine_is_omap3_braillo()    (machine_arch_type == MACH_TYPE_OMAP3_BRAILLO)
+#else
+# define machine_is_omap3_braillo()    (0)
+#endif
+
+#ifdef CONFIG_MACH_SPYPLUG
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_SPYPLUG
+# endif
+# define machine_is_spyplug()  (machine_arch_type == MACH_TYPE_SPYPLUG)
+#else
+# define machine_is_spyplug()  (0)
+#endif
+
+#ifdef CONFIG_MACH_GINGER
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_GINGER
+# endif
+# define machine_is_ginger()   (machine_arch_type == MACH_TYPE_GINGER)
+#else
+# define machine_is_ginger()   (0)
+#endif
+
+#ifdef CONFIG_MACH_TNY_T3530
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_TNY_T3530
+# endif
+# define machine_is_tny_t3530()        (machine_arch_type == MACH_TYPE_TNY_T3530)
+#else
+# define machine_is_tny_t3530()        (0)
+#endif
+
+#ifdef CONFIG_MACH_PCA102
+# ifdef machine_arch_type
+#  undef machine_arch_type
+#  define machine_arch_type    __machine_arch_type
+# else
+#  define machine_arch_type    MACH_TYPE_PCA102
+# endif
+# define machine_is_pca102()   (machine_arch_type == MACH_TYPE_PCA102)
+#else
+# define machine_is_pca102()   (0)
+#endif
+
 /*
  * These have not yet been registered
  */
index 3b7c4d4..d258a69 100644 (file)
@@ -50,6 +50,8 @@ void  icache_enable (void) {
 }
 
 void   icache_disable(void) {
+       /* we are not generate ICACHE size -> flush whole cache */
+       flush_cache(0, 32768);
        MSRCLR(0x20);
 }
 
@@ -58,5 +60,31 @@ void dcache_enable (void) {
 }
 
 void   dcache_disable(void) {
+#ifdef XILINX_USE_DCACHE
+#ifdef XILINX_DCACHE_BYTE_SIZE
+       flush_cache(0, XILINX_DCACHE_BYTE_SIZE);
+#else
+#warning please rebuild BSPs and update configuration
+       flush_cache(0, 32768);
+#endif
+#endif
        MSRCLR(0x80);
 }
+
+void flush_cache (ulong addr, ulong size)
+{
+       int i;
+       for (i = 0; i < size; i += 4)
+               asm volatile (
+#ifdef CONFIG_ICACHE
+                               "wic    %0, r0;"
+#endif
+                               "nop;"
+#ifdef CONFIG_DCACHE
+                               "wdc.flush      %0, r0;"
+#endif
+                               "nop;"
+                               :
+                               : "r" (addr + i)
+                               : "memory");
+}
index a6021c9..7a9d022 100644 (file)
@@ -46,13 +46,6 @@ int disable_interrupts (void)
 }
 
 #ifdef CONFIG_SYS_INTC_0
-#ifdef CONFIG_SYS_TIMER_0
-extern void timer_init (void);
-#endif
-#ifdef CONFIG_SYS_FSL_2
-extern void fsl_init2 (void);
-#endif
-
 
 static struct irq_action vecs[CONFIG_SYS_INTC_0_NUM];
 
@@ -142,20 +135,14 @@ int interrupts_init (void)
        }
        /* initialize intc controller */
        intc_init ();
-#ifdef CONFIG_SYS_TIMER_0
-       timer_init ();
-#endif
-#ifdef CONFIG_SYS_FSL_2
-       fsl_init2 ();
-#endif
        enable_interrupts ();
        return 0;
 }
 
 void interrupt_handler (void)
 {
-       int irqs = (intc->isr & intc->ier);     /* find active interrupt */
-       int i = 1;
+       int irqs = intc->ivr;   /* find active interrupt */
+       int mask = 1;
 #ifdef DEBUG_INT
        int value;
        printf ("INTC isr %x, ier %x, iar %x, mer %x\n", intc->isr, intc->ier,
@@ -163,23 +150,17 @@ void interrupt_handler (void)
        R14(value);
        printf ("Interrupt handler on %x line, r14 %x\n", irqs, value);
 #endif
-       struct irq_action *act = vecs;
-       while (irqs) {
-               if (irqs & 1) {
+       struct irq_action *act = vecs + irqs;
+
+       intc->iar = mask << irqs;
+
 #ifdef DEBUG_INT
-                       printf
-                           ("Jumping to interrupt handler rutine addr %x,count %x,arg %x\n",
-                            act->handler, act->count, act->arg);
+       printf
+           ("Jumping to interrupt handler rutine addr %x,count %x,arg %x\n",
+            act->handler, act->count, act->arg);
 #endif
-                       act->handler (act->arg);
-                       act->count++;
-                       intc->iar = i;
-                       return;
-               }
-               irqs >>= 1;
-               act++;
-               i <<= 1;
-       }
+       act->handler (act->arg);
+       act->count++;
 
 #ifdef DEBUG_INT
        printf ("Dump INTC reg, isr %x, ier %x, iar %x, mer %x\n", intc->isr,
index e1fc190..47bba36 100644 (file)
        .text
        .global _interrupt_handler
 _interrupt_handler:
-       addi    r1, r1, -4
-       swi     r2, r1, 0
-       addi    r1, r1, -4
-       swi     r3, r1, 0
-       addi    r1, r1, -4
-       swi     r4, r1, 0
-       addi    r1, r1, -4
-       swi     r5, r1, 0
-       addi    r1, r1, -4
-       swi     r6, r1, 0
-       addi    r1, r1, -4
-       swi     r7, r1, 0
-       addi    r1, r1, -4
-       swi     r8, r1, 0
-       addi    r1, r1, -4
-       swi     r9, r1, 0
-       addi    r1, r1, -4
-       swi     r10, r1, 0
-       addi    r1, r1, -4
-       swi     r11, r1, 0
-       addi    r1, r1, -4
-       swi     r12, r1, 0
-       addi    r1, r1, -4
-       swi     r13, r1, 0
-       addi    r1, r1, -4
-       swi     r14, r1, 0
-       addi    r1, r1, -4
-       swi     r15, r1, 0
-       addi    r1, r1, -4
-       swi     r16, r1, 0
-       addi    r1, r1, -4
-       swi     r17, r1, 0
-       addi    r1, r1, -4
-       swi     r18, r1, 0
-       addi    r1, r1, -4
-       swi     r19, r1, 0
-       addi    r1, r1, -4
-       swi     r20, r1, 0
-       addi    r1, r1, -4
-       swi     r21, r1, 0
-       addi    r1, r1, -4
-       swi     r22, r1, 0
-       addi    r1, r1, -4
-       swi     r23, r1, 0
-       addi    r1, r1, -4
-       swi     r24, r1, 0
-       addi    r1, r1, -4
-       swi     r25, r1, 0
-       addi    r1, r1, -4
-       swi     r26, r1, 0
-       addi    r1, r1, -4
-       swi     r27, r1, 0
-       addi    r1, r1, -4
-       swi     r28, r1, 0
-       addi    r1, r1, -4
-       swi     r29, r1, 0
-       addi    r1, r1, -4
-       swi     r30, r1, 0
-       addi    r1, r1, -4
-       swi     r31, r1, 0
+       swi     r2, r1, -4
+       swi     r3, r1, -8
+       swi     r4, r1, -12
+       swi     r5, r1, -16
+       swi     r6, r1, -20
+       swi     r7, r1, -24
+       swi     r8, r1, -28
+       swi     r9, r1, -32
+       swi     r10, r1, -36
+       swi     r11, r1, -40
+       swi     r12, r1, -44
+       swi     r13, r1, -48
+       swi     r14, r1, -52
+       swi     r15, r1, -56
+       swi     r16, r1, -60
+       swi     r17, r1, -64
+       swi     r18, r1, -68
+       swi     r19, r1, -72
+       swi     r20, r1, -76
+       swi     r21, r1, -80
+       swi     r22, r1, -84
+       swi     r23, r1, -88
+       swi     r24, r1, -92
+       swi     r25, r1, -96
+       swi     r26, r1, -100
+       swi     r27, r1, -104
+       swi     r28, r1, -108
+       swi     r29, r1, -112
+       swi     r30, r1, -116
+       swi     r31, r1, -120
+       addik   r1, r1, -124
        brlid   r15, interrupt_handler
        nop
        nop
-       lwi     r31, r1, 0
-       addi    r1, r1, 4
-       lwi     r30, r1, 0
-       addi    r1, r1, 4
-       lwi     r29, r1, 0
-       addi    r1, r1, 4
-       lwi     r28, r1, 0
-       addi    r1, r1, 4
-       lwi     r27, r1, 0
-       addi    r1, r1, 4
-       lwi     r26, r1, 0
-       addi    r1, r1, 4
-       lwi     r25, r1, 0
-       addi    r1, r1, 4
-       lwi     r24, r1, 0
-       addi    r1, r1, 4
-       lwi     r23, r1, 0
-       addi    r1, r1, 4
-       lwi     r22, r1, 0
-       addi    r1, r1, 4
-       lwi     r21, r1, 0
-       addi    r1, r1, 4
-       lwi     r20, r1, 0
-       addi    r1, r1, 4
-       lwi     r19, r1, 0
-       addi    r1, r1, 4
-       lwi     r18, r1, 0
-       addi    r1, r1, 4
-       lwi     r17, r1, 0
-       addi    r1, r1, 4
-       lwi     r16, r1, 0
-       addi    r1, r1, 4
-       lwi     r15, r1, 0
-       addi    r1, r1, 4
-       lwi     r14, r1, 0
-       addi    r1, r1, 4
-       lwi     r13, r1, 0
-       addi    r1, r1, 4
-       lwi     r12, r1, 0
-       addi    r1, r1, 4
-       lwi     r11, r1, 0
-       addi    r1, r1, 4
-       lwi     r10, r1, 0
-       addi    r1, r1, 4
-       lwi     r9, r1, 0
-       addi    r1, r1, 4
-       lwi     r8, r1, 0
-       addi    r1, r1, 4
-       lwi     r7, r1, 0
-       addi    r1, r1, 4
-       lwi     r6, r1, 0
-       addi    r1, r1, 4
-       lwi     r5, r1, 0
-       addi    r1, r1, 4
-       lwi     r4, r1, 0
-       addi    r1, r1, 4
-       lwi     r3, r1, 0
-       addi    r1, r1, 4
-       lwi     r2, r1, 0
-       addi    r1, r1, 4
+       addik   r1, r1, 124
+       lwi     r31, r1, -120
+       lwi     r30, r1, -116
+       lwi     r29, r1, -112
+       lwi     r28, r1, -108
+       lwi     r27, r1, -104
+       lwi     r26, r1, -100
+       lwi     r25, r1, -96
+       lwi     r24, r1, -92
+       lwi     r23, r1, -88
+       lwi     r22, r1, -84
+       lwi     r21, r1, -80
+       lwi     r20, r1, -76
+       lwi     r19, r1, -72
+       lwi     r18, r1, -68
+       lwi     r17, r1, -64
+       lwi     r16, r1, -60
+       lwi     r15, r1, -56
+       lwi     r14, r1, -52
+       lwi     r13, r1, -48
+       lwi     r12, r1, -44
+       lwi     r11, r1, -40
+       lwi     r10, r1, -36
+       lwi     r9, r1, -32
+       lwi     r8, r1, -28
+       lwi     r7, r1, -24
+       lwi     r6, r1, -20
+       lwi     r5, r1, -16
+       lwi     r4, r1, -12
+       lwi     r3, r1, -8
+       lwi     r2, r1, -4
 
        /* enable_interrupt */
 #ifdef XILINX_USE_MSR_INSTR
index a91eabc..4936c62 100644 (file)
@@ -60,7 +60,7 @@ void timer_isr (void *arg)
        tmr->control = tmr->control | TIMER_INTERRUPT;
 }
 
-void timer_init (void)
+int timer_init (void)
 {
        tmr->loadreg = CONFIG_SYS_TIMER_0_PRELOAD;
        tmr->control = TIMER_INTERRUPT | TIMER_RESET;
@@ -68,6 +68,7 @@ void timer_init (void)
            TIMER_ENABLE | TIMER_ENABLE_INTR | TIMER_RELOAD | TIMER_DOWN_COUNT;
        reset_timer ();
        install_interrupt_handler (CONFIG_SYS_TIMER_0_IRQ, timer_isr, (void *)tmr);
+       return 0;
 }
 #endif
 #endif
index 9b0f296..8176437 100644 (file)
@@ -29,7 +29,6 @@ SOBJS-y       +=
 
 COBJS-y        += board.o
 COBJS-y        += bootm.o
-COBJS-y        += cache.o
 COBJS-y        += time.o
 
 SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
index d4baea9..3ff5c17 100644 (file)
@@ -30,6 +30,7 @@
 #include <timestamp.h>
 #include <version.h>
 #include <watchdog.h>
+#include <stdio_dev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -44,6 +45,12 @@ extern int interrupts_init (void);
 #if defined(CONFIG_CMD_NET)
 extern int eth_init (bd_t * bis);
 #endif
+#ifdef CONFIG_SYS_TIMER_0
+extern int timer_init (void);
+#endif
+#ifdef CONFIG_SYS_FSL_2
+extern void fsl_init2 (void);
+#endif
 
 /*
  * All attempts to come up with a "common" initialization sequence
@@ -67,6 +74,12 @@ init_fnc_t *init_sequence[] = {
 #endif
 #ifdef CONFIG_SYS_INTC_0
        interrupts_init,
+#endif
+#ifdef CONFIG_SYS_TIMER_0
+       timer_init,
+#endif
+#ifdef CONFIG_SYS_FSL_2
+       fsl_init2,
 #endif
        NULL,
 };
@@ -76,6 +89,7 @@ void board_init (void)
        bd_t *bd;
        init_fnc_t **init_fnc_ptr;
        gd = (gd_t *) CONFIG_SYS_GBL_DATA_OFFSET;
+       char *s;
 #if defined(CONFIG_CMD_FLASH)
        ulong flash_size = 0;
 #endif
@@ -104,8 +118,8 @@ void board_init (void)
        }
 
        puts ("SDRAM :\n");
-       printf ("\t\tIcache:%s\n", icache_status() ? "OK" : "FAIL");
-       printf ("\t\tDcache:%s\n", dcache_status() ? "OK" : "FAIL");
+       printf ("\t\tIcache:%s\n", icache_status() ? "ON" : "OFF");
+       printf ("\t\tDcache:%s\n", dcache_status() ? "ON" : "OFF");
        printf ("\tU-Boot Start:0x%08x\n", TEXT_BASE);
 
 #if defined(CONFIG_CMD_FLASH)
@@ -139,15 +153,22 @@ void board_init (void)
        }
 #endif
 
+       /* relocate environment function pointers etc. */
+       env_relocate ();
+
+       /* Initialize stdio devices */
+       stdio_init ();
+
+       if ((s = getenv ("loadaddr")) != NULL) {
+               load_addr = simple_strtoul (s, NULL, 16);
+       }
+
 #if defined(CONFIG_CMD_NET)
        /* IP Address */
        bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
        eth_init (bd);
 #endif
 
-       /* relocate environment function pointers etc. */
-       env_relocate ();
-
        /* main_loop */
        for (;;) {
                WATCHDOG_RESET ();
index bce4774..2227a81 100644 (file)
@@ -35,22 +35,59 @@ DECLARE_GLOBAL_DATA_PTR;
 int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
        /* First parameter is mapped to $r5 for kernel boot args */
-       void    (*theKernel) (char *);
+       void    (*theKernel) (char *, ulong, ulong);
        char    *commandline = getenv ("bootargs");
+       ulong   rd_data_start, rd_data_end;
 
        if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
                return 1;
 
-       theKernel = (void (*)(char *))images->ep;
+       int     ret;
+
+       char    *of_flat_tree = NULL;
+#if defined(CONFIG_OF_LIBFDT)
+       ulong   of_size = 0;
+
+       /* find flattened device tree */
+       ret = boot_get_fdt (flag, argc, argv, images, &of_flat_tree, &of_size);
+       if (ret)
+               return 1;
+#endif
+
+       theKernel = (void (*)(char *, ulong, ulong))images->ep;
+
+       /* find ramdisk */
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_MICROBLAZE,
+                       &rd_data_start, &rd_data_end);
+       if (ret)
+               return 1;
 
        show_boot_progress (15);
 
+       if (!(ulong) of_flat_tree)
+               of_flat_tree = (char *)simple_strtoul (argv[3], NULL, 16);
+
 #ifdef DEBUG
-       printf ("## Transferring control to Linux (at address %08lx) ...\n",
-               (ulong) theKernel);
+       printf ("## Transferring control to Linux (at address 0x%08lx) " \
+                               "ramdisk 0x%08lx, FDT 0x%08lx...\n",
+               (ulong) theKernel, rd_data_start, (ulong) of_flat_tree);
 #endif
 
-       theKernel (commandline);
+#ifdef XILINX_USE_DCACHE
+#ifdef XILINX_DCACHE_BYTE_SIZE
+       flush_cache(0, XILINX_DCACHE_BYTE_SIZE);
+#else
+#warning please rebuild BSPs and update configuration
+       flush_cache(0, 32768);
+#endif
+#endif
+       /*
+        * Linux Kernel Parameters (passing device tree):
+        * r5: pointer to command line
+        * r6: pointer to ramdisk
+        * r7: pointer to the fdt, followed by the board info data
+        */
+       theKernel (commandline, rd_data_start, (ulong) of_flat_tree);
        /* does not return */
 
        return 1;
index be40639..8e5d6ef 100644 (file)
@@ -28,3 +28,5 @@ STANDALONE_LOAD_ADDR = 0x02000000 -L $(gcclibdir)
 
 PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__
 PLATFORM_CPPFLAGS += -ffixed-r15 -G0
+
+LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds
index 31cd5b0..d1016ea 100644 (file)
@@ -34,6 +34,7 @@
        .global _start
 
 _start:
+       wrctl   status, r0              /* Disable interrupts */
        /* ICACHE INIT -- only the icache line at the reset address
         * is invalidated at reset. So the init must stay within
         * the cache line size (8 words). If GERMS is used, we'll
@@ -43,10 +44,9 @@ _start:
        ori     r4, r0, %lo(CONFIG_SYS_ICACHELINE_SIZE)
        movhi   r5, %hi(CONFIG_SYS_ICACHE_SIZE)
        ori     r5, r5, %lo(CONFIG_SYS_ICACHE_SIZE)
-       mov     r6, r0
-0:     initi   r6
-       add     r6, r6, r4
-       bltu    r6, r5, 0b
+0:     initi   r5
+       sub     r5, r5, r4
+       bgt     r5, r0, 0b
        br      _except_end     /* Skip the tramp */
 
        /* EXCEPTION TRAMPOLINE -- the following gets copied
@@ -62,7 +62,6 @@ _except_end:
        /* INTERRUPTS -- for now, all interrupts masked and globally
         * disabled.
         */
-       wrctl   status, r0              /* Disable interrupts */
        wrctl   ienable, r0             /* All disabled */
 
        /* DCACHE INIT -- if dcache not implemented, initd behaves as
similarity index 98%
rename from board/altera/ep1c20/u-boot.lds
rename to arch/nios2/cpu/u-boot.lds
index b909e94..fe4a2eb 100644 (file)
@@ -30,7 +30,7 @@ SECTIONS
 {
        .text :
        {
-         arch/nios/cpu2/start.o (.text)
+         arch/nios2/cpu/start.o (.text)
          *(.text)
          *(.text.*)
          *(.gnu.linkonce.t*)
index 495c823..d5c152e 100644 (file)
 #define __ASM_NIOS2_BYTEORDER_H_
 
 #include <asm/types.h>
+
+#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
+#  define __BYTEORDER_HAS_U64__
+#  define __SWAB_64_THRU_32__
+#endif
+
 #include <linux/byteorder/little_endian.h>
 
 #endif /* __ASM_NIOS2_BYTEORDER_H_ */
diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h
new file mode 100644 (file)
index 0000000..1350e3b
--- /dev/null
@@ -0,0 +1,23 @@
+#ifndef __ASM_NIOS2_DMA_MAPPING_H
+#define __ASM_NIOS2_DMA_MAPPING_H
+
+/* dma_alloc_coherent() return cache-line aligned allocation which is mapped
+ * to uncached io region.
+ *
+ * IO_REGION_BASE should be defined in board config header file
+ *   0x80000000 for nommu, 0xe0000000 for mmu
+ */
+
+static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
+{
+       void *addr = malloc(len + CONFIG_SYS_DCACHELINE_SIZE);
+       if (!addr)
+               return 0;
+       flush_dcache((unsigned long)addr, len + CONFIG_SYS_DCACHELINE_SIZE);
+       *handle = ((unsigned long)addr +
+                  (CONFIG_SYS_DCACHELINE_SIZE - 1)) &
+               ~(CONFIG_SYS_DCACHELINE_SIZE - 1) & ~(IO_REGION_BASE);
+       return (void *)(*handle | IO_REGION_BASE);
+}
+
+#endif /* __ASM_NIOS2_DMA_MAPPING_H */
index 8ec66a3..f83e691 100644 (file)
@@ -28,6 +28,7 @@
 #include <stdio_dev.h>
 #include <watchdog.h>
 #include <malloc.h>
+#include <mmc.h>
 #include <net.h>
 #ifdef CONFIG_STATUS_LED
 #include <status_led.h>
@@ -35,6 +36,9 @@
 #if defined(CONFIG_SYS_NIOS_EPCSBASE)
 #include <nios2-epcs.h>
 #endif
+#ifdef CONFIG_CMD_NAND
+#include <nand.h>      /* cannot even include nand.h if it isnt configured */
+#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -100,7 +104,9 @@ void board_init (void)
        bd = gd->bd;
        bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
        bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
+#ifndef CONFIG_SYS_NO_FLASH
        bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
+#endif
 #if    defined(CONFIG_SYS_SRAM_BASE) && defined(CONFIG_SYS_SRAM_SIZE)
        bd->bi_sramstart= CONFIG_SYS_SRAM_BASE;
        bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;
@@ -119,8 +125,20 @@ void board_init (void)
        /* The Malloc area is immediately below the monitor copy in RAM */
        mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN);
 
+#ifndef CONFIG_SYS_NO_FLASH
        WATCHDOG_RESET ();
        bd->bi_flashsize = flash_init();
+#endif
+
+#ifdef CONFIG_CMD_NAND
+       puts("NAND:  ");
+       nand_init();
+#endif
+
+#ifdef CONFIG_GENERIC_MMC
+       puts("MMC:   ");
+       mmc_initialize(bd);
+#endif
 
        WATCHDOG_RESET ();
        env_relocate();
similarity index 100%
rename from arch/ppc/config.mk
rename to arch/powerpc/config.mk
similarity index 99%
rename from arch/ppc/cpu/74xx_7xx/traps.c
rename to arch/powerpc/cpu/74xx_7xx/traps.c
index 1d5dd01..5073b05 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
  *
  * Copyright (C) 1995-1996  Gary Thomas (gdt@linuxppc.org)
  *
similarity index 98%
rename from arch/ppc/cpu/mpc512x/Makefile
rename to arch/powerpc/cpu/mpc512x/Makefile
index 1719c66..9cfdb0f 100644 (file)
@@ -29,6 +29,7 @@ LIB   = $(obj)lib$(CPU).a
 START  = start.o
 COBJS-y        := cpu.o
 COBJS-y        += traps.o
+COBJS-y += common.o
 COBJS-y += cpu_init.o
 COBJS-y += fixed_sdram.o
 COBJS-y += i2c.o
similarity index 87%
rename from arch/ppc/cpu/mpc512x/asm-offsets.h
rename to arch/powerpc/cpu/mpc512x/asm-offsets.h
index 5873fe0..957d4be 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * needed for arch/ppc/cpu/mpc512x/start.S
+ * needed for arch/powerpc/cpu/mpc512x/start.S
  *
  * These should be auto-generated
  */
diff --git a/arch/powerpc/cpu/mpc512x/common.c b/arch/powerpc/cpu/mpc512x/common.c
new file mode 100644 (file)
index 0000000..180d323
--- /dev/null
@@ -0,0 +1,25 @@
+#include <common.h>
+#include <asm/io.h>
+
+#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)
+
+#if defined(CONFIG_SYS_POST_WORD_ADDR)
+# define _POST_ADDR    (CONFIG_SYS_POST_WORD_ADDR)
+#else
+#error echo "No POST word address defined"
+#endif
+
+void post_word_store(ulong a)
+{
+       volatile void *save_addr = (volatile void *)(_POST_ADDR);
+
+       out_be32(save_addr, a);
+}
+
+ulong post_word_load(void)
+{
+       volatile void *save_addr = (volatile void *)(_POST_ADDR);
+
+       return in_be32(save_addr);
+}
+#endif  /* CONFIG_POST || CONFIG_LOGBUFFER */
similarity index 94%
rename from arch/ppc/cpu/mpc512x/config.mk
rename to arch/powerpc/cpu/mpc512x/config.mk
index b6727dc..b29edb1 100644 (file)
@@ -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)/arch/ppc/cpu/mpc512x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc512x/u-boot.lds
similarity index 94%
rename from arch/ppc/cpu/mpc512x/diu.c
rename to arch/powerpc/cpu/mpc512x/diu.c
index 9361161..f8d19a0 100644 (file)
@@ -34,6 +34,8 @@
 #include <video_fb.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #ifdef CONFIG_FSL_DIU_LOGO_BMP
 extern unsigned int FSL_Logo_BMP[];
 #else
@@ -65,10