summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMAKEALL14
-rw-r--r--Makefile606
-rw-r--r--README16
-rw-r--r--api/api_platform-powerpc.c (renamed from api/api_platform-ppc.c)0
-rw-r--r--arch/powerpc/config.mk (renamed from arch/ppc/config.mk)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/Makefile (renamed from arch/ppc/cpu/74xx_7xx/Makefile)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/cache.S (renamed from arch/ppc/cpu/74xx_7xx/cache.S)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/config.mk (renamed from arch/ppc/cpu/74xx_7xx/config.mk)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/cpu.c (renamed from arch/ppc/cpu/74xx_7xx/cpu.c)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/cpu_init.c (renamed from arch/ppc/cpu/74xx_7xx/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/interrupts.c (renamed from arch/ppc/cpu/74xx_7xx/interrupts.c)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/io.S (renamed from arch/ppc/cpu/74xx_7xx/io.S)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/kgdb.S (renamed from arch/ppc/cpu/74xx_7xx/kgdb.S)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/speed.c (renamed from arch/ppc/cpu/74xx_7xx/speed.c)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/start.S (renamed from arch/ppc/cpu/74xx_7xx/start.S)0
-rw-r--r--arch/powerpc/cpu/74xx_7xx/traps.c (renamed from arch/ppc/cpu/74xx_7xx/traps.c)2
-rw-r--r--arch/powerpc/cpu/mpc512x/Makefile (renamed from arch/ppc/cpu/mpc512x/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc512x/asm-offsets.h (renamed from arch/ppc/cpu/mpc512x/asm-offsets.h)2
-rw-r--r--arch/powerpc/cpu/mpc512x/config.mk (renamed from arch/ppc/cpu/mpc512x/config.mk)2
-rw-r--r--arch/powerpc/cpu/mpc512x/cpu.c (renamed from arch/ppc/cpu/mpc512x/cpu.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/cpu_init.c (renamed from arch/ppc/cpu/mpc512x/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/diu.c (renamed from arch/ppc/cpu/mpc512x/diu.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/fixed_sdram.c (renamed from arch/ppc/cpu/mpc512x/fixed_sdram.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/i2c.c (renamed from arch/ppc/cpu/mpc512x/i2c.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/ide.c (renamed from arch/ppc/cpu/mpc512x/ide.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/iim.c (renamed from arch/ppc/cpu/mpc512x/iim.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/interrupts.c (renamed from arch/ppc/cpu/mpc512x/interrupts.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/iopin.c (renamed from arch/ppc/cpu/mpc512x/iopin.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/pci.c (renamed from arch/ppc/cpu/mpc512x/pci.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/serial.c (renamed from arch/ppc/cpu/mpc512x/serial.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/speed.c (renamed from arch/ppc/cpu/mpc512x/speed.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/start.S (renamed from arch/ppc/cpu/mpc512x/start.S)0
-rw-r--r--arch/powerpc/cpu/mpc512x/traps.c (renamed from arch/ppc/cpu/mpc512x/traps.c)0
-rw-r--r--arch/powerpc/cpu/mpc512x/u-boot.lds (renamed from arch/ppc/cpu/mpc512x/u-boot.lds)2
-rw-r--r--arch/powerpc/cpu/mpc5xx/Makefile (renamed from arch/ppc/cpu/mpc5xx/Makefile)4
-rw-r--r--arch/powerpc/cpu/mpc5xx/config.mk (renamed from arch/ppc/cpu/mpc5xx/config.mk)2
-rw-r--r--arch/powerpc/cpu/mpc5xx/cpu.c (renamed from arch/ppc/cpu/mpc5xx/cpu.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xx/cpu_init.c (renamed from arch/ppc/cpu/mpc5xx/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xx/interrupts.c (renamed from arch/ppc/cpu/mpc5xx/interrupts.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xx/serial.c (renamed from arch/ppc/cpu/mpc5xx/serial.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xx/speed.c (renamed from arch/ppc/cpu/mpc5xx/speed.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xx/spi.c (renamed from arch/ppc/cpu/mpc5xx/spi.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xx/start.S (renamed from arch/ppc/cpu/mpc5xx/start.S)0
-rw-r--r--arch/powerpc/cpu/mpc5xx/traps.c (renamed from arch/ppc/cpu/mpc5xx/traps.c)2
-rw-r--r--arch/powerpc/cpu/mpc5xx/u-boot.lds (renamed from arch/ppc/cpu/mpc5xx/u-boot.lds)2
-rw-r--r--arch/powerpc/cpu/mpc5xxx/Makefile (renamed from arch/ppc/cpu/mpc5xxx/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/config.mk (renamed from arch/ppc/cpu/mpc5xxx/config.mk)2
-rw-r--r--arch/powerpc/cpu/mpc5xxx/cpu.c (renamed from arch/ppc/cpu/mpc5xxx/cpu.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/cpu_init.c (renamed from arch/ppc/cpu/mpc5xxx/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S (renamed from arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/i2c.c (renamed from arch/ppc/cpu/mpc5xxx/i2c.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/ide.c (renamed from arch/ppc/cpu/mpc5xxx/ide.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/interrupts.c (renamed from arch/ppc/cpu/mpc5xxx/interrupts.c)2
-rw-r--r--arch/powerpc/cpu/mpc5xxx/io.S (renamed from arch/ppc/cpu/mpc5xxx/io.S)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/loadtask.c (renamed from arch/ppc/cpu/mpc5xxx/loadtask.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/pci_mpc5200.c (renamed from arch/ppc/cpu/mpc5xxx/pci_mpc5200.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/serial.c (renamed from arch/ppc/cpu/mpc5xxx/serial.c)2
-rw-r--r--arch/powerpc/cpu/mpc5xxx/speed.c (renamed from arch/ppc/cpu/mpc5xxx/speed.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/start.S (renamed from arch/ppc/cpu/mpc5xxx/start.S)2
-rw-r--r--arch/powerpc/cpu/mpc5xxx/traps.c (renamed from arch/ppc/cpu/mpc5xxx/traps.c)2
-rw-r--r--arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds (renamed from arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds)8
-rw-r--r--arch/powerpc/cpu/mpc5xxx/u-boot.lds (renamed from arch/ppc/cpu/mpc5xxx/u-boot.lds)2
-rw-r--r--arch/powerpc/cpu/mpc5xxx/usb.c (renamed from arch/ppc/cpu/mpc5xxx/usb.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/usb_ohci.c (renamed from arch/ppc/cpu/mpc5xxx/usb_ohci.c)0
-rw-r--r--arch/powerpc/cpu/mpc5xxx/usb_ohci.h (renamed from arch/ppc/cpu/mpc5xxx/usb_ohci.h)0
-rw-r--r--arch/powerpc/cpu/mpc8220/Makefile (renamed from arch/ppc/cpu/mpc8220/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc8220/config.mk (renamed from arch/ppc/cpu/mpc8220/config.mk)2
-rw-r--r--arch/powerpc/cpu/mpc8220/cpu.c (renamed from arch/ppc/cpu/mpc8220/cpu.c)0
-rw-r--r--arch/powerpc/cpu/mpc8220/cpu_init.c (renamed from arch/ppc/cpu/mpc8220/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc8220/dma.h (renamed from arch/ppc/cpu/mpc8220/dma.h)0
-rw-r--r--arch/powerpc/cpu/mpc8220/dramSetup.c (renamed from arch/ppc/cpu/mpc8220/dramSetup.c)0
-rw-r--r--arch/powerpc/cpu/mpc8220/dramSetup.h (renamed from arch/ppc/cpu/mpc8220/dramSetup.h)0
-rw-r--r--arch/powerpc/cpu/mpc8220/fec.c (renamed from arch/ppc/cpu/mpc8220/fec.c)0
-rw-r--r--arch/powerpc/cpu/mpc8220/fec.h (renamed from arch/ppc/cpu/mpc8220/fec.h)0
-rw-r--r--arch/powerpc/cpu/mpc8220/fec_dma_tasks.S (renamed from arch/ppc/cpu/mpc8220/fec_dma_tasks.S)0
-rw-r--r--arch/powerpc/cpu/mpc8220/i2c.c (renamed from arch/ppc/cpu/mpc8220/i2c.c)0
-rw-r--r--arch/powerpc/cpu/mpc8220/i2cCore.c (renamed from arch/ppc/cpu/mpc8220/i2cCore.c)0
-rw-r--r--arch/powerpc/cpu/mpc8220/i2cCore.h (renamed from arch/ppc/cpu/mpc8220/i2cCore.h)0
-rw-r--r--arch/powerpc/cpu/mpc8220/interrupts.c (renamed from arch/ppc/cpu/mpc8220/interrupts.c)0
-rw-r--r--arch/powerpc/cpu/mpc8220/io.S (renamed from arch/ppc/cpu/mpc8220/io.S)0
-rw-r--r--arch/powerpc/cpu/mpc8220/loadtask.c (renamed from arch/ppc/cpu/mpc8220/loadtask.c)0
-rw-r--r--arch/powerpc/cpu/mpc8220/pci.c (renamed from arch/ppc/cpu/mpc8220/pci.c)0
-rw-r--r--arch/powerpc/cpu/mpc8220/speed.c (renamed from arch/ppc/cpu/mpc8220/speed.c)0
-rw-r--r--arch/powerpc/cpu/mpc8220/start.S (renamed from arch/ppc/cpu/mpc8220/start.S)2
-rw-r--r--arch/powerpc/cpu/mpc8220/traps.c (renamed from arch/ppc/cpu/mpc8220/traps.c)2
-rw-r--r--arch/powerpc/cpu/mpc8220/u-boot.lds (renamed from arch/ppc/cpu/mpc8220/u-boot.lds)2
-rw-r--r--arch/powerpc/cpu/mpc8220/uart.c (renamed from arch/ppc/cpu/mpc8220/uart.c)0
-rw-r--r--arch/powerpc/cpu/mpc824x/.gitignore (renamed from arch/ppc/cpu/mpc824x/.gitignore)0
-rw-r--r--arch/powerpc/cpu/mpc824x/Makefile (renamed from arch/ppc/cpu/mpc824x/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc824x/config.mk (renamed from arch/ppc/cpu/mpc824x/config.mk)2
-rw-r--r--arch/powerpc/cpu/mpc824x/cpu.c (renamed from arch/ppc/cpu/mpc824x/cpu.c)0
-rw-r--r--arch/powerpc/cpu/mpc824x/cpu_init.c (renamed from arch/ppc/cpu/mpc824x/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc824x/drivers/epic.h (renamed from arch/ppc/cpu/mpc824x/drivers/epic.h)0
-rw-r--r--arch/powerpc/cpu/mpc824x/drivers/epic/README (renamed from arch/ppc/cpu/mpc824x/drivers/epic/README)0
-rw-r--r--arch/powerpc/cpu/mpc824x/drivers/epic/epic.h (renamed from arch/ppc/cpu/mpc824x/drivers/epic/epic.h)0
-rw-r--r--arch/powerpc/cpu/mpc824x/drivers/epic/epic1.c (renamed from arch/ppc/cpu/mpc824x/drivers/epic/epic1.c)0
-rw-r--r--arch/powerpc/cpu/mpc824x/drivers/epic/epic2.S (renamed from arch/ppc/cpu/mpc824x/drivers/epic/epic2.S)0
-rw-r--r--arch/powerpc/cpu/mpc824x/drivers/epic/epicutil.S (renamed from arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S)0
-rw-r--r--arch/powerpc/cpu/mpc824x/drivers/errors.h (renamed from arch/ppc/cpu/mpc824x/drivers/errors.h)0
-rw-r--r--arch/powerpc/cpu/mpc824x/drivers/i2c/i2c.c (renamed from arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c)0
-rw-r--r--arch/powerpc/cpu/mpc824x/drivers/i2c_export.h (renamed from arch/ppc/cpu/mpc824x/drivers/i2c_export.h)0
-rw-r--r--arch/powerpc/cpu/mpc824x/interrupts.c (renamed from arch/ppc/cpu/mpc824x/interrupts.c)0
-rw-r--r--arch/powerpc/cpu/mpc824x/pci.c (renamed from arch/ppc/cpu/mpc824x/pci.c)2
-rw-r--r--arch/powerpc/cpu/mpc824x/speed.c (renamed from arch/ppc/cpu/mpc824x/speed.c)0
-rw-r--r--arch/powerpc/cpu/mpc824x/start.S (renamed from arch/ppc/cpu/mpc824x/start.S)0
-rw-r--r--arch/powerpc/cpu/mpc824x/traps.c (renamed from arch/ppc/cpu/mpc824x/traps.c)2
-rw-r--r--arch/powerpc/cpu/mpc824x/u-boot.lds (renamed from arch/ppc/cpu/mpc8260/u-boot.lds)2
-rw-r--r--arch/powerpc/cpu/mpc8260/Makefile (renamed from arch/ppc/cpu/mpc8260/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc8260/bedbug_603e.c (renamed from arch/ppc/cpu/mpc8260/bedbug_603e.c)0
-rw-r--r--arch/powerpc/cpu/mpc8260/commproc.c (renamed from arch/ppc/cpu/mpc8260/commproc.c)2
-rw-r--r--arch/powerpc/cpu/mpc8260/config.mk (renamed from arch/ppc/cpu/mpc8260/config.mk)2
-rw-r--r--arch/powerpc/cpu/mpc8260/cpu.c (renamed from arch/ppc/cpu/mpc8260/cpu.c)0
-rw-r--r--arch/powerpc/cpu/mpc8260/cpu_init.c (renamed from arch/ppc/cpu/mpc8260/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc8260/ether_fcc.c (renamed from arch/ppc/cpu/mpc8260/ether_fcc.c)0
-rw-r--r--arch/powerpc/cpu/mpc8260/ether_scc.c (renamed from arch/ppc/cpu/mpc8260/ether_scc.c)0
-rw-r--r--arch/powerpc/cpu/mpc8260/i2c.c (renamed from arch/ppc/cpu/mpc8260/i2c.c)0
-rw-r--r--arch/powerpc/cpu/mpc8260/interrupts.c (renamed from arch/ppc/cpu/mpc8260/interrupts.c)4
-rw-r--r--arch/powerpc/cpu/mpc8260/kgdb.S (renamed from arch/ppc/cpu/mpc8260/kgdb.S)0
-rw-r--r--arch/powerpc/cpu/mpc8260/pci.c (renamed from arch/ppc/cpu/mpc8260/pci.c)0
-rw-r--r--arch/powerpc/cpu/mpc8260/serial_scc.c (renamed from arch/ppc/cpu/mpc8260/serial_scc.c)0
-rw-r--r--arch/powerpc/cpu/mpc8260/serial_smc.c (renamed from arch/ppc/cpu/mpc8260/serial_smc.c)2
-rw-r--r--arch/powerpc/cpu/mpc8260/speed.c (renamed from arch/ppc/cpu/mpc8260/speed.c)0
-rw-r--r--arch/powerpc/cpu/mpc8260/speed.h (renamed from arch/ppc/cpu/mpc8260/speed.h)0
-rw-r--r--arch/powerpc/cpu/mpc8260/spi.c (renamed from arch/ppc/cpu/mpc8260/spi.c)0
-rw-r--r--arch/powerpc/cpu/mpc8260/start.S (renamed from arch/ppc/cpu/mpc8260/start.S)2
-rw-r--r--arch/powerpc/cpu/mpc8260/traps.c (renamed from arch/ppc/cpu/mpc8260/traps.c)2
-rw-r--r--arch/powerpc/cpu/mpc8260/u-boot.lds (renamed from arch/ppc/cpu/mpc824x/u-boot.lds)2
-rw-r--r--arch/powerpc/cpu/mpc83xx/Makefile (renamed from arch/ppc/cpu/mpc83xx/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/config.mk (renamed from arch/ppc/cpu/mpc83xx/config.mk)2
-rw-r--r--arch/powerpc/cpu/mpc83xx/cpu.c (renamed from arch/ppc/cpu/mpc83xx/cpu.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/cpu_init.c (renamed from arch/ppc/cpu/mpc83xx/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/ecc.c (renamed from arch/ppc/cpu/mpc83xx/ecc.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/fdt.c (renamed from arch/ppc/cpu/mpc83xx/fdt.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/interrupts.c (renamed from arch/ppc/cpu/mpc83xx/interrupts.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/nand_init.c (renamed from arch/ppc/cpu/mpc83xx/nand_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/pci.c (renamed from arch/ppc/cpu/mpc83xx/pci.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/pcie.c (renamed from arch/ppc/cpu/mpc83xx/pcie.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/qe_io.c (renamed from arch/ppc/cpu/mpc83xx/qe_io.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/serdes.c (renamed from arch/ppc/cpu/mpc83xx/serdes.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/spd_sdram.c (renamed from arch/ppc/cpu/mpc83xx/spd_sdram.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/speed.c (renamed from arch/ppc/cpu/mpc83xx/speed.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/start.S (renamed from arch/ppc/cpu/mpc83xx/start.S)2
-rw-r--r--arch/powerpc/cpu/mpc83xx/traps.c (renamed from arch/ppc/cpu/mpc83xx/traps.c)0
-rw-r--r--arch/powerpc/cpu/mpc83xx/u-boot.lds (renamed from arch/ppc/cpu/mpc83xx/u-boot.lds)2
-rw-r--r--arch/powerpc/cpu/mpc85xx/Makefile (renamed from arch/ppc/cpu/mpc85xx/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/commproc.c (renamed from arch/ppc/cpu/mpc85xx/commproc.c)2
-rw-r--r--arch/powerpc/cpu/mpc85xx/config.mk (renamed from arch/ppc/cpu/mpc85xx/config.mk)2
-rw-r--r--arch/powerpc/cpu/mpc85xx/cpu.c (renamed from arch/ppc/cpu/mpc85xx/cpu.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/cpu_init.c (renamed from arch/ppc/cpu/mpc85xx/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/cpu_init_early.c (renamed from arch/ppc/cpu/mpc85xx/cpu_init_early.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/cpu_init_nand.c (renamed from arch/ppc/cpu/mpc85xx/cpu_init_nand.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/ddr-gen1.c (renamed from arch/ppc/cpu/mpc85xx/ddr-gen1.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/ddr-gen2.c (renamed from arch/ppc/cpu/mpc85xx/ddr-gen2.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/ddr-gen3.c (renamed from arch/ppc/cpu/mpc85xx/ddr-gen3.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/ether_fcc.c (renamed from arch/ppc/cpu/mpc85xx/ether_fcc.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/fdt.c (renamed from arch/ppc/cpu/mpc85xx/fdt.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/fixed_ivor.S (renamed from arch/ppc/cpu/mpc85xx/fixed_ivor.S)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/interrupts.c (renamed from arch/ppc/cpu/mpc85xx/interrupts.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/mp.c (renamed from arch/ppc/cpu/mpc85xx/mp.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/mp.h (renamed from arch/ppc/cpu/mpc85xx/mp.h)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c (renamed from arch/ppc/cpu/mpc85xx/mpc8536_serdes.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/pci.c (renamed from arch/ppc/cpu/mpc85xx/pci.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/qe_io.c (renamed from arch/ppc/cpu/mpc85xx/qe_io.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/release.S (renamed from arch/ppc/cpu/mpc85xx/release.S)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/resetvec.S (renamed from arch/ppc/cpu/mpc85xx/resetvec.S)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/serial_scc.c (renamed from arch/ppc/cpu/mpc85xx/serial_scc.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/speed.c (renamed from arch/ppc/cpu/mpc85xx/speed.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/start.S (renamed from arch/ppc/cpu/mpc85xx/start.S)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/tlb.c (renamed from arch/ppc/cpu/mpc85xx/tlb.c)0
-rw-r--r--arch/powerpc/cpu/mpc85xx/traps.c (renamed from arch/ppc/cpu/mpc85xx/traps.c)2
-rw-r--r--arch/powerpc/cpu/mpc85xx/u-boot-nand.lds (renamed from arch/ppc/cpu/mpc85xx/u-boot-nand.lds)2
-rw-r--r--arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds (renamed from arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds)2
-rw-r--r--arch/powerpc/cpu/mpc85xx/u-boot.lds (renamed from arch/ppc/cpu/mpc85xx/u-boot.lds)2
-rw-r--r--arch/powerpc/cpu/mpc86xx/Makefile (renamed from arch/ppc/cpu/mpc86xx/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/cache.S (renamed from arch/ppc/cpu/mpc86xx/cache.S)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/config.mk (renamed from arch/ppc/cpu/mpc86xx/config.mk)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/cpu.c (renamed from arch/ppc/cpu/mpc86xx/cpu.c)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/cpu_init.c (renamed from arch/ppc/cpu/mpc86xx/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/ddr-8641.c (renamed from arch/ppc/cpu/mpc86xx/ddr-8641.c)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/fdt.c (renamed from arch/ppc/cpu/mpc86xx/fdt.c)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/interrupts.c (renamed from arch/ppc/cpu/mpc86xx/interrupts.c)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/mp.c (renamed from arch/ppc/cpu/mpc86xx/mp.c)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/release.S (renamed from arch/ppc/cpu/mpc86xx/release.S)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/speed.c (renamed from arch/ppc/cpu/mpc86xx/speed.c)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/start.S (renamed from arch/ppc/cpu/mpc86xx/start.S)0
-rw-r--r--arch/powerpc/cpu/mpc86xx/traps.c (renamed from arch/ppc/cpu/mpc86xx/traps.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/Makefile (renamed from arch/ppc/cpu/mpc8xx/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/bedbug_860.c (renamed from arch/ppc/cpu/mpc8xx/bedbug_860.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/commproc.c (renamed from arch/ppc/cpu/mpc8xx/commproc.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/config.mk (renamed from arch/ppc/cpu/mpc8xx/config.mk)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/cpu.c (renamed from arch/ppc/cpu/mpc8xx/cpu.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/cpu_init.c (renamed from arch/ppc/cpu/mpc8xx/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/fdt.c (renamed from arch/ppc/cpu/mpc8xx/fdt.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/fec.c (renamed from arch/ppc/cpu/mpc8xx/fec.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/fec.h (renamed from arch/ppc/cpu/mpc8xx/fec.h)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/i2c.c (renamed from arch/ppc/cpu/mpc8xx/i2c.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/interrupts.c (renamed from arch/ppc/cpu/mpc8xx/interrupts.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/kgdb.S (renamed from arch/ppc/cpu/mpc8xx/kgdb.S)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/lcd.c (renamed from arch/ppc/cpu/mpc8xx/lcd.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/plprcr_write.S (renamed from arch/ppc/cpu/mpc8xx/plprcr_write.S)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/scc.c (renamed from arch/ppc/cpu/mpc8xx/scc.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/serial.c (renamed from arch/ppc/cpu/mpc8xx/serial.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/speed.c (renamed from arch/ppc/cpu/mpc8xx/speed.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/spi.c (renamed from arch/ppc/cpu/mpc8xx/spi.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/start.S (renamed from arch/ppc/cpu/mpc8xx/start.S)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/traps.c (renamed from arch/ppc/cpu/mpc8xx/traps.c)2
-rw-r--r--arch/powerpc/cpu/mpc8xx/upatch.c (renamed from arch/ppc/cpu/mpc8xx/upatch.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/video.c (renamed from arch/ppc/cpu/mpc8xx/video.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xx/wlkbd.c (renamed from arch/ppc/cpu/mpc8xx/wlkbd.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/Makefile (renamed from arch/ppc/cpu/mpc8xxx/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/cpu.c (renamed from arch/ppc/cpu/mpc8xxx/cpu.c)4
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/Makefile (renamed from arch/ppc/cpu/mpc8xxx/ddr/Makefile)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/common_timing_params.h (renamed from arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c (renamed from arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/ddr.h (renamed from arch/ppc/cpu/mpc8xxx/ddr/ddr.h)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c (renamed from arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c (renamed from arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c (renamed from arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c (renamed from arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/main.c (renamed from arch/ppc/cpu/mpc8xxx/ddr/main.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/options.c (renamed from arch/ppc/cpu/mpc8xxx/ddr/options.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/ddr/util.c (renamed from arch/ppc/cpu/mpc8xxx/ddr/util.c)0
-rw-r--r--arch/powerpc/cpu/mpc8xxx/fdt.c (renamed from arch/ppc/cpu/mpc8xxx/fdt.c)4
-rw-r--r--arch/powerpc/cpu/mpc8xxx/pci_cfg.c (renamed from arch/ppc/cpu/mpc8xxx/pci_cfg.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c (renamed from arch/ppc/cpu/ppc4xx/40x_spd_sdram.c)2
-rw-r--r--arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c (renamed from arch/ppc/cpu/ppc4xx/44x_spd_ddr.c)2
-rw-r--r--arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c (renamed from arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c)2
-rw-r--r--arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c (renamed from arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c)2
-rw-r--r--arch/powerpc/cpu/ppc4xx/4xx_pci.c (renamed from arch/ppc/cpu/ppc4xx/4xx_pci.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/4xx_pcie.c (renamed from arch/ppc/cpu/ppc4xx/4xx_pcie.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/4xx_uart.c (renamed from arch/ppc/cpu/ppc4xx/4xx_uart.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/Makefile (renamed from arch/ppc/cpu/ppc4xx/Makefile)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/bedbug_405.c (renamed from arch/ppc/cpu/ppc4xx/bedbug_405.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/cache.S (renamed from arch/ppc/cpu/ppc4xx/cache.S)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/cmd_chip_config.c (renamed from arch/ppc/cpu/ppc4xx/cmd_chip_config.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/commproc.c (renamed from arch/ppc/cpu/ppc4xx/commproc.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/config.mk (renamed from arch/ppc/cpu/ppc4xx/config.mk)2
-rw-r--r--arch/powerpc/cpu/ppc4xx/cpu.c (renamed from arch/ppc/cpu/ppc4xx/cpu.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/cpu_init.c (renamed from arch/ppc/cpu/ppc4xx/cpu_init.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/dcr.S (renamed from arch/ppc/cpu/ppc4xx/dcr.S)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/denali_data_eye.c (renamed from arch/ppc/cpu/ppc4xx/denali_data_eye.c)2
-rw-r--r--arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c (renamed from arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c)4
-rw-r--r--arch/powerpc/cpu/ppc4xx/ecc.c (renamed from arch/ppc/cpu/ppc4xx/ecc.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/ecc.h (renamed from arch/ppc/cpu/ppc4xx/ecc.h)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/fdt.c (renamed from arch/ppc/cpu/ppc4xx/fdt.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/gpio.c (renamed from arch/ppc/cpu/ppc4xx/gpio.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/interrupts.c (renamed from arch/ppc/cpu/ppc4xx/interrupts.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/iop480_uart.c (renamed from arch/ppc/cpu/ppc4xx/iop480_uart.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/kgdb.S (renamed from arch/ppc/cpu/ppc4xx/kgdb.S)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/miiphy.c (renamed from arch/ppc/cpu/ppc4xx/miiphy.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/reginfo.c (renamed from arch/ppc/cpu/ppc4xx/reginfo.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/resetvec.S (renamed from arch/ppc/cpu/ppc4xx/resetvec.S)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/sdram.c (renamed from arch/ppc/cpu/ppc4xx/sdram.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/sdram.h (renamed from arch/ppc/cpu/ppc4xx/sdram.h)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/speed.c (renamed from arch/ppc/cpu/ppc4xx/speed.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/start.S (renamed from arch/ppc/cpu/ppc4xx/start.S)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/tlb.c (renamed from arch/ppc/cpu/ppc4xx/tlb.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/traps.c (renamed from arch/ppc/cpu/ppc4xx/traps.c)2
-rw-r--r--arch/powerpc/cpu/ppc4xx/u-boot.lds (renamed from arch/ppc/cpu/ppc4xx/u-boot.lds)2
-rw-r--r--arch/powerpc/cpu/ppc4xx/uic.c (renamed from arch/ppc/cpu/ppc4xx/uic.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/usb.c (renamed from arch/ppc/cpu/ppc4xx/usb.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/usb_ohci.c (renamed from arch/ppc/cpu/ppc4xx/usb_ohci.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/usb_ohci.h (renamed from arch/ppc/cpu/ppc4xx/usb_ohci.h)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/usbdev.c (renamed from arch/ppc/cpu/ppc4xx/usbdev.c)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/usbdev.h (renamed from arch/ppc/cpu/ppc4xx/usbdev.h)0
-rw-r--r--arch/powerpc/cpu/ppc4xx/xilinx_irq.c (renamed from arch/ppc/cpu/ppc4xx/xilinx_irq.c)0
-rw-r--r--arch/powerpc/include/asm/4xx_pci.h (renamed from arch/ppc/include/asm/4xx_pci.h)0
-rw-r--r--arch/powerpc/include/asm/4xx_pcie.h (renamed from arch/ppc/include/asm/4xx_pcie.h)0
-rw-r--r--arch/powerpc/include/asm/5xx_immap.h (renamed from arch/ppc/include/asm/5xx_immap.h)0
-rw-r--r--arch/powerpc/include/asm/8xx_immap.h (renamed from arch/ppc/include/asm/8xx_immap.h)0
-rw-r--r--arch/powerpc/include/asm/atomic.h (renamed from arch/ppc/include/asm/atomic.h)0
-rw-r--r--arch/powerpc/include/asm/bitops.h (renamed from arch/ppc/include/asm/bitops.h)0
-rw-r--r--arch/powerpc/include/asm/byteorder.h (renamed from arch/ppc/include/asm/byteorder.h)0
-rw-r--r--arch/powerpc/include/asm/cache.h (renamed from arch/ppc/include/asm/cache.h)0
-rw-r--r--arch/powerpc/include/asm/config.h (renamed from arch/ppc/include/asm/config.h)0
-rw-r--r--arch/powerpc/include/asm/cpm_8260.h (renamed from arch/ppc/include/asm/cpm_8260.h)0
-rw-r--r--arch/powerpc/include/asm/cpm_85xx.h (renamed from arch/ppc/include/asm/cpm_85xx.h)0
-rw-r--r--arch/powerpc/include/asm/e300.h (renamed from arch/ppc/include/asm/e300.h)0
-rw-r--r--arch/powerpc/include/asm/errno.h (renamed from arch/ppc/include/asm/errno.h)0
-rw-r--r--arch/powerpc/include/asm/fsl_ddr_dimm_params.h (renamed from arch/ppc/include/asm/fsl_ddr_dimm_params.h)0
-rw-r--r--arch/powerpc/include/asm/fsl_ddr_sdram.h (renamed from arch/ppc/include/asm/fsl_ddr_sdram.h)0
-rw-r--r--arch/powerpc/include/asm/fsl_dma.h (renamed from arch/ppc/include/asm/fsl_dma.h)0
-rw-r--r--arch/powerpc/include/asm/fsl_i2c.h (renamed from arch/ppc/include/asm/fsl_i2c.h)0
-rw-r--r--arch/powerpc/include/asm/fsl_law.h (renamed from arch/ppc/include/asm/fsl_law.h)0
-rw-r--r--arch/powerpc/include/asm/fsl_lbc.h (renamed from arch/ppc/include/asm/fsl_lbc.h)0
-rw-r--r--arch/powerpc/include/asm/fsl_pci.h (renamed from arch/ppc/include/asm/fsl_pci.h)0
-rw-r--r--arch/powerpc/include/asm/fsl_serdes.h (renamed from arch/ppc/include/asm/fsl_serdes.h)0
-rw-r--r--arch/powerpc/include/asm/global_data.h (renamed from arch/ppc/include/asm/global_data.h)0
-rw-r--r--arch/powerpc/include/asm/gpio.h (renamed from arch/ppc/include/asm/gpio.h)0
-rw-r--r--arch/powerpc/include/asm/immap_512x.h (renamed from arch/ppc/include/asm/immap_512x.h)0
-rw-r--r--arch/powerpc/include/asm/immap_8220.h (renamed from arch/ppc/include/asm/immap_8220.h)0
-rw-r--r--arch/powerpc/include/asm/immap_8260.h (renamed from arch/ppc/include/asm/immap_8260.h)0
-rw-r--r--arch/powerpc/include/asm/immap_83xx.h (renamed from arch/ppc/include/asm/immap_83xx.h)0
-rw-r--r--arch/powerpc/include/asm/immap_85xx.h (renamed from arch/ppc/include/asm/immap_85xx.h)0
-rw-r--r--arch/powerpc/include/asm/immap_86xx.h (renamed from arch/ppc/include/asm/immap_86xx.h)0
-rw-r--r--arch/powerpc/include/asm/immap_qe.h (renamed from arch/ppc/include/asm/immap_qe.h)0
-rw-r--r--arch/powerpc/include/asm/interrupt.h (renamed from arch/ppc/include/asm/interrupt.h)0
-rw-r--r--arch/powerpc/include/asm/io.h (renamed from arch/ppc/include/asm/io.h)0
-rw-r--r--arch/powerpc/include/asm/iopin_8260.h (renamed from arch/ppc/include/asm/iopin_8260.h)0
-rw-r--r--arch/powerpc/include/asm/iopin_85xx.h (renamed from arch/ppc/include/asm/iopin_85xx.h)0
-rw-r--r--arch/powerpc/include/asm/iopin_8xx.h (renamed from arch/ppc/include/asm/iopin_8xx.h)0
-rw-r--r--arch/powerpc/include/asm/m8260_pci.h (renamed from arch/ppc/include/asm/m8260_pci.h)0
-rw-r--r--arch/powerpc/include/asm/mc146818rtc.h (renamed from arch/ppc/include/asm/mc146818rtc.h)0
-rw-r--r--arch/powerpc/include/asm/mmu.h (renamed from arch/ppc/include/asm/mmu.h)0
-rw-r--r--arch/powerpc/include/asm/mp.h (renamed from arch/ppc/include/asm/mp.h)0
-rw-r--r--arch/powerpc/include/asm/mpc512x.h (renamed from arch/ppc/include/asm/mpc512x.h)0
-rw-r--r--arch/powerpc/include/asm/mpc8349_pci.h (renamed from arch/ppc/include/asm/mpc8349_pci.h)0
-rw-r--r--arch/powerpc/include/asm/mpc8xxx_spi.h (renamed from arch/ppc/include/asm/mpc8xxx_spi.h)0
-rw-r--r--arch/powerpc/include/asm/pci_io.h (renamed from arch/ppc/include/asm/pci_io.h)0
-rw-r--r--arch/powerpc/include/asm/pnp.h (renamed from arch/ppc/include/asm/pnp.h)0
-rw-r--r--arch/powerpc/include/asm/posix_types.h (renamed from arch/ppc/include/asm/posix_types.h)0
-rw-r--r--arch/powerpc/include/asm/ppc4xx-ebc.h (renamed from arch/ppc/include/asm/ppc4xx-ebc.h)0
-rw-r--r--arch/powerpc/include/asm/ppc4xx-isram.h (renamed from arch/ppc/include/asm/ppc4xx-isram.h)0
-rw-r--r--arch/powerpc/include/asm/ppc4xx-sdram.h (renamed from arch/ppc/include/asm/ppc4xx-sdram.h)0
-rw-r--r--arch/powerpc/include/asm/ppc4xx-uic.h (renamed from arch/ppc/include/asm/ppc4xx-uic.h)0
-rw-r--r--arch/powerpc/include/asm/ppc4xx_config.h (renamed from arch/ppc/include/asm/ppc4xx_config.h)0
-rw-r--r--arch/powerpc/include/asm/processor.h (renamed from arch/ppc/include/asm/processor.h)0
-rw-r--r--arch/powerpc/include/asm/ptrace.h (renamed from arch/ppc/include/asm/ptrace.h)2
-rw-r--r--arch/powerpc/include/asm/residual.h (renamed from arch/ppc/include/asm/residual.h)0
-rw-r--r--arch/powerpc/include/asm/sigcontext.h (renamed from arch/ppc/include/asm/sigcontext.h)0
-rw-r--r--arch/powerpc/include/asm/signal.h (renamed from arch/ppc/include/asm/signal.h)0
-rw-r--r--arch/powerpc/include/asm/status_led.h (renamed from arch/ppc/include/asm/status_led.h)0
-rw-r--r--arch/powerpc/include/asm/string.h (renamed from arch/ppc/include/asm/string.h)0
-rw-r--r--arch/powerpc/include/asm/types.h (renamed from arch/ppc/include/asm/types.h)0
-rw-r--r--arch/powerpc/include/asm/u-boot.h (renamed from arch/ppc/include/asm/u-boot.h)0
-rw-r--r--arch/powerpc/include/asm/unaligned.h (renamed from arch/ppc/include/asm/unaligned.h)0
-rw-r--r--arch/powerpc/include/asm/xilinx_irq.h (renamed from arch/ppc/include/asm/xilinx_irq.h)0
-rw-r--r--arch/powerpc/lib/Makefile (renamed from arch/ppc/lib/Makefile)0
-rw-r--r--arch/powerpc/lib/bat_rw.c (renamed from arch/ppc/lib/bat_rw.c)0
-rw-r--r--arch/powerpc/lib/board.c (renamed from arch/ppc/lib/board.c)0
-rw-r--r--arch/powerpc/lib/bootm.c (renamed from arch/ppc/lib/bootm.c)0
-rw-r--r--arch/powerpc/lib/cache.c (renamed from arch/ppc/lib/cache.c)0
-rw-r--r--arch/powerpc/lib/extable.c (renamed from arch/ppc/lib/extable.c)0
-rw-r--r--arch/powerpc/lib/interrupts.c (renamed from arch/ppc/lib/interrupts.c)0
-rw-r--r--arch/powerpc/lib/kgdb.c (renamed from arch/ppc/lib/kgdb.c)0
-rw-r--r--arch/powerpc/lib/ppccache.S (renamed from arch/ppc/lib/ppccache.S)0
-rw-r--r--arch/powerpc/lib/ppcstring.S (renamed from arch/ppc/lib/ppcstring.S)0
-rw-r--r--arch/powerpc/lib/reloc.S (renamed from arch/ppc/lib/reloc.S)0
-rw-r--r--arch/powerpc/lib/ticks.S (renamed from arch/ppc/lib/ticks.S)0
-rw-r--r--arch/powerpc/lib/time.c (renamed from arch/ppc/lib/time.c)0
-rw-r--r--board/LEOX/elpt860/u-boot.lds12
-rw-r--r--board/LEOX/elpt860/u-boot.lds.debug2
-rw-r--r--board/MAI/AmigaOneG3SE/u-boot.lds2
-rw-r--r--board/Marvell/common/ns16550.c2
-rw-r--r--board/Marvell/common/ns16550.h2
-rw-r--r--board/Marvell/db64360/mv_eth.c2
-rw-r--r--board/Marvell/db64360/u-boot.lds2
-rw-r--r--board/Marvell/db64460/mv_eth.c2
-rw-r--r--board/Marvell/db64460/u-boot.lds2
-rw-r--r--board/RPXClassic/u-boot.lds4
-rw-r--r--board/RPXClassic/u-boot.lds.debug2
-rw-r--r--board/RPXlite/u-boot.lds4
-rw-r--r--board/RPXlite/u-boot.lds.debug2
-rw-r--r--board/RPXlite_dw/u-boot.lds4
-rw-r--r--board/RPXlite_dw/u-boot.lds.debug2
-rw-r--r--board/RRvision/u-boot.lds10
-rw-r--r--board/adder/u-boot.lds2
-rw-r--r--board/amcc/acadia/u-boot-nand.lds2
-rw-r--r--board/amcc/bamboo/u-boot-nand.lds2
-rw-r--r--board/amcc/canyonlands/canyonlands.c2
-rw-r--r--board/amcc/canyonlands/u-boot-nand.lds2
-rw-r--r--board/amcc/katmai/katmai.c2
-rw-r--r--board/amcc/kilauea/u-boot-nand.lds2
-rw-r--r--board/amcc/luan/luan.c2
-rw-r--r--board/amcc/sequoia/sdram.c2
-rw-r--r--board/amcc/sequoia/u-boot-nand.lds2
-rw-r--r--board/amcc/sequoia/u-boot-ram.lds2
-rw-r--r--board/amcc/yucca/yucca.c2
-rw-r--r--board/amirix/ap1000/u-boot.lds16
-rw-r--r--board/bmw/ns16550.c2
-rw-r--r--board/bmw/ns16550.h2
-rw-r--r--board/c2mon/u-boot.lds4
-rw-r--r--board/c2mon/u-boot.lds.debug2
-rw-r--r--board/cm5200/u-boot.lds2
-rw-r--r--board/cogent/u-boot.lds.debug2
-rw-r--r--board/cray/L1/u-boot.lds.debug2
-rw-r--r--board/csb272/csb272.c2
-rw-r--r--board/csb472/csb472.c2
-rw-r--r--board/eltec/bab7xx/u-boot.lds2
-rw-r--r--board/eltec/elppc/u-boot.lds2
-rw-r--r--board/eltec/mhpc/u-boot.lds2
-rw-r--r--board/eltec/mhpc/u-boot.lds.debug2
-rw-r--r--board/emk/top860/u-boot.lds2
-rw-r--r--board/emk/top860/u-boot.lds.debug4
-rw-r--r--board/ep88x/u-boot.lds2
-rw-r--r--board/eric/eric.c2
-rw-r--r--board/esd/cpci750/mv_eth.c2
-rw-r--r--board/esd/cpci750/u-boot.lds2
-rw-r--r--board/esd/dasa_sim/u-boot.lds2
-rw-r--r--board/esd/pmc440/u-boot-nand.lds2
-rw-r--r--board/esteem192e/u-boot.lds4
-rw-r--r--board/etx094/u-boot.lds12
-rw-r--r--board/etx094/u-boot.lds.debug18
-rw-r--r--board/evb64260/u-boot.lds2
-rw-r--r--board/fads/u-boot.lds2
-rw-r--r--board/fads/u-boot.lds.debug4
-rw-r--r--board/flagadm/u-boot.lds2
-rw-r--r--board/flagadm/u-boot.lds.debug2
-rw-r--r--board/freescale/mpc7448hpc2/tsi108_init.c2
-rw-r--r--board/freescale/mpc7448hpc2/u-boot.lds2
-rw-r--r--board/freescale/mpc8610hpcd/u-boot.lds14
-rw-r--r--board/freescale/mpc8641hpcn/u-boot.lds14
-rw-r--r--board/gen860t/ioport.c2
-rw-r--r--board/gen860t/u-boot-flashenv.lds2
-rw-r--r--board/gen860t/u-boot.lds2
-rw-r--r--board/genietv/u-boot.lds4
-rw-r--r--board/genietv/u-boot.lds.debug4
-rw-r--r--board/gth/u-boot.lds2
-rw-r--r--board/hermes/u-boot.lds10
-rw-r--r--board/hermes/u-boot.lds.debug10
-rw-r--r--board/hmi1001/config.mk2
-rw-r--r--board/hymod/u-boot.lds4
-rw-r--r--board/hymod/u-boot.lds.debug2
-rw-r--r--board/icu862/u-boot.lds6
-rw-r--r--board/icu862/u-boot.lds.debug4
-rw-r--r--board/inka4x0/config.mk2
-rw-r--r--board/ip860/u-boot.lds10
-rw-r--r--board/ip860/u-boot.lds.debug10
-rw-r--r--board/ivm/u-boot.lds2
-rw-r--r--board/ivm/u-boot.lds.debug4
-rw-r--r--board/jse/jse.c6
-rw-r--r--board/jse/sdram.c2
-rw-r--r--board/keymile/common/keymile_hdlc_enet.c2
-rw-r--r--board/keymile/km8xx/km8xx_hdlc_enet.c2
-rw-r--r--board/keymile/km8xx/u-boot.lds10
-rw-r--r--board/keymile/mgcoge/mgcoge_hdlc_enet.c2
-rw-r--r--board/korat/u-boot-F7FC.lds4
-rw-r--r--board/kup/kup4k/u-boot.lds6
-rw-r--r--board/kup/kup4k/u-boot.lds.debug2
-rw-r--r--board/kup/kup4x/u-boot.lds6
-rw-r--r--board/kup/kup4x/u-boot.lds.debug2
-rw-r--r--board/lantec/u-boot.lds4
-rw-r--r--board/lantec/u-boot.lds.debug2
-rw-r--r--board/logicpd/zoom2/zoom2_serial.c2
-rw-r--r--board/lwmon/u-boot.lds2
-rw-r--r--board/lwmon/u-boot.lds.debug4
-rw-r--r--board/matrix_vision/mvsmr/u-boot.lds10
-rw-r--r--board/mbx8xx/u-boot.lds2
-rw-r--r--board/mbx8xx/u-boot.lds.debug4
-rw-r--r--board/mbx8xx/vpd.c2
-rw-r--r--board/ml2/u-boot.lds16
-rw-r--r--board/ml2/u-boot.lds.debug2
-rw-r--r--board/mousse/u-boot.lds6
-rw-r--r--board/mousse/u-boot.lds.ram2
-rw-r--r--board/mousse/u-boot.lds.rom4
-rw-r--r--board/mpl/pip405/u-boot.lds.debug2
-rw-r--r--board/mucmc52/config.mk2
-rw-r--r--board/munices/u-boot.lds2
-rw-r--r--board/nc650/u-boot.lds2
-rw-r--r--board/nc650/u-boot.lds.debug2
-rw-r--r--board/netphone/u-boot.lds10
-rw-r--r--board/netphone/u-boot.lds.debug2
-rw-r--r--board/netstal/hcu4/hcu4.c2
-rw-r--r--board/netstal/hcu5/README.txt16
-rw-r--r--board/netstal/hcu5/hcu5.c2
-rw-r--r--board/netstal/mcu25/mcu25.c2
-rw-r--r--board/netta/u-boot.lds10
-rw-r--r--board/netta/u-boot.lds.debug2
-rw-r--r--board/netta2/u-boot.lds10
-rw-r--r--board/netta2/u-boot.lds.debug2
-rw-r--r--board/netvia/u-boot.lds10
-rw-r--r--board/netvia/u-boot.lds.debug2
-rw-r--r--board/nx823/u-boot.lds2
-rw-r--r--board/nx823/u-boot.lds.debug2
-rw-r--r--board/pcippc2/u-boot.lds2
-rw-r--r--board/pcs440ep/pcs440ep.c2
-rw-r--r--board/ppmc7xx/u-boot.lds2
-rw-r--r--board/prodrive/p3mx/mv_eth.c2
-rw-r--r--board/prodrive/p3mx/u-boot.lds2
-rw-r--r--board/quantum/u-boot.lds4
-rw-r--r--board/quantum/u-boot.lds.debug2
-rw-r--r--board/r360mpi/u-boot.lds8
-rw-r--r--board/rbc823/u-boot.lds4
-rw-r--r--board/rmu/u-boot.lds4
-rw-r--r--board/rmu/u-boot.lds.debug2
-rw-r--r--board/rsdproto/u-boot.lds2
-rw-r--r--board/sandburst/common/ppc440gx_i2c.c2
-rw-r--r--board/sandburst/karef/u-boot.lds.debug16
-rw-r--r--board/sandburst/metrobox/u-boot.lds.debug16
-rw-r--r--board/sbc8641d/u-boot.lds14
-rw-r--r--board/sc3/u-boot.lds16
-rw-r--r--board/siemens/CCM/u-boot.lds4
-rw-r--r--board/siemens/CCM/u-boot.lds.debug2
-rw-r--r--board/siemens/IAD210/u-boot.lds8
-rw-r--r--board/siemens/pcu_e/u-boot.lds2
-rw-r--r--board/siemens/pcu_e/u-boot.lds.debug4
-rw-r--r--board/sixnet/u-boot.lds2
-rw-r--r--board/snmc/qs850/u-boot.lds10
-rw-r--r--board/snmc/qs860t/u-boot.lds10
-rw-r--r--board/spc1920/u-boot.lds10
-rw-r--r--board/spd8xx/u-boot.lds2
-rw-r--r--board/spd8xx/u-boot.lds.debug4
-rw-r--r--board/stx/stxssa/stxssa.c2
-rw-r--r--board/stx/stxxtc/u-boot.lds10
-rw-r--r--board/stx/stxxtc/u-boot.lds.debug2
-rw-r--r--board/svm_sc8xx/u-boot.lds10
-rw-r--r--board/svm_sc8xx/u-boot.lds.debug2
-rw-r--r--board/tqc/tqm8xx/u-boot.lds8
-rw-r--r--board/tqc/tqm8xx/u-boot.lds.debug2
-rw-r--r--board/uc100/u-boot.lds10
-rw-r--r--board/uc100/u-boot.lds.debug2
-rw-r--r--board/uc101/config.mk2
-rw-r--r--board/v37/u-boot.lds10
-rw-r--r--board/w7o/u-boot.lds.debug2
-rw-r--r--board/w7o/w7o.c2
-rw-r--r--board/westel/amx860/u-boot.lds4
-rw-r--r--board/westel/amx860/u-boot.lds.debug4
-rw-r--r--board/xes/xpedite1000/u-boot.lds.debug16
-rw-r--r--board/xes/xpedite5170/u-boot.lds14
-rw-r--r--board/xilinx/ppc405-generic/u-boot-rom.lds2
-rw-r--r--board/xilinx/ppc440-generic/u-boot-rom.lds2
-rw-r--r--common/kgdb.c2
-rw-r--r--doc/README.IPHASE45392
-rw-r--r--doc/README.PIP40516
-rw-r--r--doc/README.POST4
-rw-r--r--doc/README.RPXlite2
-rw-r--r--doc/README.TQM82608
-rw-r--r--doc/README.alaska822038
-rw-r--r--doc/README.bedbug16
-rw-r--r--doc/README.mpc5xx8
-rw-r--r--doc/README.mpc85xxads4
-rw-r--r--drivers/pci/pci_auto.c2
-rw-r--r--drivers/qe/uec_phy.c2
-rw-r--r--drivers/serial/ns16550.c2
-rw-r--r--drivers/spi/mpc8xxx_spi.c2
-rw-r--r--examples/api/Makefile6
-rw-r--r--examples/standalone/mem_to_mem_idma2intr.c4
-rw-r--r--include/configs/aria.h2
-rw-r--r--include/configs/galaxy5200.h2
-rw-r--r--include/configs/kilauea.h2
-rw-r--r--include/configs/linkstation.h2
-rw-r--r--include/configs/quad100hd.h6
-rw-r--r--include/configs/sc3.h4
-rw-r--r--include/ns16550.h2
-rw-r--r--lib/div64.c2
-rw-r--r--nand_spl/board/amcc/acadia/Makefile8
-rw-r--r--nand_spl/board/amcc/bamboo/Makefile4
-rw-r--r--nand_spl/board/amcc/canyonlands/Makefile4
-rw-r--r--nand_spl/board/amcc/kilauea/Makefile10
-rw-r--r--nand_spl/board/amcc/sequoia/Makefile6
-rw-r--r--nand_spl/board/freescale/mpc8313erdb/Makefile10
-rw-r--r--nand_spl/board/freescale/mpc8315erdb/Makefile10
-rw-r--r--nand_spl/board/freescale/mpc8536ds/Makefile12
-rw-r--r--nand_spl/board/freescale/mpc8569mds/Makefile12
-rw-r--r--nand_spl/board/freescale/p1_p2_rdb/Makefile12
-rw-r--r--nand_spl/board/sheldon/simpc8313/Makefile10
-rw-r--r--post/cpu/ppc4xx/spr.c2
-rw-r--r--post/lib_powerpc/Makefile (renamed from post/lib_ppc/Makefile)2
-rw-r--r--post/lib_powerpc/andi.c (renamed from post/lib_ppc/andi.c)0
-rw-r--r--post/lib_powerpc/asm.S (renamed from post/lib_ppc/asm.S)0
-rw-r--r--post/lib_powerpc/b.c (renamed from post/lib_ppc/b.c)0
-rw-r--r--post/lib_powerpc/cmp.c (renamed from post/lib_ppc/cmp.c)0
-rw-r--r--post/lib_powerpc/cmpi.c (renamed from post/lib_ppc/cmpi.c)0
-rw-r--r--post/lib_powerpc/complex.c (renamed from post/lib_ppc/complex.c)0
-rw-r--r--post/lib_powerpc/cpu.c (renamed from post/lib_ppc/cpu.c)0
-rw-r--r--post/lib_powerpc/cpu_asm.h (renamed from post/lib_ppc/cpu_asm.h)0
-rw-r--r--post/lib_powerpc/cr.c (renamed from post/lib_ppc/cr.c)0
-rw-r--r--post/lib_powerpc/fpu/20001122-1.c (renamed from post/lib_ppc/fpu/20001122-1.c)0
-rw-r--r--post/lib_powerpc/fpu/20010114-2.c (renamed from post/lib_ppc/fpu/20010114-2.c)0
-rw-r--r--post/lib_powerpc/fpu/20010226-1.c (renamed from post/lib_ppc/fpu/20010226-1.c)0
-rw-r--r--post/lib_powerpc/fpu/980619-1.c (renamed from post/lib_ppc/fpu/980619-1.c)0
-rw-r--r--post/lib_powerpc/fpu/Makefile (renamed from post/lib_ppc/fpu/Makefile)2
-rw-r--r--post/lib_powerpc/fpu/acc1.c (renamed from post/lib_ppc/fpu/acc1.c)0
-rw-r--r--post/lib_powerpc/fpu/compare-fp-1.c (renamed from post/lib_ppc/fpu/compare-fp-1.c)0
-rw-r--r--post/lib_powerpc/fpu/fpu.c (renamed from post/lib_ppc/fpu/fpu.c)0
-rw-r--r--post/lib_powerpc/fpu/mul-subnormal-single-1.c (renamed from post/lib_ppc/fpu/mul-subnormal-single-1.c)0
-rw-r--r--post/lib_powerpc/load.c (renamed from post/lib_ppc/load.c)0
-rw-r--r--post/lib_powerpc/multi.c (renamed from post/lib_ppc/multi.c)0
-rw-r--r--post/lib_powerpc/rlwimi.c (renamed from post/lib_ppc/rlwimi.c)0
-rw-r--r--post/lib_powerpc/rlwinm.c (renamed from post/lib_ppc/rlwinm.c)0
-rw-r--r--post/lib_powerpc/rlwnm.c (renamed from post/lib_ppc/rlwnm.c)0
-rw-r--r--post/lib_powerpc/srawi.c (renamed from post/lib_ppc/srawi.c)0
-rw-r--r--post/lib_powerpc/store.c (renamed from post/lib_ppc/store.c)0
-rw-r--r--post/lib_powerpc/string.c (renamed from post/lib_ppc/string.c)0
-rw-r--r--post/lib_powerpc/three.c (renamed from post/lib_ppc/three.c)0
-rw-r--r--post/lib_powerpc/threei.c (renamed from post/lib_ppc/threei.c)0
-rw-r--r--post/lib_powerpc/threex.c (renamed from post/lib_ppc/threex.c)0
-rw-r--r--post/lib_powerpc/two.c (renamed from post/lib_ppc/two.c)0
-rw-r--r--post/lib_powerpc/twox.c (renamed from post/lib_ppc/twox.c)0
579 files changed, 879 insertions, 877 deletions
diff --git a/MAKEALL b/MAKEALL
index fb1f7a3cee0..4632750943d 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -489,7 +489,7 @@ LIST_TSEC=" \
${LIST_86xx} \
"
-LIST_ppc=" \
+LIST_powerpc=" \
${LIST_5xx} \
${LIST_512x} \
${LIST_5xxx} \
@@ -505,6 +505,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
#########################################################################
@@ -949,8 +955,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
#-----------------------------------------------------------------------
@@ -1006,7 +1012,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 \
diff --git a/Makefile b/Makefile
index 0381c8110fe..34f10ced181 100644
--- 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,7 @@ 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
#########################################################################
## MPC8xx Systems
@@ -824,10 +820,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 +831,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 +869,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 +895,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 +913,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 +928,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 +968,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 +981,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 +1012,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 +1025,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 +1041,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 +1095,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 +1160,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 +1189,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 +1241,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 +1250,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 +1268,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 +1323,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 +1332,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 +1360,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 +1423,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 +1432,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 +1496,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 +1524,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 +1534,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 +1552,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 +1561,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 +1587,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 +1595,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 +1603,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 +1611,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 +1635,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 +1646,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 +1668,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 +1692,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 +1746,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 +1759,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 +1785,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 +1820,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 +1832,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 +1868,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 +1885,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 +1956,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 +2225,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 +2246,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 +2288,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 +2305,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 +2337,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 +2347,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 +2356,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 +2381,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 +2406,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 +2436,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 +2448,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 +2460,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 +2469,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 +2503,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 +2541,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 +2558,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 +2581,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 +2629,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
@@ -3768,7 +3764,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 99320abadd8..4a50557f6d1 100644
--- 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.
@@ -1966,7 +1966,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 +2727,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 +3373,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 +3471,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 +3495,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
diff --git a/api/api_platform-ppc.c b/api/api_platform-powerpc.c
index a3d981f9e38..a3d981f9e38 100644
--- a/api/api_platform-ppc.c
+++ b/api/api_platform-powerpc.c
diff --git a/arch/ppc/config.mk b/arch/powerpc/config.mk
index 06a3b107d59..06a3b107d59 100644
--- a/arch/ppc/config.mk
+++ b/arch/powerpc/config.mk
diff --git a/arch/ppc/cpu/74xx_7xx/Makefile b/arch/powerpc/cpu/74xx_7xx/Makefile
index fe905f31fe2..fe905f31fe2 100644
--- a/arch/ppc/cpu/74xx_7xx/Makefile
+++ b/arch/powerpc/cpu/74xx_7xx/Makefile
diff --git a/arch/ppc/cpu/74xx_7xx/cache.S b/arch/powerpc/cpu/74xx_7xx/cache.S
index 66c72983d42..66c72983d42 100644
--- a/arch/ppc/cpu/74xx_7xx/cache.S
+++ b/arch/powerpc/cpu/74xx_7xx/cache.S
diff --git a/arch/ppc/cpu/74xx_7xx/config.mk b/arch/powerpc/cpu/74xx_7xx/config.mk
index df1f6acedf1..df1f6acedf1 100644
--- a/arch/ppc/cpu/74xx_7xx/config.mk
+++ b/arch/powerpc/cpu/74xx_7xx/config.mk
diff --git a/arch/ppc/cpu/74xx_7xx/cpu.c b/arch/powerpc/cpu/74xx_7xx/cpu.c
index 3c172779b19..3c172779b19 100644
--- a/arch/ppc/cpu/74xx_7xx/cpu.c
+++ b/arch/powerpc/cpu/74xx_7xx/cpu.c
diff --git a/arch/ppc/cpu/74xx_7xx/cpu_init.c b/arch/powerpc/cpu/74xx_7xx/cpu_init.c
index 1dd1b2cd842..1dd1b2cd842 100644
--- a/arch/ppc/cpu/74xx_7xx/cpu_init.c
+++ b/arch/powerpc/cpu/74xx_7xx/cpu_init.c
diff --git a/arch/ppc/cpu/74xx_7xx/interrupts.c b/arch/powerpc/cpu/74xx_7xx/interrupts.c
index 0ea1aec7a60..0ea1aec7a60 100644
--- a/arch/ppc/cpu/74xx_7xx/interrupts.c
+++ b/arch/powerpc/cpu/74xx_7xx/interrupts.c
diff --git a/arch/ppc/cpu/74xx_7xx/io.S b/arch/powerpc/cpu/74xx_7xx/io.S
index af2e6d12fbc..af2e6d12fbc 100644
--- a/arch/ppc/cpu/74xx_7xx/io.S
+++ b/arch/powerpc/cpu/74xx_7xx/io.S
diff --git a/arch/ppc/cpu/74xx_7xx/kgdb.S b/arch/powerpc/cpu/74xx_7xx/kgdb.S
index ad487cdaf45..ad487cdaf45 100644
--- a/arch/ppc/cpu/74xx_7xx/kgdb.S
+++ b/arch/powerpc/cpu/74xx_7xx/kgdb.S
diff --git a/arch/ppc/cpu/74xx_7xx/speed.c b/arch/powerpc/cpu/74xx_7xx/speed.c
index f2fdcd5dc3d..f2fdcd5dc3d 100644
--- a/arch/ppc/cpu/74xx_7xx/speed.c
+++ b/arch/powerpc/cpu/74xx_7xx/speed.c
diff --git a/arch/ppc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S
index 88fdf88c342..88fdf88c342 100644
--- a/arch/ppc/cpu/74xx_7xx/start.S
+++ b/arch/powerpc/cpu/74xx_7xx/start.S
diff --git a/arch/ppc/cpu/74xx_7xx/traps.c b/arch/powerpc/cpu/74xx_7xx/traps.c
index 1d5dd017efc..5073b0516d8 100644
--- a/arch/ppc/cpu/74xx_7xx/traps.c
+++ b/arch/powerpc/cpu/74xx_7xx/traps.c
@@ -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)
*
diff --git a/arch/ppc/cpu/mpc512x/Makefile b/arch/powerpc/cpu/mpc512x/Makefile
index 1719c66e8d6..1719c66e8d6 100644
--- a/arch/ppc/cpu/mpc512x/Makefile
+++ b/arch/powerpc/cpu/mpc512x/Makefile
diff --git a/arch/ppc/cpu/mpc512x/asm-offsets.h b/arch/powerpc/cpu/mpc512x/asm-offsets.h
index 5873fe05ec5..957d4be2d20 100644
--- a/arch/ppc/cpu/mpc512x/asm-offsets.h
+++ b/arch/powerpc/cpu/mpc512x/asm-offsets.h
@@ -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/ppc/cpu/mpc512x/config.mk b/arch/powerpc/cpu/mpc512x/config.mk
index b6727dcd216..b29edb1b387 100644
--- a/arch/ppc/cpu/mpc512x/config.mk
+++ b/arch/powerpc/cpu/mpc512x/config.mk
@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \
# Use default linker script.
# A board port can override this setting in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc512x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc512x/u-boot.lds
diff --git a/arch/ppc/cpu/mpc512x/cpu.c b/arch/powerpc/cpu/mpc512x/cpu.c
index 09cbd2024db..09cbd2024db 100644
--- a/arch/ppc/cpu/mpc512x/cpu.c
+++ b/arch/powerpc/cpu/mpc512x/cpu.c
diff --git a/arch/ppc/cpu/mpc512x/cpu_init.c b/arch/powerpc/cpu/mpc512x/cpu_init.c
index fe6beaf84d2..fe6beaf84d2 100644
--- a/arch/ppc/cpu/mpc512x/cpu_init.c
+++ b/arch/powerpc/cpu/mpc512x/cpu_init.c
diff --git a/arch/ppc/cpu/mpc512x/diu.c b/arch/powerpc/cpu/mpc512x/diu.c
index 93611615f1b..93611615f1b 100644
--- a/arch/ppc/cpu/mpc512x/diu.c
+++ b/arch/powerpc/cpu/mpc512x/diu.c
diff --git a/arch/ppc/cpu/mpc512x/fixed_sdram.c b/arch/powerpc/cpu/mpc512x/fixed_sdram.c
index 442b5fc9180..442b5fc9180 100644
--- a/arch/ppc/cpu/mpc512x/fixed_sdram.c
+++ b/arch/powerpc/cpu/mpc512x/fixed_sdram.c
diff --git a/arch/ppc/cpu/mpc512x/i2c.c b/arch/powerpc/cpu/mpc512x/i2c.c
index e2d909751ef..e2d909751ef 100644
--- a/arch/ppc/cpu/mpc512x/i2c.c
+++ b/arch/powerpc/cpu/mpc512x/i2c.c
diff --git a/arch/ppc/cpu/mpc512x/ide.c b/arch/powerpc/cpu/mpc512x/ide.c
index dd6b2f4673d..dd6b2f4673d 100644
--- a/arch/ppc/cpu/mpc512x/ide.c
+++ b/arch/powerpc/cpu/mpc512x/ide.c
diff --git a/arch/ppc/cpu/mpc512x/iim.c b/arch/powerpc/cpu/mpc512x/iim.c
index 8f2eb37e17e..8f2eb37e17e 100644
--- a/arch/ppc/cpu/mpc512x/iim.c
+++ b/arch/powerpc/cpu/mpc512x/iim.c
diff --git a/arch/ppc/cpu/mpc512x/interrupts.c b/arch/powerpc/cpu/mpc512x/interrupts.c
index ef7c773b2b8..ef7c773b2b8 100644
--- a/arch/ppc/cpu/mpc512x/interrupts.c
+++ b/arch/powerpc/cpu/mpc512x/interrupts.c
diff --git a/arch/ppc/cpu/mpc512x/iopin.c b/arch/powerpc/cpu/mpc512x/iopin.c
index be209476232..be209476232 100644
--- a/arch/ppc/cpu/mpc512x/iopin.c
+++ b/arch/powerpc/cpu/mpc512x/iopin.c
diff --git a/arch/ppc/cpu/mpc512x/pci.c b/arch/powerpc/cpu/mpc512x/pci.c
index 141db8b8659..141db8b8659 100644
--- a/arch/ppc/cpu/mpc512x/pci.c
+++ b/arch/powerpc/cpu/mpc512x/pci.c
diff --git a/arch/ppc/cpu/mpc512x/serial.c b/arch/powerpc/cpu/mpc512x/serial.c
index ec2f41bb36d..ec2f41bb36d 100644
--- a/arch/ppc/cpu/mpc512x/serial.c
+++ b/arch/powerpc/cpu/mpc512x/serial.c
diff --git a/arch/ppc/cpu/mpc512x/speed.c b/arch/powerpc/cpu/mpc512x/speed.c
index ce8d0949b2f..ce8d0949b2f 100644
--- a/arch/ppc/cpu/mpc512x/speed.c
+++ b/arch/powerpc/cpu/mpc512x/speed.c
diff --git a/arch/ppc/cpu/mpc512x/start.S b/arch/powerpc/cpu/mpc512x/start.S
index d26b61707e0..d26b61707e0 100644
--- a/arch/ppc/cpu/mpc512x/start.S
+++ b/arch/powerpc/cpu/mpc512x/start.S
diff --git a/arch/ppc/cpu/mpc512x/traps.c b/arch/powerpc/cpu/mpc512x/traps.c
index 786f4a5a7e5..786f4a5a7e5 100644
--- a/arch/ppc/cpu/mpc512x/traps.c
+++ b/arch/powerpc/cpu/mpc512x/traps.c
diff --git a/arch/ppc/cpu/mpc512x/u-boot.lds b/arch/powerpc/cpu/mpc512x/u-boot.lds
index fbc2026d530..c71679960c1 100644
--- a/arch/ppc/cpu/mpc512x/u-boot.lds
+++ b/arch/powerpc/cpu/mpc512x/u-boot.lds
@@ -49,7 +49,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc512x/start.o (.text)
+ arch/powerpc/cpu/mpc512x/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc5xx/Makefile b/arch/powerpc/cpu/mpc5xx/Makefile
index f2ebb9a1234..80c53203e96 100644
--- a/arch/ppc/cpu/mpc5xx/Makefile
+++ b/arch/powerpc/cpu/mpc5xx/Makefile
@@ -25,11 +25,11 @@
#
#
-# File: arch/ppc/cpu/mpc5xx/Makefile
+# File: arch/powerpc/cpu/mpc5xx/Makefile
#
# Discription: Makefile to build mpc5xx cpu configuration.
# Will include top config.mk which itselfs
-# uses the definitions made in arch/ppc/cpu/mpc5xx/config.mk
+# uses the definitions made in arch/powerpc/cpu/mpc5xx/config.mk
#
diff --git a/arch/ppc/cpu/mpc5xx/config.mk b/arch/powerpc/cpu/mpc5xx/config.mk
index e0b0ce1fd5c..5f9285df492 100644
--- a/arch/ppc/cpu/mpc5xx/config.mk
+++ b/arch/powerpc/cpu/mpc5xx/config.mk
@@ -33,4 +33,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi
PLATFORM_CPPFLAGS += -DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xx/u-boot.lds
diff --git a/arch/ppc/cpu/mpc5xx/cpu.c b/arch/powerpc/cpu/mpc5xx/cpu.c
index 7fffebcc1e5..7fffebcc1e5 100644
--- a/arch/ppc/cpu/mpc5xx/cpu.c
+++ b/arch/powerpc/cpu/mpc5xx/cpu.c
diff --git a/arch/ppc/cpu/mpc5xx/cpu_init.c b/arch/powerpc/cpu/mpc5xx/cpu_init.c
index cb4bf84737a..cb4bf84737a 100644
--- a/arch/ppc/cpu/mpc5xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc5xx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc5xx/interrupts.c b/arch/powerpc/cpu/mpc5xx/interrupts.c
index 167543fcf53..167543fcf53 100644
--- a/arch/ppc/cpu/mpc5xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc5xx/interrupts.c
diff --git a/arch/ppc/cpu/mpc5xx/serial.c b/arch/powerpc/cpu/mpc5xx/serial.c
index 88c6db81cb2..88c6db81cb2 100644
--- a/arch/ppc/cpu/mpc5xx/serial.c
+++ b/arch/powerpc/cpu/mpc5xx/serial.c
diff --git a/arch/ppc/cpu/mpc5xx/speed.c b/arch/powerpc/cpu/mpc5xx/speed.c
index ea5c1dead57..ea5c1dead57 100644
--- a/arch/ppc/cpu/mpc5xx/speed.c
+++ b/arch/powerpc/cpu/mpc5xx/speed.c
diff --git a/arch/ppc/cpu/mpc5xx/spi.c b/arch/powerpc/cpu/mpc5xx/spi.c
index 3ca15ea8386..3ca15ea8386 100644
--- a/arch/ppc/cpu/mpc5xx/spi.c
+++ b/arch/powerpc/cpu/mpc5xx/spi.c
diff --git a/arch/ppc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S
index 0af879e3913..0af879e3913 100644
--- a/arch/ppc/cpu/mpc5xx/start.S
+++ b/arch/powerpc/cpu/mpc5xx/start.S
diff --git a/arch/ppc/cpu/mpc5xx/traps.c b/arch/powerpc/cpu/mpc5xx/traps.c
index 6882c21a417..e3ce11b2b3e 100644
--- a/arch/ppc/cpu/mpc5xx/traps.c
+++ b/arch/powerpc/cpu/mpc5xx/traps.c
@@ -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)
*
diff --git a/arch/ppc/cpu/mpc5xx/u-boot.lds b/arch/powerpc/cpu/mpc5xx/u-boot.lds
index 55190c72d9f..d5e5dc1787a 100644
--- a/arch/ppc/cpu/mpc5xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc5xx/u-boot.lds
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc5xx/start.o (.text)
+ arch/powerpc/cpu/mpc5xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/arch/ppc/cpu/mpc5xxx/Makefile b/arch/powerpc/cpu/mpc5xxx/Makefile
index 0ee0611550b..0ee0611550b 100644
--- a/arch/ppc/cpu/mpc5xxx/Makefile
+++ b/arch/powerpc/cpu/mpc5xxx/Makefile
diff --git a/arch/ppc/cpu/mpc5xxx/config.mk b/arch/powerpc/cpu/mpc5xxx/config.mk
index 9a64cb623dd..7ef8a4708a9 100644
--- a/arch/ppc/cpu/mpc5xxx/config.mk
+++ b/arch/powerpc/cpu/mpc5xxx/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 \
-mstring -mcpu=603e -mmultiple
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot.lds
diff --git a/arch/ppc/cpu/mpc5xxx/cpu.c b/arch/powerpc/cpu/mpc5xxx/cpu.c
index b20234d32ed..b20234d32ed 100644
--- a/arch/ppc/cpu/mpc5xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc5xxx/cpu.c
diff --git a/arch/ppc/cpu/mpc5xxx/cpu_init.c b/arch/powerpc/cpu/mpc5xxx/cpu_init.c
index 9daf3755acd..9daf3755acd 100644
--- a/arch/ppc/cpu/mpc5xxx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc5xxx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S b/arch/powerpc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
index 00c23121ac8..00c23121ac8 100644
--- a/arch/ppc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
+++ b/arch/powerpc/cpu/mpc5xxx/firmware_sc_task_bestcomm.impl.S
diff --git a/arch/ppc/cpu/mpc5xxx/i2c.c b/arch/powerpc/cpu/mpc5xxx/i2c.c
index 4f7f7163287..4f7f7163287 100644
--- a/arch/ppc/cpu/mpc5xxx/i2c.c
+++ b/arch/powerpc/cpu/mpc5xxx/i2c.c
diff --git a/arch/ppc/cpu/mpc5xxx/ide.c b/arch/powerpc/cpu/mpc5xxx/ide.c
index d337abb1c9f..d337abb1c9f 100644
--- a/arch/ppc/cpu/mpc5xxx/ide.c
+++ b/arch/powerpc/cpu/mpc5xxx/ide.c
diff --git a/arch/ppc/cpu/mpc5xxx/interrupts.c b/arch/powerpc/cpu/mpc5xxx/interrupts.c
index 6035771eeb0..16eee3a480a 100644
--- a/arch/ppc/cpu/mpc5xxx/interrupts.c
+++ b/arch/powerpc/cpu/mpc5xxx/interrupts.c
@@ -27,7 +27,7 @@
* MA 02111-1307 USA
*/
-/* this section was ripped out of arch/ppc/syslib/mpc52xx_pic.c in the
+/* this section was ripped out of arch/powerpc/syslib/mpc52xx_pic.c in the
* Linux 2.6 source with the following copyright.
*
* Based on (well, mostly copied from) the code from the 2.4 kernel by
diff --git a/arch/ppc/cpu/mpc5xxx/io.S b/arch/powerpc/cpu/mpc5xxx/io.S
index 2178a267634..2178a267634 100644
--- a/arch/ppc/cpu/mpc5xxx/io.S
+++ b/arch/powerpc/cpu/mpc5xxx/io.S
diff --git a/arch/ppc/cpu/mpc5xxx/loadtask.c b/arch/powerpc/cpu/mpc5xxx/loadtask.c
index 47e7b596a6f..47e7b596a6f 100644
--- a/arch/ppc/cpu/mpc5xxx/loadtask.c
+++ b/arch/powerpc/cpu/mpc5xxx/loadtask.c
diff --git a/arch/ppc/cpu/mpc5xxx/pci_mpc5200.c b/arch/powerpc/cpu/mpc5xxx/pci_mpc5200.c
index 8268f8afe19..8268f8afe19 100644
--- a/arch/ppc/cpu/mpc5xxx/pci_mpc5200.c
+++ b/arch/powerpc/cpu/mpc5xxx/pci_mpc5200.c
diff --git a/arch/ppc/cpu/mpc5xxx/serial.c b/arch/powerpc/cpu/mpc5xxx/serial.c
index 66759887c66..59a877a8f90 100644
--- a/arch/ppc/cpu/mpc5xxx/serial.c
+++ b/arch/powerpc/cpu/mpc5xxx/serial.c
@@ -21,7 +21,7 @@
* MA 02111-1307 USA
*
* Hacked for MPC8260 by Murray.Jensen@cmst.csiro.au, 19-Oct-00, with
- * changes based on the file arch/ppc/mbxboot/m8260_tty.c from the
+ * changes based on the file arch/powerpc/mbxboot/m8260_tty.c from the
* Linux/PPC sources (m8260_tty.c had no copyright info in it).
*
* Martin Krause, 8 Jun 2006
diff --git a/arch/ppc/cpu/mpc5xxx/speed.c b/arch/powerpc/cpu/mpc5xxx/speed.c
index 8027d3e08a2..8027d3e08a2 100644
--- a/arch/ppc/cpu/mpc5xxx/speed.c
+++ b/arch/powerpc/cpu/mpc5xxx/speed.c
diff --git a/arch/ppc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S
index ba499442107..8b9f09b39d3 100644
--- a/arch/ppc/cpu/mpc5xxx/start.S
+++ b/arch/powerpc/cpu/mpc5xxx/start.S
@@ -442,7 +442,7 @@ init_5xxx_core:
/* */
/* bits 15-19 correspond to addresses 0x00000000 to 0x0001F000 */
/* incrementing by 0x1000 each time. The code below is sort of */
- /* based on code in "flush_tlbs" from arch/ppc/kernel/head.S */
+ /* based on code in "flush_tlbs" from arch/powerpc/kernel/head.S */
/* */
/*--------------------------------------------------------------*/
diff --git a/arch/ppc/cpu/mpc5xxx/traps.c b/arch/powerpc/cpu/mpc5xxx/traps.c
index 934a2f2ab08..5972f345798 100644
--- a/arch/ppc/cpu/mpc5xxx/traps.c
+++ b/arch/powerpc/cpu/mpc5xxx/traps.c
@@ -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)
*
diff --git a/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds b/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
index 81ebde987f7..ecffc1b32f9 100644
--- a/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc5xxx/start.o (.text)
- arch/ppc/cpu/mpc5xxx/traps.o (.text)
+ arch/powerpc/cpu/mpc5xxx/start.o (.text)
+ arch/powerpc/cpu/mpc5xxx/traps.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv)
diff --git a/arch/ppc/cpu/mpc5xxx/u-boot.lds b/arch/powerpc/cpu/mpc5xxx/u-boot.lds
index 64ef481297c..ea4060d4822 100644
--- a/arch/ppc/cpu/mpc5xxx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc5xxx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc5xxx/start.o (.text)
+ arch/powerpc/cpu/mpc5xxx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc5xxx/usb.c b/arch/powerpc/cpu/mpc5xxx/usb.c
index bec7da3eab2..bec7da3eab2 100644
--- a/arch/ppc/cpu/mpc5xxx/usb.c
+++ b/arch/powerpc/cpu/mpc5xxx/usb.c
diff --git a/arch/ppc/cpu/mpc5xxx/usb_ohci.c b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c
index 7976e4df7d8..7976e4df7d8 100644
--- a/arch/ppc/cpu/mpc5xxx/usb_ohci.c
+++ b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c
diff --git a/arch/ppc/cpu/mpc5xxx/usb_ohci.h b/arch/powerpc/cpu/mpc5xxx/usb_ohci.h
index 629b529a695..629b529a695 100644
--- a/arch/ppc/cpu/mpc5xxx/usb_ohci.h
+++ b/arch/powerpc/cpu/mpc5xxx/usb_ohci.h
diff --git a/arch/ppc/cpu/mpc8220/Makefile b/arch/powerpc/cpu/mpc8220/Makefile
index b4fad286dcb..b4fad286dcb 100644
--- a/arch/ppc/cpu/mpc8220/Makefile
+++ b/arch/powerpc/cpu/mpc8220/Makefile
diff --git a/arch/ppc/cpu/mpc8220/config.mk b/arch/powerpc/cpu/mpc8220/config.mk
index e2ebf38bd5e..e706883938d 100644
--- a/arch/ppc/cpu/mpc8220/config.mk
+++ b/arch/powerpc/cpu/mpc8220/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC8220 -ffixed-r2 \
-mstring -mcpu=603e -mmultiple
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8220/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc8220/u-boot.lds
diff --git a/arch/ppc/cpu/mpc8220/cpu.c b/arch/powerpc/cpu/mpc8220/cpu.c
index 563cfe0536b..563cfe0536b 100644
--- a/arch/ppc/cpu/mpc8220/cpu.c
+++ b/arch/powerpc/cpu/mpc8220/cpu.c
diff --git a/arch/ppc/cpu/mpc8220/cpu_init.c b/arch/powerpc/cpu/mpc8220/cpu_init.c
index 8f52c7dd0eb..8f52c7dd0eb 100644
--- a/arch/ppc/cpu/mpc8220/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8220/cpu_init.c
diff --git a/arch/ppc/cpu/mpc8220/dma.h b/arch/powerpc/cpu/mpc8220/dma.h
index d06ee631394..d06ee631394 100644
--- a/arch/ppc/cpu/mpc8220/dma.h
+++ b/arch/powerpc/cpu/mpc8220/dma.h
diff --git a/arch/ppc/cpu/mpc8220/dramSetup.c b/arch/powerpc/cpu/mpc8220/dramSetup.c
index 52cf1333f79..52cf1333f79 100644
--- a/arch/ppc/cpu/mpc8220/dramSetup.c
+++ b/arch/powerpc/cpu/mpc8220/dramSetup.c
diff --git a/arch/ppc/cpu/mpc8220/dramSetup.h b/arch/powerpc/cpu/mpc8220/dramSetup.h
index 3b64e088cd8..3b64e088cd8 100644
--- a/arch/ppc/cpu/mpc8220/dramSetup.h
+++ b/arch/powerpc/cpu/mpc8220/dramSetup.h
diff --git a/arch/ppc/cpu/mpc8220/fec.c b/arch/powerpc/cpu/mpc8220/fec.c
index 992e0ffbc46..992e0ffbc46 100644
--- a/arch/ppc/cpu/mpc8220/fec.c
+++ b/arch/powerpc/cpu/mpc8220/fec.c
diff --git a/arch/ppc/cpu/mpc8220/fec.h b/arch/powerpc/cpu/mpc8220/fec.h
index a8927fcdbb2..a8927fcdbb2 100644
--- a/arch/ppc/cpu/mpc8220/fec.h
+++ b/arch/powerpc/cpu/mpc8220/fec.h
diff --git a/arch/ppc/cpu/mpc8220/fec_dma_tasks.S b/arch/powerpc/cpu/mpc8220/fec_dma_tasks.S
index 3f8a03bf157..3f8a03bf157 100644
--- a/arch/ppc/cpu/mpc8220/fec_dma_tasks.S
+++ b/arch/powerpc/cpu/mpc8220/fec_dma_tasks.S
diff --git a/arch/ppc/cpu/mpc8220/i2c.c b/arch/powerpc/cpu/mpc8220/i2c.c
index 76ecdf11e21..76ecdf11e21 100644
--- a/arch/ppc/cpu/mpc8220/i2c.c
+++ b/arch/powerpc/cpu/mpc8220/i2c.c
diff --git a/arch/ppc/cpu/mpc8220/i2cCore.c b/arch/powerpc/cpu/mpc8220/i2cCore.c
index b89ad034f49..b89ad034f49 100644
--- a/arch/ppc/cpu/mpc8220/i2cCore.c
+++ b/arch/powerpc/cpu/mpc8220/i2cCore.c
diff --git a/arch/ppc/cpu/mpc8220/i2cCore.h b/arch/powerpc/cpu/mpc8220/i2cCore.h
index 72783fd48b1..72783fd48b1 100644
--- a/arch/ppc/cpu/mpc8220/i2cCore.h
+++ b/arch/powerpc/cpu/mpc8220/i2cCore.h
diff --git a/arch/ppc/cpu/mpc8220/interrupts.c b/arch/powerpc/cpu/mpc8220/interrupts.c
index 78e99179c94..78e99179c94 100644
--- a/arch/ppc/cpu/mpc8220/interrupts.c
+++ b/arch/powerpc/cpu/mpc8220/interrupts.c
diff --git a/arch/ppc/cpu/mpc8220/io.S b/arch/powerpc/cpu/mpc8220/io.S
index 5ecdf550a17..5ecdf550a17 100644
--- a/arch/ppc/cpu/mpc8220/io.S
+++ b/arch/powerpc/cpu/mpc8220/io.S
diff --git a/arch/ppc/cpu/mpc8220/loadtask.c b/arch/powerpc/cpu/mpc8220/loadtask.c
index 6d8b627e8c6..6d8b627e8c6 100644
--- a/arch/ppc/cpu/mpc8220/loadtask.c
+++ b/arch/powerpc/cpu/mpc8220/loadtask.c
diff --git a/arch/ppc/cpu/mpc8220/pci.c b/arch/powerpc/cpu/mpc8220/pci.c
index 7ef43b72cd7..7ef43b72cd7 100644
--- a/arch/ppc/cpu/mpc8220/pci.c
+++ b/arch/powerpc/cpu/mpc8220/pci.c
diff --git a/arch/ppc/cpu/mpc8220/speed.c b/arch/powerpc/cpu/mpc8220/speed.c
index 62ac845b7ae..62ac845b7ae 100644
--- a/arch/ppc/cpu/mpc8220/speed.c
+++ b/arch/powerpc/cpu/mpc8220/speed.c
diff --git a/arch/ppc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S
index e28999d3228..3d79d8ec0d2 100644
--- a/arch/ppc/cpu/mpc8220/start.S
+++ b/arch/powerpc/cpu/mpc8220/start.S
@@ -419,7 +419,7 @@ init_8220_core:
/* */
/* bits 15-19 correspond to addresses 0x00000000 to 0x0001F000 */
/* incrementing by 0x1000 each time. The code below is sort of */
- /* based on code in "flush_tlbs" from arch/ppc/kernel/head.S */
+ /* based on code in "flush_tlbs" from arch/powerpc/kernel/head.S */
/* */
/*--------------------------------------------------------------*/
diff --git a/arch/ppc/cpu/mpc8220/traps.c b/arch/powerpc/cpu/mpc8220/traps.c
index 456578001bb..13894c90502 100644
--- a/arch/ppc/cpu/mpc8220/traps.c
+++ b/arch/powerpc/cpu/mpc8220/traps.c
@@ -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)
*
diff --git a/arch/ppc/cpu/mpc8220/u-boot.lds b/arch/powerpc/cpu/mpc8220/u-boot.lds
index 8c5d3071f98..31a7a0e4ef0 100644
--- a/arch/ppc/cpu/mpc8220/u-boot.lds
+++ b/arch/powerpc/cpu/mpc8220/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8220/start.o (.text)
+ arch/powerpc/cpu/mpc8220/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc8220/uart.c b/arch/powerpc/cpu/mpc8220/uart.c
index 0c4b536b48e..0c4b536b48e 100644
--- a/arch/ppc/cpu/mpc8220/uart.c
+++ b/arch/powerpc/cpu/mpc8220/uart.c
diff --git a/arch/ppc/cpu/mpc824x/.gitignore b/arch/powerpc/cpu/mpc824x/.gitignore
index 2d79931e961..2d79931e961 100644
--- a/arch/ppc/cpu/mpc824x/.gitignore
+++ b/arch/powerpc/cpu/mpc824x/.gitignore
diff --git a/arch/ppc/cpu/mpc824x/Makefile b/arch/powerpc/cpu/mpc824x/Makefile
index a57ad12c41e..a57ad12c41e 100644
--- a/arch/ppc/cpu/mpc824x/Makefile
+++ b/arch/powerpc/cpu/mpc824x/Makefile
diff --git a/arch/ppc/cpu/mpc824x/config.mk b/arch/powerpc/cpu/mpc824x/config.mk
index 31ecd20d9f3..27c287351be 100644
--- a/arch/ppc/cpu/mpc824x/config.mk
+++ b/arch/powerpc/cpu/mpc824x/config.mk
@@ -26,4 +26,4 @@ PLATFORM_RELFLAGS += -fPIC -meabi
PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc824x/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc824x/u-boot.lds
diff --git a/arch/ppc/cpu/mpc824x/cpu.c b/arch/powerpc/cpu/mpc824x/cpu.c
index 08f6a947f41..08f6a947f41 100644
--- a/arch/ppc/cpu/mpc824x/cpu.c
+++ b/arch/powerpc/cpu/mpc824x/cpu.c
diff --git a/arch/ppc/cpu/mpc824x/cpu_init.c b/arch/powerpc/cpu/mpc824x/cpu_init.c
index 395f7767d12..395f7767d12 100644
--- a/arch/ppc/cpu/mpc824x/cpu_init.c
+++ b/arch/powerpc/cpu/mpc824x/cpu_init.c
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic.h b/arch/powerpc/cpu/mpc824x/drivers/epic.h
index 2803f631cf8..2803f631cf8 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic.h
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic.h
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic/README b/arch/powerpc/cpu/mpc824x/drivers/epic/README
index 57989969b90..57989969b90 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic/README
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic/README
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic/epic.h b/arch/powerpc/cpu/mpc824x/drivers/epic/epic.h
index 58f81c5dfd6..58f81c5dfd6 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic/epic.h
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic/epic.h
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic/epic1.c b/arch/powerpc/cpu/mpc824x/drivers/epic/epic1.c
index ecbb42d0d62..ecbb42d0d62 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic/epic1.c
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic/epic1.c
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic/epic2.S b/arch/powerpc/cpu/mpc824x/drivers/epic/epic2.S
index 52d19aae8e2..52d19aae8e2 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic/epic2.S
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic/epic2.S
diff --git a/arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S b/arch/powerpc/cpu/mpc824x/drivers/epic/epicutil.S
index 4877050ba42..4877050ba42 100644
--- a/arch/ppc/cpu/mpc824x/drivers/epic/epicutil.S
+++ b/arch/powerpc/cpu/mpc824x/drivers/epic/epicutil.S
diff --git a/arch/ppc/cpu/mpc824x/drivers/errors.h b/arch/powerpc/cpu/mpc824x/drivers/errors.h
index 20794a2e893..20794a2e893 100644
--- a/arch/ppc/cpu/mpc824x/drivers/errors.h
+++ b/arch/powerpc/cpu/mpc824x/drivers/errors.h
diff --git a/arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c b/arch/powerpc/cpu/mpc824x/drivers/i2c/i2c.c
index 637ae4c1b10..637ae4c1b10 100644
--- a/arch/ppc/cpu/mpc824x/drivers/i2c/i2c.c
+++ b/arch/powerpc/cpu/mpc824x/drivers/i2c/i2c.c
diff --git a/arch/ppc/cpu/mpc824x/drivers/i2c_export.h b/arch/powerpc/cpu/mpc824x/drivers/i2c_export.h
index 6264d189bb2..6264d189bb2 100644
--- a/arch/ppc/cpu/mpc824x/drivers/i2c_export.h
+++ b/arch/powerpc/cpu/mpc824x/drivers/i2c_export.h
diff --git a/arch/ppc/cpu/mpc824x/interrupts.c b/arch/powerpc/cpu/mpc824x/interrupts.c
index 139c52cd3c3..139c52cd3c3 100644
--- a/arch/ppc/cpu/mpc824x/interrupts.c
+++ b/arch/powerpc/cpu/mpc824x/interrupts.c
diff --git a/arch/ppc/cpu/mpc824x/pci.c b/arch/powerpc/cpu/mpc824x/pci.c
index cf9cf41ae53..72aaec7b515 100644
--- a/arch/ppc/cpu/mpc824x/pci.c
+++ b/arch/powerpc/cpu/mpc824x/pci.c
@@ -1,5 +1,5 @@
/*
- * arch/ppc/kernel/mpc10x_common.c
+ * arch/powerpc/kernel/mpc10x_common.c
*
* Common routines for the Motorola SPS MPC106, MPC107 and MPC8240 Host bridge,
* Mem ctlr, EPIC, etc.
diff --git a/arch/ppc/cpu/mpc824x/speed.c b/arch/powerpc/cpu/mpc824x/speed.c
index fdcb9723cbd..fdcb9723cbd 100644
--- a/arch/ppc/cpu/mpc824x/speed.c
+++ b/arch/powerpc/cpu/mpc824x/speed.c
diff --git a/arch/ppc/cpu/mpc824x/start.S b/arch/powerpc/cpu/mpc824x/start.S
index f3f595af25d..f3f595af25d 100644
--- a/arch/ppc/cpu/mpc824x/start.S
+++ b/arch/powerpc/cpu/mpc824x/start.S
diff --git a/arch/ppc/cpu/mpc824x/traps.c b/arch/powerpc/cpu/mpc824x/traps.c
index 0a7243020b6..163b983340e 100644
--- a/arch/ppc/cpu/mpc824x/traps.c
+++ b/arch/powerpc/cpu/mpc824x/traps.c
@@ -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)
*
diff --git a/arch/ppc/cpu/mpc8260/u-boot.lds b/arch/powerpc/cpu/mpc824x/u-boot.lds
index 988784416f1..d1fcd7c47da 100644
--- a/arch/ppc/cpu/mpc8260/u-boot.lds
+++ b/arch/powerpc/cpu/mpc824x/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8260/start.o (.text)
+ arch/powerpc/cpu/mpc824x/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc8260/Makefile b/arch/powerpc/cpu/mpc8260/Makefile
index 9f0c2dd50cc..9f0c2dd50cc 100644
--- a/arch/ppc/cpu/mpc8260/Makefile
+++ b/arch/powerpc/cpu/mpc8260/Makefile
diff --git a/arch/ppc/cpu/mpc8260/bedbug_603e.c b/arch/powerpc/cpu/mpc8260/bedbug_603e.c
index c969ff65e6f..c969ff65e6f 100644
--- a/arch/ppc/cpu/mpc8260/bedbug_603e.c
+++ b/arch/powerpc/cpu/mpc8260/bedbug_603e.c
diff --git a/arch/ppc/cpu/mpc8260/commproc.c b/arch/powerpc/cpu/mpc8260/commproc.c
index 94f6bc224fd..111a67c98c5 100644
--- a/arch/ppc/cpu/mpc8260/commproc.c
+++ b/arch/powerpc/cpu/mpc8260/commproc.c
@@ -1,5 +1,5 @@
/*
- * This file is based on "arch/ppc/8260_io/commproc.c" - here is it's
+ * This file is based on "arch/powerpc/8260_io/commproc.c" - here is it's
* copyright notice:
*
* General Purpose functions for the global management of the
diff --git a/arch/ppc/cpu/mpc8260/config.mk b/arch/powerpc/cpu/mpc8260/config.mk
index 51bb9faf25f..a9bb6887a07 100644
--- a/arch/ppc/cpu/mpc8260/config.mk
+++ b/arch/powerpc/cpu/mpc8260/config.mk
@@ -27,4 +27,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 \
-mstring -mcpu=603e -mmultiple
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc8260/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc8260/u-boot.lds
diff --git a/arch/ppc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c
index aedbf297ab7..aedbf297ab7 100644
--- a/arch/ppc/cpu/mpc8260/cpu.c
+++ b/arch/powerpc/cpu/mpc8260/cpu.c
diff --git a/arch/ppc/cpu/mpc8260/cpu_init.c b/arch/powerpc/cpu/mpc8260/cpu_init.c
index 1d527734456..1d527734456 100644
--- a/arch/ppc/cpu/mpc8260/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8260/cpu_init.c
diff --git a/arch/ppc/cpu/mpc8260/ether_fcc.c b/arch/powerpc/cpu/mpc8260/ether_fcc.c
index 5ac02a09c02..5ac02a09c02 100644
--- a/arch/ppc/cpu/mpc8260/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc8260/ether_fcc.c
diff --git a/arch/ppc/cpu/mpc8260/ether_scc.c b/arch/powerpc/cpu/mpc8260/ether_scc.c
index 432111df4cd..432111df4cd 100644
--- a/arch/ppc/cpu/mpc8260/ether_scc.c
+++ b/arch/powerpc/cpu/mpc8260/ether_scc.c
diff --git a/arch/ppc/cpu/mpc8260/i2c.c b/arch/powerpc/cpu/mpc8260/i2c.c
index d2bdcc2d827..d2bdcc2d827 100644
--- a/arch/ppc/cpu/mpc8260/i2c.c
+++ b/arch/powerpc/cpu/mpc8260/i2c.c
diff --git a/arch/ppc/cpu/mpc8260/interrupts.c b/arch/powerpc/cpu/mpc8260/interrupts.c
index a7700c4b65d..2606c60d45d 100644
--- a/arch/ppc/cpu/mpc8260/interrupts.c
+++ b/arch/powerpc/cpu/mpc8260/interrupts.c
@@ -44,7 +44,7 @@ static struct irq_action irq_handlers[NR_IRQS];
static ulong ppc_cached_irq_mask[NR_MASK_WORDS];
/****************************************************************************/
-/* this section was ripped out of arch/ppc/kernel/ppc8260_pic.c in the */
+/* this section was ripped out of arch/powerpc/kernel/ppc8260_pic.c in the */
/* Linux/PPC 2.4.x source. There was no copyright notice in that file. */
/* The 8260 internal interrupt controller. It is usually
@@ -137,7 +137,7 @@ static int m8260_get_irq (struct pt_regs *regs)
return irq;
}
-/* end of code ripped out of arch/ppc/kernel/ppc8260_pic.c */
+/* end of code ripped out of arch/powerpc/kernel/ppc8260_pic.c */
/****************************************************************************/
int interrupt_init_cpu (unsigned *decrementer_count)
diff --git a/arch/ppc/cpu/mpc8260/kgdb.S b/arch/powerpc/cpu/mpc8260/kgdb.S
index c5936c73450..c5936c73450 100644
--- a/arch/ppc/cpu/mpc8260/kgdb.S
+++ b/arch/powerpc/cpu/mpc8260/kgdb.S
diff --git a/arch/ppc/cpu/mpc8260/pci.c b/arch/powerpc/cpu/mpc8260/pci.c
index 6a14ba4adcc..6a14ba4adcc 100644
--- a/arch/ppc/cpu/mpc8260/pci.c
+++ b/arch/powerpc/cpu/mpc8260/pci.c
diff --git a/arch/ppc/cpu/mpc8260/serial_scc.c b/arch/powerpc/cpu/mpc8260/serial_scc.c
index 4ab6a286403..4ab6a286403 100644
--- a/arch/ppc/cpu/mpc8260/serial_scc.c
+++ b/arch/powerpc/cpu/mpc8260/serial_scc.c
diff --git a/arch/ppc/cpu/mpc8260/serial_smc.c b/arch/powerpc/cpu/mpc8260/serial_smc.c
index fbb3fb0420f..7b6eaba09ad 100644
--- a/arch/ppc/cpu/mpc8260/serial_smc.c
+++ b/arch/powerpc/cpu/mpc8260/serial_smc.c
@@ -21,7 +21,7 @@
* MA 02111-1307 USA
*
* Hacked for MPC8260 by Murray.Jensen@cmst.csiro.au, 19-Oct-00, with
- * changes based on the file arch/ppc/mbxboot/m8260_tty.c from the
+ * changes based on the file arch/powerpc/mbxboot/m8260_tty.c from the
* Linux/PPC sources (m8260_tty.c had no copyright info in it).
*/
diff --git a/arch/ppc/cpu/mpc8260/speed.c b/arch/powerpc/cpu/mpc8260/speed.c
index 0e1c2b06597..0e1c2b06597 100644
--- a/arch/ppc/cpu/mpc8260/speed.c
+++ b/arch/powerpc/cpu/mpc8260/speed.c
diff --git a/arch/ppc/cpu/mpc8260/speed.h b/arch/powerpc/cpu/mpc8260/speed.h
index 3f32a143cc1..3f32a143cc1 100644
--- a/arch/ppc/cpu/mpc8260/speed.h
+++ b/arch/powerpc/cpu/mpc8260/speed.h
diff --git a/arch/ppc/cpu/mpc8260/spi.c b/arch/powerpc/cpu/mpc8260/spi.c
index f5d2ac35a6a..f5d2ac35a6a 100644
--- a/arch/ppc/cpu/mpc8260/spi.c
+++ b/arch/powerpc/cpu/mpc8260/spi.c
diff --git a/arch/ppc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S
index 1fc70bc5e46..a43504276b0 100644
--- a/arch/ppc/cpu/mpc8260/start.S
+++ b/arch/powerpc/cpu/mpc8260/start.S
@@ -576,7 +576,7 @@ init_8260_core:
/* */
/* bits 15-19 correspond to addresses 0x00000000 to 0x0001F000 */
/* incrementing by 0x1000 each time. The code below is sort of */
- /* based on code in "flush_tlbs" from arch/ppc/kernel/head.S */
+ /* based on code in "flush_tlbs" from arch/powerpc/kernel/head.S */
/* */
/*--------------------------------------------------------------*/
diff --git a/arch/ppc/cpu/mpc8260/traps.c b/arch/powerpc/cpu/mpc8260/traps.c
index d216f71f945..c116cdf69d2 100644
--- a/arch/ppc/cpu/mpc8260/traps.c
+++ b/arch/powerpc/cpu/mpc8260/traps.c
@@ -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)
*
diff --git a/arch/ppc/cpu/mpc824x/u-boot.lds b/arch/powerpc/cpu/mpc8260/u-boot.lds
index 8a6d5084ecb..b8681e706d4 100644
--- a/arch/ppc/cpu/mpc824x/u-boot.lds
+++ b/arch/powerpc/cpu/mpc8260/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc824x/start.o (.text)
+ arch/powerpc/cpu/mpc8260/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc83xx/Makefile b/arch/powerpc/cpu/mpc83xx/Makefile
index 15e2c18b137..15e2c18b137 100644
--- a/arch/ppc/cpu/mpc83xx/Makefile
+++ b/arch/powerpc/cpu/mpc83xx/Makefile
diff --git a/arch/ppc/cpu/mpc83xx/config.mk b/arch/powerpc/cpu/mpc83xx/config.mk
index 8596f6a5e78..8a3a8c1b98e 100644
--- a/arch/ppc/cpu/mpc83xx/config.mk
+++ b/arch/powerpc/cpu/mpc83xx/config.mk
@@ -26,4 +26,4 @@ PLATFORM_CPPFLAGS += -DCONFIG_MPC83xx -DCONFIG_E300 \
-ffixed-r2 -msoft-float
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc83xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc83xx/u-boot.lds
diff --git a/arch/ppc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 51180d6daa5..51180d6daa5 100644
--- a/arch/ppc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
diff --git a/arch/ppc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c
index 75b45222bda..75b45222bda 100644
--- a/arch/ppc/cpu/mpc83xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c
index f3942b411f6..f3942b411f6 100644
--- a/arch/ppc/cpu/mpc83xx/ecc.c
+++ b/arch/powerpc/cpu/mpc83xx/ecc.c
diff --git a/arch/ppc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index daf73a6e5ab..daf73a6e5ab 100644
--- a/arch/ppc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
diff --git a/arch/ppc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c
index faffbaf8382..faffbaf8382 100644
--- a/arch/ppc/cpu/mpc83xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc83xx/interrupts.c
diff --git a/arch/ppc/cpu/mpc83xx/nand_init.c b/arch/powerpc/cpu/mpc83xx/nand_init.c
index 38e141a8284..38e141a8284 100644
--- a/arch/ppc/cpu/mpc83xx/nand_init.c
+++ b/arch/powerpc/cpu/mpc83xx/nand_init.c
diff --git a/arch/ppc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index a42b230ff35..a42b230ff35 100644
--- a/arch/ppc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
diff --git a/arch/ppc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 77f8906b9fd..77f8906b9fd 100644
--- a/arch/ppc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
diff --git a/arch/ppc/cpu/mpc83xx/qe_io.c b/arch/powerpc/cpu/mpc83xx/qe_io.c
index db94f00098e..db94f00098e 100644
--- a/arch/ppc/cpu/mpc83xx/qe_io.c
+++ b/arch/powerpc/cpu/mpc83xx/qe_io.c
diff --git a/arch/ppc/cpu/mpc83xx/serdes.c b/arch/powerpc/cpu/mpc83xx/serdes.c
index 64033fe4c35..64033fe4c35 100644
--- a/arch/ppc/cpu/mpc83xx/serdes.c
+++ b/arch/powerpc/cpu/mpc83xx/serdes.c
diff --git a/arch/ppc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
index 44aaa9abc21..44aaa9abc21 100644
--- a/arch/ppc/cpu/mpc83xx/spd_sdram.c
+++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c
diff --git a/arch/ppc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c
index bde7e920a27..bde7e920a27 100644
--- a/arch/ppc/cpu/mpc83xx/speed.c
+++ b/arch/powerpc/cpu/mpc83xx/speed.c
diff --git a/arch/ppc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S
index 68bb6209c3d..a7c80792ded 100644
--- a/arch/ppc/cpu/mpc83xx/start.S
+++ b/arch/powerpc/cpu/mpc83xx/start.S
@@ -720,7 +720,7 @@ setup_bats:
*
* bits 15-19 correspond to addresses 0x00000000 to 0x0001F000
* incrementing by 0x1000 each time. The code below is sort of
- * based on code in "flush_tlbs" from arch/ppc/kernel/head.S
+ * based on code in "flush_tlbs" from arch/powerpc/kernel/head.S
*
*/
lis r3, 0
diff --git a/arch/ppc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c
index 9d71b8b7300..9d71b8b7300 100644
--- a/arch/ppc/cpu/mpc83xx/traps.c
+++ b/arch/powerpc/cpu/mpc83xx/traps.c
diff --git a/arch/ppc/cpu/mpc83xx/u-boot.lds b/arch/powerpc/cpu/mpc83xx/u-boot.lds
index 157cef676e1..0b74a13fb1d 100644
--- a/arch/ppc/cpu/mpc83xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc83xx/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc83xx/start.o (.text)
+ arch/powerpc/cpu/mpc83xx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/arch/ppc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile
index f064fee26b6..f064fee26b6 100644
--- a/arch/ppc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
diff --git a/arch/ppc/cpu/mpc85xx/commproc.c b/arch/powerpc/cpu/mpc85xx/commproc.c
index 594aace4b12..f0fd1cbc38d 100644
--- a/arch/ppc/cpu/mpc85xx/commproc.c
+++ b/arch/powerpc/cpu/mpc85xx/commproc.c
@@ -2,7 +2,7 @@
* Adapted for Motorola MPC8560 chips
* Xianghua Xiao <x.xiao@motorola.com>
*
- * This file is based on "arch/ppc/8260_io/commproc.c" - here is it's
+ * This file is based on "arch/powerpc/8260_io/commproc.c" - here is it's
* copyright notice:
*
* General Purpose functions for the global management of the
diff --git a/arch/ppc/cpu/mpc85xx/config.mk b/arch/powerpc/cpu/mpc85xx/config.mk
index ffb813dc39f..f07d9209a7b 100644
--- a/arch/ppc/cpu/mpc85xx/config.mk
+++ b/arch/powerpc/cpu/mpc85xx/config.mk
@@ -32,4 +32,4 @@ PLATFORM_CPPFLAGS +=$(call cc-option,-mspe=yes)
PLATFORM_CPPFLAGS +=$(call cc-option,-mno-spe)
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc85xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc85xx/u-boot.lds
diff --git a/arch/ppc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index 0cc6e0323f2..0cc6e0323f2 100644
--- a/arch/ppc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
diff --git a/arch/ppc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index e0126d331af..e0126d331af 100644
--- a/arch/ppc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
index 32aa94b612c..32aa94b612c 100644
--- a/arch/ppc/cpu/mpc85xx/cpu_init_early.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
diff --git a/arch/ppc/cpu/mpc85xx/cpu_init_nand.c b/arch/powerpc/cpu/mpc85xx/cpu_init_nand.c
index 184cca4c543..184cca4c543 100644
--- a/arch/ppc/cpu/mpc85xx/cpu_init_nand.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_nand.c
diff --git a/arch/ppc/cpu/mpc85xx/ddr-gen1.c b/arch/powerpc/cpu/mpc85xx/ddr-gen1.c
index 54437dd0cbd..54437dd0cbd 100644
--- a/arch/ppc/cpu/mpc85xx/ddr-gen1.c
+++ b/arch/powerpc/cpu/mpc85xx/ddr-gen1.c
diff --git a/arch/ppc/cpu/mpc85xx/ddr-gen2.c b/arch/powerpc/cpu/mpc85xx/ddr-gen2.c
index 655f99c028e..655f99c028e 100644
--- a/arch/ppc/cpu/mpc85xx/ddr-gen2.c
+++ b/arch/powerpc/cpu/mpc85xx/ddr-gen2.c
diff --git a/arch/ppc/cpu/mpc85xx/ddr-gen3.c b/arch/powerpc/cpu/mpc85xx/ddr-gen3.c
index 0691ca455af..0691ca455af 100644
--- a/arch/ppc/cpu/mpc85xx/ddr-gen3.c
+++ b/arch/powerpc/cpu/mpc85xx/ddr-gen3.c
diff --git a/arch/ppc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index 5f1414d7581..5f1414d7581 100644
--- a/arch/ppc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
diff --git a/arch/ppc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 1d11ab470f8..1d11ab470f8 100644
--- a/arch/ppc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
diff --git a/arch/ppc/cpu/mpc85xx/fixed_ivor.S b/arch/powerpc/cpu/mpc85xx/fixed_ivor.S
index 320cae32962..320cae32962 100644
--- a/arch/ppc/cpu/mpc85xx/fixed_ivor.S
+++ b/arch/powerpc/cpu/mpc85xx/fixed_ivor.S
diff --git a/arch/ppc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c
index 409367d158c..409367d158c 100644
--- a/arch/ppc/cpu/mpc85xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc85xx/interrupts.c
diff --git a/arch/ppc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c
index 826bf32d4d5..826bf32d4d5 100644
--- a/arch/ppc/cpu/mpc85xx/mp.c
+++ b/arch/powerpc/cpu/mpc85xx/mp.c
diff --git a/arch/ppc/cpu/mpc85xx/mp.h b/arch/powerpc/cpu/mpc85xx/mp.h
index 3422cc10700..3422cc10700 100644
--- a/arch/ppc/cpu/mpc85xx/mp.h
+++ b/arch/powerpc/cpu/mpc85xx/mp.h
diff --git a/arch/ppc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
index cb6a6f00c9d..cb6a6f00c9d 100644
--- a/arch/ppc/cpu/mpc85xx/mpc8536_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c
diff --git a/arch/ppc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index 75d2716ef40..75d2716ef40 100644
--- a/arch/ppc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
diff --git a/arch/ppc/cpu/mpc85xx/qe_io.c b/arch/powerpc/cpu/mpc85xx/qe_io.c
index 72a29b7b5ac..72a29b7b5ac 100644
--- a/arch/ppc/cpu/mpc85xx/qe_io.c
+++ b/arch/powerpc/cpu/mpc85xx/qe_io.c
diff --git a/arch/ppc/cpu/mpc85xx/release.S b/arch/powerpc/cpu/mpc85xx/release.S
index 0b5b9da032a..0b5b9da032a 100644
--- a/arch/ppc/cpu/mpc85xx/release.S
+++ b/arch/powerpc/cpu/mpc85xx/release.S
diff --git a/arch/ppc/cpu/mpc85xx/resetvec.S b/arch/powerpc/cpu/mpc85xx/resetvec.S
index 29555d4a009..29555d4a009 100644
--- a/arch/ppc/cpu/mpc85xx/resetvec.S
+++ b/arch/powerpc/cpu/mpc85xx/resetvec.S
diff --git a/arch/ppc/cpu/mpc85xx/serial_scc.c b/arch/powerpc/cpu/mpc85xx/serial_scc.c
index 2dab2124fcc..2dab2124fcc 100644
--- a/arch/ppc/cpu/mpc85xx/serial_scc.c
+++ b/arch/powerpc/cpu/mpc85xx/serial_scc.c
diff --git a/arch/ppc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index 268edbc5b73..268edbc5b73 100644
--- a/arch/ppc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
diff --git a/arch/ppc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
index b3cb56a5b00..b3cb56a5b00 100644
--- a/arch/ppc/cpu/mpc85xx/start.S
+++ b/arch/powerpc/cpu/mpc85xx/start.S
diff --git a/arch/ppc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index b3037aceaf0..b3037aceaf0 100644
--- a/arch/ppc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
diff --git a/arch/ppc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
index 10108d86e33..7e96664333b 100644
--- a/arch/ppc/cpu/mpc85xx/traps.c
+++ b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -1,5 +1,5 @@
/*
- * linux/arch/ppc/kernel/traps.c
+ * linux/arch/powerpc/kernel/traps.c
*
* Copyright 2007 Freescale Semiconductor.
* Copyright (C) 2003 Motorola
diff --git a/arch/ppc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
index b9240f22a73..5fd3e6c8ee0 100644
--- a/arch/ppc/cpu/mpc85xx/u-boot-nand.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
@@ -117,7 +117,7 @@ SECTIONS
.bootpg ADDR(.text) - 0x1000 :
{
- arch/ppc/cpu/mpc85xx/start.o (.bootpg)
+ arch/powerpc/cpu/mpc85xx/start.o (.bootpg)
} :text = 0xffff
. = ADDR(.text) + 0x80000;
diff --git a/arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
index fef3e42e09c..7d9cee98e51 100644
--- a/arch/ppc/cpu/mpc85xx/u-boot-nand_spl.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
@@ -29,7 +29,7 @@ SECTIONS
. = 0xfff00000;
.text : {
*(.text)
- }
+ }
_etext = .;
.reloc : {
diff --git a/arch/ppc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
index 9698bf405ae..c88b1f35b9e 100644
--- a/arch/ppc/cpu/mpc85xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
@@ -121,7 +121,7 @@ SECTIONS
.bootpg RESET_VECTOR_ADDRESS - 0xffc :
{
- arch/ppc/cpu/mpc85xx/start.o (.bootpg)
+ arch/powerpc/cpu/mpc85xx/start.o (.bootpg)
} :text = 0xffff
.resetvec RESET_VECTOR_ADDRESS :
diff --git a/arch/ppc/cpu/mpc86xx/Makefile b/arch/powerpc/cpu/mpc86xx/Makefile
index daca79ad4f2..daca79ad4f2 100644
--- a/arch/ppc/cpu/mpc86xx/Makefile
+++ b/arch/powerpc/cpu/mpc86xx/Makefile
diff --git a/arch/ppc/cpu/mpc86xx/cache.S b/arch/powerpc/cpu/mpc86xx/cache.S
index 0bb058b043f..0bb058b043f 100644
--- a/arch/ppc/cpu/mpc86xx/cache.S
+++ b/arch/powerpc/cpu/mpc86xx/cache.S
diff --git a/arch/ppc/cpu/mpc86xx/config.mk b/arch/powerpc/cpu/mpc86xx/config.mk
index ca2f8376edd..ca2f8376edd 100644
--- a/arch/ppc/cpu/mpc86xx/config.mk
+++ b/arch/powerpc/cpu/mpc86xx/config.mk
diff --git a/arch/ppc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 188757587f5..188757587f5 100644
--- a/arch/ppc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
diff --git a/arch/ppc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c
index b4f047d85d0..b4f047d85d0 100644
--- a/arch/ppc/cpu/mpc86xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc86xx/ddr-8641.c b/arch/powerpc/cpu/mpc86xx/ddr-8641.c
index b8f2c9387f5..b8f2c9387f5 100644
--- a/arch/ppc/cpu/mpc86xx/ddr-8641.c
+++ b/arch/powerpc/cpu/mpc86xx/ddr-8641.c
diff --git a/arch/ppc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c
index 51f3f4c2203..51f3f4c2203 100644
--- a/arch/ppc/cpu/mpc86xx/fdt.c
+++ b/arch/powerpc/cpu/mpc86xx/fdt.c
diff --git a/arch/ppc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c
index c78fc72254b..c78fc72254b 100644
--- a/arch/ppc/cpu/mpc86xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc86xx/interrupts.c
diff --git a/arch/ppc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c
index b4a0faacde0..b4a0faacde0 100644
--- a/arch/ppc/cpu/mpc86xx/mp.c
+++ b/arch/powerpc/cpu/mpc86xx/mp.c
diff --git a/arch/ppc/cpu/mpc86xx/release.S b/arch/powerpc/cpu/mpc86xx/release.S
index 67a6f2bdb57..67a6f2bdb57 100644
--- a/arch/ppc/cpu/mpc86xx/release.S
+++ b/arch/powerpc/cpu/mpc86xx/release.S
diff --git a/arch/ppc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c
index 64a3479d7e5..64a3479d7e5 100644
--- a/arch/ppc/cpu/mpc86xx/speed.c
+++ b/arch/powerpc/cpu/mpc86xx/speed.c
diff --git a/arch/ppc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S
index ed1e4ca6681..ed1e4ca6681 100644
--- a/arch/ppc/cpu/mpc86xx/start.S
+++ b/arch/powerpc/cpu/mpc86xx/start.S
diff --git a/arch/ppc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c
index 406403e5127..406403e5127 100644
--- a/arch/ppc/cpu/mpc86xx/traps.c
+++ b/arch/powerpc/cpu/mpc86xx/traps.c
diff --git a/arch/ppc/cpu/mpc8xx/Makefile b/arch/powerpc/cpu/mpc8xx/Makefile
index 5f70459690a..5f70459690a 100644
--- a/arch/ppc/cpu/mpc8xx/Makefile
+++ b/arch/powerpc/cpu/mpc8xx/Makefile
diff --git a/arch/ppc/cpu/mpc8xx/bedbug_860.c b/arch/powerpc/cpu/mpc8xx/bedbug_860.c
index 0308bbbf7a8..0308bbbf7a8 100644
--- a/arch/ppc/cpu/mpc8xx/bedbug_860.c
+++ b/arch/powerpc/cpu/mpc8xx/bedbug_860.c
diff --git a/arch/ppc/cpu/mpc8xx/commproc.c b/arch/powerpc/cpu/mpc8xx/commproc.c
index a87a0dce88c..a87a0dce88c 100644
--- a/arch/ppc/cpu/mpc8xx/commproc.c
+++ b/arch/powerpc/cpu/mpc8xx/commproc.c
diff --git a/arch/ppc/cpu/mpc8xx/config.mk b/arch/powerpc/cpu/mpc8xx/config.mk
index 5540d653502..5540d653502 100644
--- a/arch/ppc/cpu/mpc8xx/config.mk
+++ b/arch/powerpc/cpu/mpc8xx/config.mk
diff --git a/arch/ppc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 2eb848bd0ef..2eb848bd0ef 100644
--- a/arch/ppc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
diff --git a/arch/ppc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index eb0091bdb30..eb0091bdb30 100644
--- a/arch/ppc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
diff --git a/arch/ppc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c
index 7130983ff22..7130983ff22 100644
--- a/arch/ppc/cpu/mpc8xx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xx/fdt.c
diff --git a/arch/ppc/cpu/mpc8xx/fec.c b/arch/powerpc/cpu/mpc8xx/fec.c
index 89c1ff939d2..89c1ff939d2 100644
--- a/arch/ppc/cpu/mpc8xx/fec.c
+++ b/arch/powerpc/cpu/mpc8xx/fec.c
diff --git a/arch/ppc/cpu/mpc8xx/fec.h b/arch/powerpc/cpu/mpc8xx/fec.h
index a49417c6664..a49417c6664 100644
--- a/arch/ppc/cpu/mpc8xx/fec.h
+++ b/arch/powerpc/cpu/mpc8xx/fec.h
diff --git a/arch/ppc/cpu/mpc8xx/i2c.c b/arch/powerpc/cpu/mpc8xx/i2c.c
index 338cababe89..338cababe89 100644
--- a/arch/ppc/cpu/mpc8xx/i2c.c
+++ b/arch/powerpc/cpu/mpc8xx/i2c.c
diff --git a/arch/ppc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c
index 5daa6b2752c..5daa6b2752c 100644
--- a/arch/ppc/cpu/mpc8xx/interrupts.c
+++ b/arch/powerpc/cpu/mpc8xx/interrupts.c
diff --git a/arch/ppc/cpu/mpc8xx/kgdb.S b/arch/powerpc/cpu/mpc8xx/kgdb.S
index 2cc8fe63c9b..2cc8fe63c9b 100644
--- a/arch/ppc/cpu/mpc8xx/kgdb.S
+++ b/arch/powerpc/cpu/mpc8xx/kgdb.S
diff --git a/arch/ppc/cpu/mpc8xx/lcd.c b/arch/powerpc/cpu/mpc8xx/lcd.c
index 4b88b21b3f0..4b88b21b3f0 100644
--- a/arch/ppc/cpu/mpc8xx/lcd.c
+++ b/arch/powerpc/cpu/mpc8xx/lcd.c
diff --git a/arch/ppc/cpu/mpc8xx/plprcr_write.S b/arch/powerpc/cpu/mpc8xx/plprcr_write.S
index e3256711421..e3256711421 100644
--- a/arch/ppc/cpu/mpc8xx/plprcr_write.S
+++ b/arch/powerpc/cpu/mpc8xx/plprcr_write.S
diff --git a/arch/ppc/cpu/mpc8xx/scc.c b/arch/powerpc/cpu/mpc8xx/scc.c
index effb967e325..effb967e325 100644
--- a/arch/ppc/cpu/mpc8xx/scc.c
+++ b/arch/powerpc/cpu/mpc8xx/scc.c
diff --git a/arch/ppc/cpu/mpc8xx/serial.c b/arch/powerpc/cpu/mpc8xx/serial.c
index 664db65a567..664db65a567 100644
--- a/arch/ppc/cpu/mpc8xx/serial.c
+++ b/arch/powerpc/cpu/mpc8xx/serial.c
diff --git a/arch/ppc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c
index f309f29c049..f309f29c049 100644
--- a/arch/ppc/cpu/mpc8xx/speed.c
+++ b/arch/powerpc/cpu/mpc8xx/speed.c
diff --git a/arch/ppc/cpu/mpc8xx/spi.c b/arch/powerpc/cpu/mpc8xx/spi.c
index b2ac23e5ea4..b2ac23e5ea4 100644
--- a/arch/ppc/cpu/mpc8xx/spi.c
+++ b/arch/powerpc/cpu/mpc8xx/spi.c
diff --git a/arch/ppc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S
index 7cf602fd4b8..7cf602fd4b8 100644
--- a/arch/ppc/cpu/mpc8xx/start.S
+++ b/arch/powerpc/cpu/mpc8xx/start.S
diff --git a/arch/ppc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c
index 6efe8e0ea7b..343dced31f9 100644
--- a/arch/ppc/cpu/mpc8xx/traps.c
+++ b/arch/powerpc/cpu/mpc8xx/traps.c
@@ -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)
*
diff --git a/arch/ppc/cpu/mpc8xx/upatch.c b/arch/powerpc/cpu/mpc8xx/upatch.c
index a8cb735ab77..a8cb735ab77 100644
--- a/arch/ppc/cpu/mpc8xx/upatch.c
+++ b/arch/powerpc/cpu/mpc8xx/upatch.c
diff --git a/arch/ppc/cpu/mpc8xx/video.c b/arch/powerpc/cpu/mpc8xx/video.c
index c79c499b6fa..c79c499b6fa 100644
--- a/arch/ppc/cpu/mpc8xx/video.c
+++ b/arch/powerpc/cpu/mpc8xx/video.c
diff --git a/arch/ppc/cpu/mpc8xx/wlkbd.c b/arch/powerpc/cpu/mpc8xx/wlkbd.c
index 13009e26415..13009e26415 100644
--- a/arch/ppc/cpu/mpc8xx/wlkbd.c
+++ b/arch/powerpc/cpu/mpc8xx/wlkbd.c
diff --git a/arch/ppc/cpu/mpc8xxx/Makefile b/arch/powerpc/cpu/mpc8xxx/Makefile
index 481f9e541dc..481f9e541dc 100644
--- a/arch/ppc/cpu/mpc8xxx/Makefile
+++ b/arch/powerpc/cpu/mpc8xxx/Makefile
diff --git a/arch/ppc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index fef062b224d..22f34237231 100644
--- a/arch/ppc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -1,8 +1,8 @@
/*
* Copyright 2009-2010 Freescale Semiconductor, Inc.
*
- * This file is derived from arch/ppc/cpu/mpc85xx/cpu.c and
- * arch/ppc/cpu/mpc86xx/cpu.c. Basically this file contains
+ * This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and
+ * arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains
* cpu specific common code for 85xx/86xx processors.
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/Makefile b/arch/powerpc/cpu/mpc8xxx/ddr/Makefile
index cb7f856554c..cb7f856554c 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/Makefile
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/Makefile
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h b/arch/powerpc/cpu/mpc8xxx/ddr/common_timing_params.h
index 5aea517f251..5aea517f251 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/common_timing_params.h
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/common_timing_params.h
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c b/arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c
index 03f9c4380d4..03f9c4380d4 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/ctrl_regs.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/ddr.h b/arch/powerpc/cpu/mpc8xxx/ddr/ddr.h
index f1220750df4..f1220750df4 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/ddr.h
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr.h
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
index 91847644180..91847644180 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
index d9d0fa70eeb..d9d0fa70eeb 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
index d4199baa82c..d4199baa82c 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
index e888e3ea562..e888e3ea562 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/lc_common_dimm_params.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/main.c b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
index faa1af95ef1..faa1af95ef1 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/main.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/options.c b/arch/powerpc/cpu/mpc8xxx/ddr/options.c
index 46731c81531..46731c81531 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/options.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/options.c
diff --git a/arch/ppc/cpu/mpc8xxx/ddr/util.c b/arch/powerpc/cpu/mpc8xxx/ddr/util.c
index 1e2d921286e..1e2d921286e 100644
--- a/arch/ppc/cpu/mpc8xxx/ddr/util.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/util.c
diff --git a/arch/ppc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index e68d6f336bb..ccefaf57160 100644
--- a/arch/ppc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -1,8 +1,8 @@
/*
* Copyright 2009 Freescale Semiconductor, Inc.
*
- * This file is derived from arch/ppc/cpu/mpc85xx/cpu.c and
- * arch/ppc/cpu/mpc86xx/cpu.c. Basically this file contains
+ * This file is derived from arch/powerpc/cpu/mpc85xx/cpu.c and
+ * arch/powerpc/cpu/mpc86xx/cpu.c. Basically this file contains
* cpu specific common code for 85xx/86xx processors.
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/arch/ppc/cpu/mpc8xxx/pci_cfg.c b/arch/powerpc/cpu/mpc8xxx/pci_cfg.c
index 9b7181d5b6f..9b7181d5b6f 100644
--- a/arch/ppc/cpu/mpc8xxx/pci_cfg.c
+++ b/arch/powerpc/cpu/mpc8xxx/pci_cfg.c
diff --git a/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c b/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c
index 595d5687d69..f65cd886a51 100644
--- a/arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
+++ b/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c
@@ -1,5 +1,5 @@
/*
- * arch/ppc/cpu/ppc4xx/40x_spd_sdram.c
+ * arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c
* This SPD SDRAM detection code supports IBM/AMCC PPC44x cpu with a
* SDRAM controller. Those are all current 405 PPC's.
*
diff --git a/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
index 9d1994f99ec..005315be8ca 100644
--- a/arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
+++ b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
@@ -1,5 +1,5 @@
/*
- * arch/ppc/cpu/ppc4xx/44x_spd_ddr.c
+ * arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
* This SPD DDR detection code supports IBM/AMCC PPC44x cpu with a
* DDR controller. Those are 440GP/GX/EP/GR.
*
diff --git a/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
index ea6c2ac770a..faddee98b78 100644
--- a/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
+++ b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
@@ -1,5 +1,5 @@
/*
- * arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c
+ * arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
* This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
* DDR2 controller (non Denali Core). Those currently are:
*
diff --git a/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c b/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
index 72630716c96..aed0ed7569a 100644
--- a/arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
@@ -1,5 +1,5 @@
/*
- * arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+ * arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
* This SPD SDRAM detection code supports AMCC PPC44x cpu's with a
* DDR2 controller (non Denali Core). Those currently are:
*
diff --git a/arch/ppc/cpu/ppc4xx/4xx_pci.c b/arch/powerpc/cpu/ppc4xx/4xx_pci.c
index eed4534e5f5..eed4534e5f5 100644
--- a/arch/ppc/cpu/ppc4xx/4xx_pci.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_pci.c
diff --git a/arch/ppc/cpu/ppc4xx/4xx_pcie.c b/arch/powerpc/cpu/ppc4xx/4xx_pcie.c
index 10b58b71180..10b58b71180 100644
--- a/arch/ppc/cpu/ppc4xx/4xx_pcie.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_pcie.c
diff --git a/arch/ppc/cpu/ppc4xx/4xx_uart.c b/arch/powerpc/cpu/ppc4xx/4xx_uart.c
index 8de65425c97..8de65425c97 100644
--- a/arch/ppc/cpu/ppc4xx/4xx_uart.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_uart.c
diff --git a/arch/ppc/cpu/ppc4xx/Makefile b/arch/powerpc/cpu/ppc4xx/Makefile
index 88d53fbb1a9..88d53fbb1a9 100644
--- a/arch/ppc/cpu/ppc4xx/Makefile
+++ b/arch/powerpc/cpu/ppc4xx/Makefile
diff --git a/arch/ppc/cpu/ppc4xx/bedbug_405.c b/arch/powerpc/cpu/ppc4xx/bedbug_405.c
index ef11cb65e41..ef11cb65e41 100644
--- a/arch/ppc/cpu/ppc4xx/bedbug_405.c
+++ b/arch/powerpc/cpu/ppc4xx/bedbug_405.c
diff --git a/arch/ppc/cpu/ppc4xx/cache.S b/arch/powerpc/cpu/ppc4xx/cache.S
index 269716fcebf..269716fcebf 100644
--- a/arch/ppc/cpu/ppc4xx/cache.S
+++ b/arch/powerpc/cpu/ppc4xx/cache.S
diff --git a/arch/ppc/cpu/ppc4xx/cmd_chip_config.c b/arch/powerpc/cpu/ppc4xx/cmd_chip_config.c
index ba57211dd06..ba57211dd06 100644
--- a/arch/ppc/cpu/ppc4xx/cmd_chip_config.c
+++ b/arch/powerpc/cpu/ppc4xx/cmd_chip_config.c
diff --git a/arch/ppc/cpu/ppc4xx/commproc.c b/arch/powerpc/cpu/ppc4xx/commproc.c
index a1696d37e6c..a1696d37e6c 100644
--- a/arch/ppc/cpu/ppc4xx/commproc.c
+++ b/arch/powerpc/cpu/ppc4xx/commproc.c
diff --git a/arch/ppc/cpu/ppc4xx/config.mk b/arch/powerpc/cpu/ppc4xx/config.mk
index ea4d707842c..5bda710e26d 100644
--- a/arch/ppc/cpu/ppc4xx/config.mk
+++ b/arch/powerpc/cpu/ppc4xx/config.mk
@@ -34,4 +34,4 @@ PLATFORM_CPPFLAGS += -Wa,-m405 -mcpu=405
endif
# Use default linker script. Board port can override in board/*/config.mk
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/ppc4xx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/ppc4xx/u-boot.lds
diff --git a/arch/ppc/cpu/ppc4xx/cpu.c b/arch/powerpc/cpu/ppc4xx/cpu.c
index e1a023b703b..e1a023b703b 100644
--- a/arch/ppc/cpu/ppc4xx/cpu.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu.c
diff --git a/arch/ppc/cpu/ppc4xx/cpu_init.c b/arch/powerpc/cpu/ppc4xx/cpu_init.c
index 8a6e545c1ab..8a6e545c1ab 100644
--- a/arch/ppc/cpu/ppc4xx/cpu_init.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu_init.c
diff --git a/arch/ppc/cpu/ppc4xx/dcr.S b/arch/powerpc/cpu/ppc4xx/dcr.S
index 93465a3b513..93465a3b513 100644
--- a/arch/ppc/cpu/ppc4xx/dcr.S
+++ b/arch/powerpc/cpu/ppc4xx/dcr.S
diff --git a/arch/ppc/cpu/ppc4xx/denali_data_eye.c b/arch/powerpc/cpu/ppc4xx/denali_data_eye.c
index 15a9b4f3ecc..03b8d3c614e 100644
--- a/arch/ppc/cpu/ppc4xx/denali_data_eye.c
+++ b/arch/powerpc/cpu/ppc4xx/denali_data_eye.c
@@ -1,5 +1,5 @@
/*
- * arch/ppc/cpu/ppc4xx/denali_data_eye.c
+ * arch/powerpc/cpu/ppc4xx/denali_data_eye.c
* Extracted from board/amcc/sequoia/sdram.c by Larry Johnson <lrj@acm.org>.
*
* (C) Copyright 2006
diff --git a/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c b/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
index 72f76cd2fa7..080ea0af4c4 100644
--- a/arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
+++ b/arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
@@ -1,12 +1,12 @@
/*
- * arch/ppc/cpu/ppc4xx/denali_spd_ddr2.c
+ * arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c
* This SPD SDRAM detection code supports AMCC PPC44x CPUs with a Denali-core
* DDR2 controller, specifically the 440EPx/GRx.
*
* (C) Copyright 2007-2008
* Larry Johnson, lrj@acm.org.
*
- * Based primarily on arch/ppc/cpu/ppc4xx/4xx_spd_ddr2.c, which is...
+ * Based primarily on arch/powerpc/cpu/ppc4xx/4xx_spd_ddr2.c, which is...
*
* (C) Copyright 2007
* Stefan Roese, DENX Software Engineering, sr@denx.de.
diff --git a/arch/ppc/cpu/ppc4xx/ecc.c b/arch/powerpc/cpu/ppc4xx/ecc.c
index f105605459d..f105605459d 100644
--- a/arch/ppc/cpu/ppc4xx/ecc.c
+++ b/arch/powerpc/cpu/ppc4xx/ecc.c
diff --git a/arch/ppc/cpu/ppc4xx/ecc.h b/arch/powerpc/cpu/ppc4xx/ecc.h
index b2588919ebe..b2588919ebe 100644
--- a/arch/ppc/cpu/ppc4xx/ecc.h
+++ b/arch/powerpc/cpu/ppc4xx/ecc.h
diff --git a/arch/ppc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c
index 15a184b5c62..15a184b5c62 100644
--- a/arch/ppc/cpu/ppc4xx/fdt.c
+++ b/arch/powerpc/cpu/ppc4xx/fdt.c
diff --git a/arch/ppc/cpu/ppc4xx/gpio.c b/arch/powerpc/cpu/ppc4xx/gpio.c
index c0d351a957b..c0d351a957b 100644
--- a/arch/ppc/cpu/ppc4xx/gpio.c
+++ b/arch/powerpc/cpu/ppc4xx/gpio.c
diff --git a/arch/ppc/cpu/ppc4xx/interrupts.c b/arch/powerpc/cpu/ppc4xx/interrupts.c
index 6db84210b8d..6db84210b8d 100644
--- a/arch/ppc/cpu/ppc4xx/interrupts.c
+++ b/arch/powerpc/cpu/ppc4xx/interrupts.c
diff --git a/arch/ppc/cpu/ppc4xx/iop480_uart.c b/arch/powerpc/cpu/ppc4xx/iop480_uart.c
index 0e3423f7abb..0e3423f7abb 100644
--- a/arch/ppc/cpu/ppc4xx/iop480_uart.c
+++ b/arch/powerpc/cpu/ppc4xx/iop480_uart.c
diff --git a/arch/ppc/cpu/ppc4xx/kgdb.S b/arch/powerpc/cpu/ppc4xx/kgdb.S
index 4227a4c15b6..4227a4c15b6 100644
--- a/arch/ppc/cpu/ppc4xx/kgdb.S
+++ b/arch/powerpc/cpu/ppc4xx/kgdb.S
diff --git a/arch/ppc/cpu/ppc4xx/miiphy.c b/arch/powerpc/cpu/ppc4xx/miiphy.c
index 22ed5c25ea1..22ed5c25ea1 100644
--- a/arch/ppc/cpu/ppc4xx/miiphy.c
+++ b/arch/powerpc/cpu/ppc4xx/miiphy.c
diff --git a/arch/ppc/cpu/ppc4xx/reginfo.c b/arch/powerpc/cpu/ppc4xx/reginfo.c
index a9756672c13..a9756672c13 100644
--- a/arch/ppc/cpu/ppc4xx/reginfo.c
+++ b/arch/powerpc/cpu/ppc4xx/reginfo.c
diff --git a/arch/ppc/cpu/ppc4xx/resetvec.S b/arch/powerpc/cpu/ppc4xx/resetvec.S
index b3308bd6aee..b3308bd6aee 100644
--- a/arch/ppc/cpu/ppc4xx/resetvec.S
+++ b/arch/powerpc/cpu/ppc4xx/resetvec.S
diff --git a/arch/ppc/cpu/ppc4xx/sdram.c b/arch/powerpc/cpu/ppc4xx/sdram.c
index 30c6e0e38e7..30c6e0e38e7 100644
--- a/arch/ppc/cpu/ppc4xx/sdram.c
+++ b/arch/powerpc/cpu/ppc4xx/sdram.c
diff --git a/arch/ppc/cpu/ppc4xx/sdram.h b/arch/powerpc/cpu/ppc4xx/sdram.h
index bea33765348..bea33765348 100644
--- a/arch/ppc/cpu/ppc4xx/sdram.h
+++ b/arch/powerpc/cpu/ppc4xx/sdram.h
diff --git a/arch/ppc/cpu/ppc4xx/speed.c b/arch/powerpc/cpu/ppc4xx/speed.c
index 906face0330..906face0330 100644
--- a/arch/ppc/cpu/ppc4xx/speed.c
+++ b/arch/powerpc/cpu/ppc4xx/speed.c
diff --git a/arch/ppc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S
index c739deb9b46..c739deb9b46 100644
--- a/arch/ppc/cpu/ppc4xx/start.S
+++ b/arch/powerpc/cpu/ppc4xx/start.S
diff --git a/arch/ppc/cpu/ppc4xx/tlb.c b/arch/powerpc/cpu/ppc4xx/tlb.c
index 24a9a9cc283..24a9a9cc283 100644
--- a/arch/ppc/cpu/ppc4xx/tlb.c
+++ b/arch/powerpc/cpu/ppc4xx/tlb.c
diff --git a/arch/ppc/cpu/ppc4xx/traps.c b/arch/powerpc/cpu/ppc4xx/traps.c
index 42e422157c1..1616772f0f9 100644
--- a/arch/ppc/cpu/ppc4xx/traps.c
+++ b/arch/powerpc/cpu/ppc4xx/traps.c
@@ -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)
*
diff --git a/arch/ppc/cpu/ppc4xx/u-boot.lds b/arch/powerpc/cpu/ppc4xx/u-boot.lds
index 3704d8a695a..eca1f9dd827 100644
--- a/arch/ppc/cpu/ppc4xx/u-boot.lds
+++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds
@@ -124,7 +124,7 @@ SECTIONS
#ifdef CONFIG_440
.bootpg RESET_VECTOR_ADDRESS - 0xffc :
{
- arch/ppc/cpu/ppc4xx/start.o (.bootpg)
+ arch/powerpc/cpu/ppc4xx/start.o (.bootpg)
/*
* PPC440 board need a board specific object with the
diff --git a/arch/ppc/cpu/ppc4xx/uic.c b/arch/powerpc/cpu/ppc4xx/uic.c
index 8b1b259fafe..8b1b259fafe 100644
--- a/arch/ppc/cpu/ppc4xx/uic.c
+++ b/arch/powerpc/cpu/ppc4xx/uic.c
diff --git a/arch/ppc/cpu/ppc4xx/usb.c b/arch/powerpc/cpu/ppc4xx/usb.c
index 592efe70a71..592efe70a71 100644
--- a/arch/ppc/cpu/ppc4xx/usb.c
+++ b/arch/powerpc/cpu/ppc4xx/usb.c
diff --git a/arch/ppc/cpu/ppc4xx/usb_ohci.c b/arch/powerpc/cpu/ppc4xx/usb_ohci.c
index a9edacd330f..a9edacd330f 100644
--- a/arch/ppc/cpu/ppc4xx/usb_ohci.c
+++ b/arch/powerpc/cpu/ppc4xx/usb_ohci.c
diff --git a/arch/ppc/cpu/ppc4xx/usb_ohci.h b/arch/powerpc/cpu/ppc4xx/usb_ohci.h
index 2c3dc4f99ca..2c3dc4f99ca 100644
--- a/arch/ppc/cpu/ppc4xx/usb_ohci.h
+++ b/arch/powerpc/cpu/ppc4xx/usb_ohci.h
diff --git a/arch/ppc/cpu/ppc4xx/usbdev.c b/arch/powerpc/cpu/ppc4xx/usbdev.c
index fe398afc02b..fe398afc02b 100644
--- a/arch/ppc/cpu/ppc4xx/usbdev.c
+++ b/arch/powerpc/cpu/ppc4xx/usbdev.c
diff --git a/arch/ppc/cpu/ppc4xx/usbdev.h b/arch/powerpc/cpu/ppc4xx/usbdev.h
index ef6a2da649f..ef6a2da649f 100644
--- a/arch/ppc/cpu/ppc4xx/usbdev.h
+++ b/arch/powerpc/cpu/ppc4xx/usbdev.h
diff --git a/arch/ppc/cpu/ppc4xx/xilinx_irq.c b/arch/powerpc/cpu/ppc4xx/xilinx_irq.c
index 71087771cb6..71087771cb6 100644
--- a/arch/ppc/cpu/ppc4xx/xilinx_irq.c
+++ b/arch/powerpc/cpu/ppc4xx/xilinx_irq.c
diff --git a/arch/ppc/include/asm/4xx_pci.h b/arch/powerpc/include/asm/4xx_pci.h
index f686e7cb07b..f686e7cb07b 100644
--- a/arch/ppc/include/asm/4xx_pci.h
+++ b/arch/powerpc/include/asm/4xx_pci.h
diff --git a/arch/ppc/include/asm/4xx_pcie.h b/arch/powerpc/include/asm/4xx_pcie.h
index a0e88de11d4..a0e88de11d4 100644
--- a/arch/ppc/include/asm/4xx_pcie.h
+++ b/arch/powerpc/include/asm/4xx_pcie.h
diff --git a/arch/ppc/include/asm/5xx_immap.h b/arch/powerpc/include/asm/5xx_immap.h
index 72cbab43e42..72cbab43e42 100644
--- a/arch/ppc/include/asm/5xx_immap.h
+++ b/arch/powerpc/include/asm/5xx_immap.h
diff --git a/arch/ppc/include/asm/8xx_immap.h b/arch/powerpc/include/asm/8xx_immap.h
index 40679cb2b06..40679cb2b06 100644
--- a/arch/ppc/include/asm/8xx_immap.h
+++ b/arch/powerpc/include/asm/8xx_immap.h
diff --git a/arch/ppc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
index 23f22df1b75..23f22df1b75 100644
--- a/arch/ppc/include/asm/atomic.h
+++ b/arch/powerpc/include/asm/atomic.h
diff --git a/arch/ppc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h
index adaf0914921..adaf0914921 100644
--- a/arch/ppc/include/asm/bitops.h
+++ b/arch/powerpc/include/asm/bitops.h
diff --git a/arch/ppc/include/asm/byteorder.h b/arch/powerpc/include/asm/byteorder.h
index 3f5bcf63a1f..3f5bcf63a1f 100644
--- a/arch/ppc/include/asm/byteorder.h
+++ b/arch/powerpc/include/asm/byteorder.h
diff --git a/arch/ppc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
index 53e8d05f50b..53e8d05f50b 100644
--- a/arch/ppc/include/asm/cache.h
+++ b/arch/powerpc/include/asm/cache.h
diff --git a/arch/ppc/include/asm/config.h b/arch/powerpc/include/asm/config.h
index fc3facb3076..fc3facb3076 100644
--- a/arch/ppc/include/asm/config.h
+++ b/arch/powerpc/include/asm/config.h
diff --git a/arch/ppc/include/asm/cpm_8260.h b/arch/powerpc/include/asm/cpm_8260.h
index 8302404abb5..8302404abb5 100644
--- a/arch/ppc/include/asm/cpm_8260.h
+++ b/arch/powerpc/include/asm/cpm_8260.h
diff --git a/arch/ppc/include/asm/cpm_85xx.h b/arch/powerpc/include/asm/cpm_85xx.h
index a74a3a115bf..a74a3a115bf 100644
--- a/arch/ppc/include/asm/cpm_85xx.h
+++ b/arch/powerpc/include/asm/cpm_85xx.h
diff --git a/arch/ppc/include/asm/e300.h b/arch/powerpc/include/asm/e300.h
index bfef4dfd626..bfef4dfd626 100644
--- a/arch/ppc/include/asm/e300.h
+++ b/arch/powerpc/include/asm/e300.h
diff --git a/arch/ppc/include/asm/errno.h b/arch/powerpc/include/asm/errno.h
index 4c82b503d92..4c82b503d92 100644
--- a/arch/ppc/include/asm/errno.h
+++ b/arch/powerpc/include/asm/errno.h
diff --git a/arch/ppc/include/asm/fsl_ddr_dimm_params.h b/arch/powerpc/include/asm/fsl_ddr_dimm_params.h
index 55923e09b3a..55923e09b3a 100644
--- a/arch/ppc/include/asm/fsl_ddr_dimm_params.h
+++ b/arch/powerpc/include/asm/fsl_ddr_dimm_params.h
diff --git a/arch/ppc/include/asm/fsl_ddr_sdram.h b/arch/powerpc/include/asm/fsl_ddr_sdram.h
index 3216a506331..3216a506331 100644
--- a/arch/ppc/include/asm/fsl_ddr_sdram.h
+++ b/arch/powerpc/include/asm/fsl_ddr_sdram.h
diff --git a/arch/ppc/include/asm/fsl_dma.h b/arch/powerpc/include/asm/fsl_dma.h
index 11641912a65..11641912a65 100644
--- a/arch/ppc/include/asm/fsl_dma.h
+++ b/arch/powerpc/include/asm/fsl_dma.h
diff --git a/arch/ppc/include/asm/fsl_i2c.h b/arch/powerpc/include/asm/fsl_i2c.h
index 4f71341327b..4f71341327b 100644
--- a/arch/ppc/include/asm/fsl_i2c.h
+++ b/arch/powerpc/include/asm/fsl_i2c.h
diff --git a/arch/ppc/include/asm/fsl_law.h b/arch/powerpc/include/asm/fsl_law.h
index 34c56a259a6..34c56a259a6 100644
--- a/arch/ppc/include/asm/fsl_law.h
+++ b/arch/powerpc/include/asm/fsl_law.h
diff --git a/arch/ppc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index 5723de643a4..5723de643a4 100644
--- a/arch/ppc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
diff --git a/arch/ppc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h
index db61e7e9cbf..db61e7e9cbf 100644
--- a/arch/ppc/include/asm/fsl_pci.h
+++ b/arch/powerpc/include/asm/fsl_pci.h
diff --git a/arch/ppc/include/asm/fsl_serdes.h b/arch/powerpc/include/asm/fsl_serdes.h
index 6da4b6ff942..6da4b6ff942 100644
--- a/arch/ppc/include/asm/fsl_serdes.h
+++ b/arch/powerpc/include/asm/fsl_serdes.h
diff --git a/arch/ppc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index d3dd44e96d7..d3dd44e96d7 100644
--- a/arch/ppc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
diff --git a/arch/ppc/include/asm/gpio.h b/arch/powerpc/include/asm/gpio.h
index 23e29b195ea..23e29b195ea 100644
--- a/arch/ppc/include/asm/gpio.h
+++ b/arch/powerpc/include/asm/gpio.h
diff --git a/arch/ppc/include/asm/immap_512x.h b/arch/powerpc/include/asm/immap_512x.h
index 95350fd9b84..95350fd9b84 100644
--- a/arch/ppc/include/asm/immap_512x.h
+++ b/arch/powerpc/include/asm/immap_512x.h
diff --git a/arch/ppc/include/asm/immap_8220.h b/arch/powerpc/include/asm/immap_8220.h
index f9595f42d9b..f9595f42d9b 100644
--- a/arch/ppc/include/asm/immap_8220.h
+++ b/arch/powerpc/include/asm/immap_8220.h
diff --git a/arch/ppc/include/asm/immap_8260.h b/arch/powerpc/include/asm/immap_8260.h
index 4974ae56fcb..4974ae56fcb 100644
--- a/arch/ppc/include/asm/immap_8260.h
+++ b/arch/powerpc/include/asm/immap_8260.h
diff --git a/arch/ppc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h
index 6b42a73f3f6..6b42a73f3f6 100644
--- a/arch/ppc/include/asm/immap_83xx.h
+++ b/arch/powerpc/include/asm/immap_83xx.h
diff --git a/arch/ppc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 957ad76a796..957ad76a796 100644
--- a/arch/ppc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
diff --git a/arch/ppc/include/asm/immap_86xx.h b/arch/powerpc/include/asm/immap_86xx.h
index fd7acdb7674..fd7acdb7674 100644
--- a/arch/ppc/include/asm/immap_86xx.h
+++ b/arch/powerpc/include/asm/immap_86xx.h
diff --git a/arch/ppc/include/asm/immap_qe.h b/arch/powerpc/include/asm/immap_qe.h
index 531cfc891d7..531cfc891d7 100644
--- a/arch/ppc/include/asm/immap_qe.h
+++ b/arch/powerpc/include/asm/immap_qe.h
diff --git a/arch/ppc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
index 792836b2294..792836b2294 100644
--- a/arch/ppc/include/asm/interrupt.h
+++ b/arch/powerpc/include/asm/interrupt.h
diff --git a/arch/ppc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 4ddad26e818..4ddad26e818 100644
--- a/arch/ppc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
diff --git a/arch/ppc/include/asm/iopin_8260.h b/arch/powerpc/include/asm/iopin_8260.h
index 619f3a8abea..619f3a8abea 100644
--- a/arch/ppc/include/asm/iopin_8260.h
+++ b/arch/powerpc/include/asm/iopin_8260.h
diff --git a/arch/ppc/include/asm/iopin_85xx.h b/arch/powerpc/include/asm/iopin_85xx.h
index 0f07ba355e9..0f07ba355e9 100644
--- a/arch/ppc/include/asm/iopin_85xx.h
+++ b/arch/powerpc/include/asm/iopin_85xx.h
diff --git a/arch/ppc/include/asm/iopin_8xx.h b/arch/powerpc/include/asm/iopin_8xx.h
index 3a2a682f66c..3a2a682f66c 100644
--- a/arch/ppc/include/asm/iopin_8xx.h
+++ b/arch/powerpc/include/asm/iopin_8xx.h
diff --git a/arch/ppc/include/asm/m8260_pci.h b/arch/powerpc/include/asm/m8260_pci.h
index 45f01de820c..45f01de820c 100644
--- a/arch/ppc/include/asm/m8260_pci.h
+++ b/arch/powerpc/include/asm/m8260_pci.h
diff --git a/arch/ppc/include/asm/mc146818rtc.h b/arch/powerpc/include/asm/mc146818rtc.h
index 5f806c4ec21..5f806c4ec21 100644
--- a/arch/ppc/include/asm/mc146818rtc.h
+++ b/arch/powerpc/include/asm/mc146818rtc.h
diff --git a/arch/ppc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index ce7f0810051..ce7f0810051 100644
--- a/arch/ppc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
diff --git a/arch/ppc/include/asm/mp.h b/arch/powerpc/include/asm/mp.h
index 5388c951c84..5388c951c84 100644
--- a/arch/ppc/include/asm/mp.h
+++ b/arch/powerpc/include/asm/mp.h
diff --git a/arch/ppc/include/asm/mpc512x.h b/arch/powerpc/include/asm/mpc512x.h
index 960e2292942..960e2292942 100644
--- a/arch/ppc/include/asm/mpc512x.h
+++ b/arch/powerpc/include/asm/mpc512x.h
diff --git a/arch/ppc/include/asm/mpc8349_pci.h b/arch/powerpc/include/asm/mpc8349_pci.h
index 7a1adba950d..7a1adba950d 100644
--- a/arch/ppc/include/asm/mpc8349_pci.h
+++ b/arch/powerpc/include/asm/mpc8349_pci.h
diff --git a/arch/ppc/include/asm/mpc8xxx_spi.h b/arch/powerpc/include/asm/mpc8xxx_spi.h
index 41737d3c694..41737d3c694 100644
--- a/arch/ppc/include/asm/mpc8xxx_spi.h
+++ b/arch/powerpc/include/asm/mpc8xxx_spi.h
diff --git a/arch/ppc/include/asm/pci_io.h b/arch/powerpc/include/asm/pci_io.h
index 9b738c383f7..9b738c383f7 100644
--- a/arch/ppc/include/asm/pci_io.h
+++ b/arch/powerpc/include/asm/pci_io.h
diff --git a/arch/ppc/include/asm/pnp.h b/arch/powerpc/include/asm/pnp.h
index 22ceba22530..22ceba22530 100644
--- a/arch/ppc/include/asm/pnp.h
+++ b/arch/powerpc/include/asm/pnp.h
diff --git a/arch/ppc/include/asm/posix_types.h b/arch/powerpc/include/asm/posix_types.h
index 91707281170..91707281170 100644
--- a/arch/ppc/include/asm/posix_types.h
+++ b/arch/powerpc/include/asm/posix_types.h
diff --git a/arch/ppc/include/asm/ppc4xx-ebc.h b/arch/powerpc/include/asm/ppc4xx-ebc.h
index 9c17e462522..9c17e462522 100644
--- a/arch/ppc/include/asm/ppc4xx-ebc.h
+++ b/arch/powerpc/include/asm/ppc4xx-ebc.h
diff --git a/arch/ppc/include/asm/ppc4xx-isram.h b/arch/powerpc/include/asm/ppc4xx-isram.h
index d6d17ac961b..d6d17ac961b 100644
--- a/arch/ppc/include/asm/ppc4xx-isram.h
+++ b/arch/powerpc/include/asm/ppc4xx-isram.h
diff --git a/arch/ppc/include/asm/ppc4xx-sdram.h b/arch/powerpc/include/asm/ppc4xx-sdram.h
index 92be514b404..92be514b404 100644
--- a/arch/ppc/include/asm/ppc4xx-sdram.h
+++ b/arch/powerpc/include/asm/ppc4xx-sdram.h
diff --git a/arch/ppc/include/asm/ppc4xx-uic.h b/arch/powerpc/include/asm/ppc4xx-uic.h
index 782d0454b7e..782d0454b7e 100644
--- a/arch/ppc/include/asm/ppc4xx-uic.h
+++ b/arch/powerpc/include/asm/ppc4xx-uic.h
diff --git a/arch/ppc/include/asm/ppc4xx_config.h b/arch/powerpc/include/asm/ppc4xx_config.h
index 49acb60aedc..49acb60aedc 100644
--- a/arch/ppc/include/asm/ppc4xx_config.h
+++ b/arch/powerpc/include/asm/ppc4xx_config.h
diff --git a/arch/ppc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 9ec319ae170..9ec319ae170 100644
--- a/arch/ppc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
diff --git a/arch/ppc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 196613b9f15..cf09edf1560 100644
--- a/arch/ppc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -14,7 +14,7 @@
* that the overall structure is a multiple of 16 bytes in length.
*
* Note that the offsets of the fields in this struct correspond with
- * the PT_* values below. This simplifies arch/ppc/kernel/ptrace.c.
+ * the PT_* values below. This simplifies arch/powerpc/kernel/ptrace.c.
*/
#include <linux/config.h>
diff --git a/arch/ppc/include/asm/residual.h b/arch/powerpc/include/asm/residual.h
index dc85edbc3ce..dc85edbc3ce 100644
--- a/arch/ppc/include/asm/residual.h
+++ b/arch/powerpc/include/asm/residual.h
diff --git a/arch/ppc/include/asm/sigcontext.h b/arch/powerpc/include/asm/sigcontext.h
index 715c868ab67..715c868ab67 100644
--- a/arch/ppc/include/asm/sigcontext.h
+++ b/arch/powerpc/include/asm/sigcontext.h
diff --git a/arch/ppc/include/asm/signal.h b/arch/powerpc/include/asm/signal.h
index b11a28efd14..b11a28efd14 100644
--- a/arch/ppc/include/asm/signal.h
+++ b/arch/powerpc/include/asm/signal.h
diff --git a/arch/ppc/include/asm/status_led.h b/arch/powerpc/include/asm/status_led.h
index 037570993ac..037570993ac 100644
--- a/arch/ppc/include/asm/status_led.h
+++ b/arch/powerpc/include/asm/status_led.h
diff --git a/arch/ppc/include/asm/string.h b/arch/powerpc/include/asm/string.h
index d912a6b5fed..d912a6b5fed 100644
--- a/arch/ppc/include/asm/string.h
+++ b/arch/powerpc/include/asm/string.h
diff --git a/arch/ppc/include/asm/types.h b/arch/powerpc/include/asm/types.h
index b27a6b753a0..b27a6b753a0 100644
--- a/arch/ppc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
diff --git a/arch/ppc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h
index ea2d22df272..ea2d22df272 100644
--- a/arch/ppc/include/asm/u-boot.h
+++ b/arch/powerpc/include/asm/u-boot.h
diff --git a/arch/ppc/include/asm/unaligned.h b/arch/powerpc/include/asm/unaligned.h
index 5f1b1e3c213..5f1b1e3c213 100644
--- a/arch/ppc/include/asm/unaligned.h
+++ b/arch/powerpc/include/asm/unaligned.h
diff --git a/arch/ppc/include/asm/xilinx_irq.h b/arch/powerpc/include/asm/xilinx_irq.h
index 61171c21ffa..61171c21ffa 100644
--- a/arch/ppc/include/asm/xilinx_irq.h
+++ b/arch/powerpc/include/asm/xilinx_irq.h
diff --git a/arch/ppc/lib/Makefile b/arch/powerpc/lib/Makefile
index 334e457805c..334e457805c 100644
--- a/arch/ppc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
diff --git a/arch/ppc/lib/bat_rw.c b/arch/powerpc/lib/bat_rw.c
index c48c2401515..c48c2401515 100644
--- a/arch/ppc/lib/bat_rw.c
+++ b/arch/powerpc/lib/bat_rw.c
diff --git a/arch/ppc/lib/board.c b/arch/powerpc/lib/board.c
index a30acee4feb..a30acee4feb 100644
--- a/arch/ppc/lib/board.c
+++ b/arch/powerpc/lib/board.c
diff --git a/arch/ppc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 0685a9331cb..0685a9331cb 100644
--- a/arch/ppc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
diff --git a/arch/ppc/lib/cache.c b/arch/powerpc/lib/cache.c
index 338b08bd770..338b08bd770 100644
--- a/arch/ppc/lib/cache.c
+++ b/arch/powerpc/lib/cache.c
diff --git a/arch/ppc/lib/extable.c b/arch/powerpc/lib/extable.c
index 7408d5c9694..7408d5c9694 100644
--- a/arch/ppc/lib/extable.c
+++ b/arch/powerpc/lib/extable.c
diff --git a/arch/ppc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index f6031707aeb..f6031707aeb 100644
--- a/arch/ppc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
diff --git a/arch/ppc/lib/kgdb.c b/arch/powerpc/lib/kgdb.c
index d3eb1f35a9f..d3eb1f35a9f 100644
--- a/arch/ppc/lib/kgdb.c
+++ b/arch/powerpc/lib/kgdb.c
diff --git a/arch/ppc/lib/ppccache.S b/arch/powerpc/lib/ppccache.S
index 278a8048f87..278a8048f87 100644
--- a/arch/ppc/lib/ppccache.S
+++ b/arch/powerpc/lib/ppccache.S
diff --git a/arch/ppc/lib/ppcstring.S b/arch/powerpc/lib/ppcstring.S
index 97023a0555a..97023a0555a 100644
--- a/arch/ppc/lib/ppcstring.S
+++ b/arch/powerpc/lib/ppcstring.S
diff --git a/arch/ppc/lib/reloc.S b/arch/powerpc/lib/reloc.S
index 50f9a83fc62..50f9a83fc62 100644
--- a/arch/ppc/lib/reloc.S
+++ b/arch/powerpc/lib/reloc.S
diff --git a/arch/ppc/lib/ticks.S b/arch/powerpc/lib/ticks.S
index b8d25b7f465..b8d25b7f465 100644
--- a/arch/ppc/lib/ticks.S
+++ b/arch/powerpc/lib/ticks.S
diff --git a/arch/ppc/lib/time.c b/arch/powerpc/lib/time.c
index 29099612db4..29099612db4 100644
--- a/arch/ppc/lib/time.c
+++ b/arch/powerpc/lib/time.c
diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds
index e26792cc2ff..1efdf7dc32b 100644
--- a/board/LEOX/elpt860/u-boot.lds
+++ b/board/LEOX/elpt860/u-boot.lds
@@ -64,17 +64,17 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
lib/string.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/extable.o (.text)
- arch/ppc/lib/time.o (.text)
- arch/ppc/lib/ticks.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/extable.o (.text)
+ arch/powerpc/lib/time.o (.text)
+ arch/powerpc/lib/ticks.o (.text)
. = env_offset;
common/env_embedded.o (.text)
diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug
index 707ff7a6b01..287fc2015df 100644
--- a/board/LEOX/elpt860/u-boot.lds.debug
+++ b/board/LEOX/elpt860/u-boot.lds.debug
@@ -64,7 +64,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/MAI/AmigaOneG3SE/u-boot.lds b/board/MAI/AmigaOneG3SE/u-boot.lds
index 1f55c6571d1..e86ac56ad6c 100644
--- a/board/MAI/AmigaOneG3SE/u-boot.lds
+++ b/board/MAI/AmigaOneG3SE/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
common/env_embedded.o(.text)
diff --git a/board/Marvell/common/ns16550.c b/board/Marvell/common/ns16550.c
index 7fbf28a6090..7839b68d424 100644
--- a/board/Marvell/common/ns16550.c
+++ b/board/Marvell/common/ns16550.c
@@ -1,6 +1,6 @@
/*
* COM1 NS16550 support
- * originally from linux source (arch/ppc/boot/ns16550.c)
+ * originally from linux source (arch/powerpc/boot/ns16550.c)
* modified to use CONFIG_SYS_ISA_MEM and new defines
*
* further modified by Josh Huber <huber@mclx.com> to support
diff --git a/board/Marvell/common/ns16550.h b/board/Marvell/common/ns16550.h
index b9691ab5afb..0a2951bce76 100644
--- a/board/Marvell/common/ns16550.h
+++ b/board/Marvell/common/ns16550.h
@@ -1,6 +1,6 @@
/*
* NS16550 Serial Port
- * originally from linux source (arch/ppc/boot/ns16550.h)
+ * originally from linux source (arch/powerpc/boot/ns16550.h)
* modified slightly to
* have addresses as offsets from CONFIG_SYS_ISA_BASE
* added a few more definitions
diff --git a/board/Marvell/db64360/mv_eth.c b/board/Marvell/db64360/mv_eth.c
index dfc0bf7d307..d1ac0c5c588 100644
--- a/board/Marvell/db64360/mv_eth.c
+++ b/board/Marvell/db64360/mv_eth.c
@@ -1061,7 +1061,7 @@ bool db64360_eth_start (struct eth_device *dev)
*************************************************************************/
/*
* based on Linux code
- * arch/ppc/galileo/EVB64360/mv64360_eth.c - Driver for MV64360X ethernet ports
+ * arch/powerpc/galileo/EVB64360/mv64360_eth.c - Driver for MV64360X ethernet ports
* Copyright (C) 2002 rabeeh@galileo.co.il
* This program is free software; you can redistribute it and/or
diff --git a/board/Marvell/db64360/u-boot.lds b/board/Marvell/db64360/u-boot.lds
index 6dff003dc1f..29dcc091005 100644
--- a/board/Marvell/db64360/u-boot.lds
+++ b/board/Marvell/db64360/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/Marvell/db64460/mv_eth.c b/board/Marvell/db64460/mv_eth.c
index 0458164ef18..58b63a314b1 100644
--- a/board/Marvell/db64460/mv_eth.c
+++ b/board/Marvell/db64460/mv_eth.c
@@ -1060,7 +1060,7 @@ bool db64460_eth_start (struct eth_device *dev)
*************************************************************************/
/*
* based on Linux code
- * arch/ppc/galileo/EVB64460/mv64460_eth.c - Driver for MV64460X ethernet ports
+ * arch/powerpc/galileo/EVB64460/mv64460_eth.c - Driver for MV64460X ethernet ports
* Copyright (C) 2002 rabeeh@galileo.co.il
* This program is free software; you can redistribute it and/or
diff --git a/board/Marvell/db64460/u-boot.lds b/board/Marvell/db64460/u-boot.lds
index 6dff003dc1f..29dcc091005 100644
--- a/board/Marvell/db64460/u-boot.lds
+++ b/board/Marvell/db64460/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds
index f7de95dc879..3f92a9dc438 100644
--- a/board/RPXClassic/u-boot.lds
+++ b/board/RPXClassic/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug
index 57cc3058686..c21890542f6 100644
--- a/board/RPXClassic/u-boot.lds.debug
+++ b/board/RPXClassic/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds
index f7de95dc879..3f92a9dc438 100644
--- a/board/RPXlite/u-boot.lds
+++ b/board/RPXlite/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug
index 57cc3058686..c21890542f6 100644
--- a/board/RPXlite/u-boot.lds.debug
+++ b/board/RPXlite/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds
index a2db9a6288e..6bff2a800b8 100644
--- a/board/RPXlite_dw/u-boot.lds
+++ b/board/RPXlite_dw/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug
index 723f5629114..a78d0b76bee 100644
--- a/board/RPXlite_dw/u-boot.lds.debug
+++ b/board/RPXlite_dw/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds
index b323768fb0f..e426247c908 100644
--- a/board/RRvision/u-boot.lds
+++ b/board/RRvision/u-boot.lds
@@ -55,15 +55,15 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = env_offset;
common/env_embedded.o (.ppcenv)
diff --git a/board/adder/u-boot.lds b/board/adder/u-boot.lds
index 018bcf1a26f..dc6dd7ae66f 100644
--- a/board/adder/u-boot.lds
+++ b/board/adder/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/board/amcc/acadia/u-boot-nand.lds b/board/amcc/acadia/u-boot-nand.lds
index bfca582715e..e256b198d69 100644
--- a/board/amcc/acadia/u-boot-nand.lds
+++ b/board/amcc/acadia/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x4000);
diff --git a/board/amcc/bamboo/u-boot-nand.lds b/board/amcc/bamboo/u-boot-nand.lds
index bfca582715e..e256b198d69 100644
--- a/board/amcc/bamboo/u-boot-nand.lds
+++ b/board/amcc/bamboo/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x4000);
diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c
index 71a57019166..23874d2667d 100644
--- a/board/amcc/canyonlands/canyonlands.c
+++ b/board/amcc/canyonlands/canyonlands.c
@@ -42,7 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define BOARD_ARCHES 4
/*
- * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c with
* board specific values.
*/
#if defined(CONFIG_ARCHES)
diff --git a/board/amcc/canyonlands/u-boot-nand.lds b/board/amcc/canyonlands/u-boot-nand.lds
index b04b05e38af..c71f0b7c0af 100644
--- a/board/amcc/canyonlands/u-boot-nand.lds
+++ b/board/amcc/canyonlands/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x20000);
diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c
index 15291f96b57..0bbc75e7cf2 100644
--- a/board/amcc/katmai/katmai.c
+++ b/board/amcc/katmai/katmai.c
@@ -249,7 +249,7 @@ int checkboard (void)
}
/*
- * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c with
* board specific values.
*/
u32 ddr_wrdtr(u32 default_val) {
diff --git a/board/amcc/kilauea/u-boot-nand.lds b/board/amcc/kilauea/u-boot-nand.lds
index bfca582715e..e256b198d69 100644
--- a/board/amcc/kilauea/u-boot-nand.lds
+++ b/board/amcc/kilauea/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x4000);
diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c
index 6542565f08a..4e12e9af12a 100644
--- a/board/amcc/luan/luan.c
+++ b/board/amcc/luan/luan.c
@@ -119,7 +119,7 @@ int checkboard(void)
}
/*
- * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c with
* board specific values.
*/
u32 ddr_clktr(u32 default_val) {
diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c
index b5c7d6d5063..cabeceb97a8 100644
--- a/board/amcc/sequoia/sdram.c
+++ b/board/amcc/sequoia/sdram.c
@@ -40,7 +40,7 @@ extern int denali_wait_for_dlllock(void);
extern void denali_core_search_data_eye(void);
#if defined(CONFIG_NAND_SPL)
-/* Using arch/ppc/cpu/ppc4xx/speed.c to calculate the bus frequency is too big
+/* Using arch/powerpc/cpu/ppc4xx/speed.c to calculate the bus frequency is too big
* for the 4k NAND boot image so define bus_frequency to 133MHz here
* which is save for the refresh counter setup.
*/
diff --git a/board/amcc/sequoia/u-boot-nand.lds b/board/amcc/sequoia/u-boot-nand.lds
index 8a71bfa44ef..cf4229a22e0 100644
--- a/board/amcc/sequoia/u-boot-nand.lds
+++ b/board/amcc/sequoia/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x4000);
diff --git a/board/amcc/sequoia/u-boot-ram.lds b/board/amcc/sequoia/u-boot-ram.lds
index c6a321e400e..63e87c98863 100644
--- a/board/amcc/sequoia/u-boot-ram.lds
+++ b/board/amcc/sequoia/u-boot-ram.lds
@@ -50,7 +50,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c
index 241f4844913..0d23929903e 100644
--- a/board/amcc/yucca/yucca.c
+++ b/board/amcc/yucca/yucca.c
@@ -555,7 +555,7 @@ int checkboard (void)
}
/*
- * Override the default functions in arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c with
+ * Override the default functions in arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c with
* board specific values.
*/
static int ppc440spe_rev_a(void)
diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds
index faeefe8bdde..bebcded6194 100644
--- a/board/amirix/ap1000/u-boot.lds
+++ b/board/amirix/ap1000/u-boot.lds
@@ -55,17 +55,17 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
board/amirix/ap1000/init.o (.text)
- arch/ppc/cpu/ppc4xx/kgdb.o (.text)
- arch/ppc/cpu/ppc4xx/traps.o (.text)
- arch/ppc/cpu/ppc4xx/interrupts.o (.text)
- arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
- arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
- arch/ppc/cpu/ppc4xx/speed.o (.text)
+ arch/powerpc/cpu/ppc4xx/kgdb.o (.text)
+ arch/powerpc/cpu/ppc4xx/traps.o (.text)
+ arch/powerpc/cpu/ppc4xx/interrupts.o (.text)
+ arch/powerpc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/powerpc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/powerpc/cpu/ppc4xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
lib/zlib.o (.text)
/* . = env_offset;*/
diff --git a/board/bmw/ns16550.c b/board/bmw/ns16550.c
index 7250591030a..be455bbefe9 100644
--- a/board/bmw/ns16550.c
+++ b/board/bmw/ns16550.c
@@ -1,6 +1,6 @@
/*
* COM1 NS16550 support
- * originally from linux source (arch/ppc/boot/ns16550.c)
+ * originally from linux source (arch/powerpc/boot/ns16550.c)
* modified to use CONFIG_SYS_ISA_MEM and new defines
*/
diff --git a/board/bmw/ns16550.h b/board/bmw/ns16550.h
index 210aea4b2fd..8aa251d32a3 100644
--- a/board/bmw/ns16550.h
+++ b/board/bmw/ns16550.h
@@ -1,6 +1,6 @@
/*
* NS16550 Serial Port
- * originally from linux source (arch/ppc/boot/ns16550.h)
+ * originally from linux source (arch/powerpc/boot/ns16550.h)
* modified slightly to
* have addresses as offsets from CONFIG_SYS_ISA_BASE
* added a few more definitions
diff --git a/board/c2mon/u-boot.lds b/board/c2mon/u-boot.lds
index 5bd5a75c619..36dd55dee45 100644
--- a/board/c2mon/u-boot.lds
+++ b/board/c2mon/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/c2mon/u-boot.lds.debug b/board/c2mon/u-boot.lds.debug
index e62f6be5aa5..99098bffbed 100644
--- a/board/c2mon/u-boot.lds.debug
+++ b/board/c2mon/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/cm5200/u-boot.lds b/board/cm5200/u-boot.lds
index 30a37d9fb24..2d8492e6ffc 100644
--- a/board/cm5200/u-boot.lds
+++ b/board/cm5200/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc5xxx/start.o (.text)
+ arch/powerpc/cpu/mpc5xxx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug
index 57cc3058686..c21890542f6 100644
--- a/board/cogent/u-boot.lds.debug
+++ b/board/cogent/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug
index 09c0191e5f6..0e9cdcf81d7 100644
--- a/board/cray/L1/u-boot.lds.debug
+++ b/board/cray/L1/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
common/env_embedded.o(.text)
diff --git a/board/csb272/csb272.c b/board/csb272/csb272.c
index 5a00afe402c..1ed3e1b6a4e 100644
--- a/board/csb272/csb272.c
+++ b/board/csb272/csb272.c
@@ -129,7 +129,7 @@ phys_size_t initdram (int board_type)
/*
* ToDo: Move the asm init routine sdram_init() to this C file,
* or even better use some common ppc4xx code available
- * in arch/ppc/cpu/ppc4xx
+ * in arch/powerpc/cpu/ppc4xx
*/
sdram_init();
diff --git a/board/csb472/csb472.c b/board/csb472/csb472.c
index 996a67b4edc..c138b0d9e81 100644
--- a/board/csb472/csb472.c
+++ b/board/csb472/csb472.c
@@ -97,7 +97,7 @@ phys_size_t initdram (int board_type)
/*
* ToDo: Move the asm init routine sdram_init() to this C file,
* or even better use some common ppc4xx code available
- * in arch/ppc/cpu/ppc4xx
+ * in arch/powerpc/cpu/ppc4xx
*/
sdram_init();
diff --git a/board/eltec/bab7xx/u-boot.lds b/board/eltec/bab7xx/u-boot.lds
index 6dff003dc1f..29dcc091005 100644
--- a/board/eltec/bab7xx/u-boot.lds
+++ b/board/eltec/bab7xx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/eltec/elppc/u-boot.lds b/board/eltec/elppc/u-boot.lds
index 6dff003dc1f..29dcc091005 100644
--- a/board/eltec/elppc/u-boot.lds
+++ b/board/eltec/elppc/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/eltec/mhpc/u-boot.lds b/board/eltec/mhpc/u-boot.lds
index dc370eacf22..9fe9758c476 100644
--- a/board/eltec/mhpc/u-boot.lds
+++ b/board/eltec/mhpc/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug
index e62f6be5aa5..99098bffbed 100644
--- a/board/eltec/mhpc/u-boot.lds.debug
+++ b/board/eltec/mhpc/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/emk/top860/u-boot.lds b/board/emk/top860/u-boot.lds
index 3fb6d126921..4f986f72c1d 100644
--- a/board/emk/top860/u-boot.lds
+++ b/board/emk/top860/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index 3229a23a3eb..0f536f31429 100644
--- a/board/emk/top860/u-boot.lds.debug
+++ b/board/emk/top860/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/ep88x/u-boot.lds b/board/ep88x/u-boot.lds
index f9579a64302..172caa5569b 100644
--- a/board/ep88x/u-boot.lds
+++ b/board/ep88x/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/board/eric/eric.c b/board/eric/eric.c
index 96c0b8385d4..d4312049390 100644
--- a/board/eric/eric.c
+++ b/board/eric/eric.c
@@ -132,7 +132,7 @@ phys_size_t initdram (int board_type)
/*
* ToDo: Move the asm init routine sdram_init() to this C file,
* or even better use some common ppc4xx code available
- * in arch/ppc/cpu/ppc4xx
+ * in arch/powerpc/cpu/ppc4xx
*/
sdram_init();
diff --git a/board/esd/cpci750/mv_eth.c b/board/esd/cpci750/mv_eth.c
index 1c215277cf8..dedf73455d8 100644
--- a/board/esd/cpci750/mv_eth.c
+++ b/board/esd/cpci750/mv_eth.c
@@ -1062,7 +1062,7 @@ bool db64360_eth_start (struct eth_device *dev)
*************************************************************************/
/*
* based on Linux code
- * arch/ppc/galileo/EVB64360/mv64360_eth.c - Driver for MV64360X ethernet ports
+ * arch/powerpc/galileo/EVB64360/mv64360_eth.c - Driver for MV64360X ethernet ports
* Copyright (C) 2002 rabeeh@galileo.co.il
* This program is free software; you can redistribute it and/or
diff --git a/board/esd/cpci750/u-boot.lds b/board/esd/cpci750/u-boot.lds
index 6dff003dc1f..29dcc091005 100644
--- a/board/esd/cpci750/u-boot.lds
+++ b/board/esd/cpci750/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/esd/dasa_sim/u-boot.lds b/board/esd/dasa_sim/u-boot.lds
index 3d33d0f0222..0e1d625a1b7 100644
--- a/board/esd/dasa_sim/u-boot.lds
+++ b/board/esd/dasa_sim/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/esd/pmc440/u-boot-nand.lds b/board/esd/pmc440/u-boot-nand.lds
index 8a71bfa44ef..cf4229a22e0 100644
--- a/board/esd/pmc440/u-boot-nand.lds
+++ b/board/esd/pmc440/u-boot-nand.lds
@@ -53,7 +53,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
/* Align to next NAND block */
. = ALIGN(0x4000);
diff --git a/board/esteem192e/u-boot.lds b/board/esteem192e/u-boot.lds
index 4490f19a1f0..5b6a9c0a1f7 100644
--- a/board/esteem192e/u-boot.lds
+++ b/board/esteem192e/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/etx094/u-boot.lds b/board/etx094/u-boot.lds
index 94b13422afb..28ac825c196 100644
--- a/board/etx094/u-boot.lds
+++ b/board/etx094/u-boot.lds
@@ -55,12 +55,12 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
- arch/ppc/cpu/mpc8xx/interrupts.o (.text)
- arch/ppc/cpu/mpc8xx/serial.o (.text)
- arch/ppc/cpu/mpc8xx/cpu_init.o (.text)
- arch/ppc/cpu/mpc8xx/speed.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/interrupts.o (.text)
+ arch/powerpc/cpu/mpc8xx/serial.o (.text)
+ arch/powerpc/cpu/mpc8xx/cpu_init.o (.text)
+ arch/powerpc/cpu/mpc8xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/etx094/u-boot.lds.debug b/board/etx094/u-boot.lds.debug
index 458d4e076cd..be05d8fdcc6 100644
--- a/board/etx094/u-boot.lds.debug
+++ b/board/etx094/u-boot.lds.debug
@@ -55,15 +55,15 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
- arch/ppc/cpu/mpc8xx/interrupts.o (.text)
- arch/ppc/cpu/mpc8xx/cpu.o (.text)
- arch/ppc/cpu/mpc8xx/cpu_init.o (.text)
- arch/ppc/cpu/mpc8xx/speed.o (.text)
- arch/ppc/cpu/mpc8xx/serial.o (.text)
- arch/ppc/lib/extable.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/interrupts.o (.text)
+ arch/powerpc/cpu/mpc8xx/cpu.o (.text)
+ arch/powerpc/cpu/mpc8xx/cpu_init.o (.text)
+ arch/powerpc/cpu/mpc8xx/speed.o (.text)
+ arch/powerpc/cpu/mpc8xx/serial.o (.text)
+ arch/powerpc/lib/extable.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/string.o (.text)
lib/crc32.o (.text)
common/dlmalloc.o (.text)
diff --git a/board/evb64260/u-boot.lds b/board/evb64260/u-boot.lds
index 6dff003dc1f..29dcc091005 100644
--- a/board/evb64260/u-boot.lds
+++ b/board/evb64260/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/fads/u-boot.lds b/board/fads/u-boot.lds
index d6476cdb715..100c9804da6 100644
--- a/board/fads/u-boot.lds
+++ b/board/fads/u-boot.lds
@@ -50,7 +50,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
/*. = DEFINED(env_offset) ? env_offset : .;*/
common/env_embedded.o (.ppcenv)
diff --git a/board/fads/u-boot.lds.debug b/board/fads/u-boot.lds.debug
index 61c0d68d781..a7a67a9276f 100644
--- a/board/fads/u-boot.lds.debug
+++ b/board/fads/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/flagadm/u-boot.lds b/board/flagadm/u-boot.lds
index fbfba6ec9a1..0da55d97911 100644
--- a/board/flagadm/u-boot.lds
+++ b/board/flagadm/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug
index e62f6be5aa5..99098bffbed 100644
--- a/board/flagadm/u-boot.lds.debug
+++ b/board/flagadm/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/freescale/mpc7448hpc2/tsi108_init.c b/board/freescale/mpc7448hpc2/tsi108_init.c
index c6a3ade2c37..e1c63f8e375 100644
--- a/board/freescale/mpc7448hpc2/tsi108_init.c
+++ b/board/freescale/mpc7448hpc2/tsi108_init.c
@@ -323,7 +323,7 @@ int board_early_init_r (void)
* We will over-ride the env_init called in board_init_f
* This is really a work-around because, the HLP bank 1
* where NVRAM resides is not visible during board_init_f
- * (arch/ppc/lib/board.c)
+ * (arch/powerpc/lib/board.c)
* Alternatively, we could use the I2C EEPROM at start-up to configure
* and enable all HLP banks and not just HLP 0 as is being done for
* Taiga Rev. 2.
diff --git a/board/freescale/mpc7448hpc2/u-boot.lds b/board/freescale/mpc7448hpc2/u-boot.lds
index c4266cec504..3b3fb3a5c38 100644
--- a/board/freescale/mpc7448hpc2/u-boot.lds
+++ b/board/freescale/mpc7448hpc2/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/freescale/mpc8610hpcd/u-boot.lds b/board/freescale/mpc8610hpcd/u-boot.lds
index 1f9f8eb9491..9c98b2a3cf8 100644
--- a/board/freescale/mpc8610hpcd/u-boot.lds
+++ b/board/freescale/mpc8610hpcd/u-boot.lds
@@ -50,15 +50,15 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc86xx/start.o (.text)
- arch/ppc/cpu/mpc86xx/traps.o (.text)
- arch/ppc/cpu/mpc86xx/interrupts.o (.text)
- arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
- arch/ppc/cpu/mpc86xx/cpu.o (.text)
- arch/ppc/cpu/mpc86xx/speed.o (.text)
+ arch/powerpc/cpu/mpc86xx/start.o (.text)
+ arch/powerpc/cpu/mpc86xx/traps.o (.text)
+ arch/powerpc/cpu/mpc86xx/interrupts.o (.text)
+ arch/powerpc/cpu/mpc86xx/cpu_init.o (.text)
+ arch/powerpc/cpu/mpc86xx/cpu.o (.text)
+ arch/powerpc/cpu/mpc86xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
lib/zlib.o (.text)
*(.text)
*(.got1)
diff --git a/board/freescale/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds
index d7c65ce2176..5bf0f2d46b5 100644
--- a/board/freescale/mpc8641hpcn/u-boot.lds
+++ b/board/freescale/mpc8641hpcn/u-boot.lds
@@ -50,15 +50,15 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc86xx/start.o (.text)
- arch/ppc/cpu/mpc86xx/traps.o (.text)
- arch/ppc/cpu/mpc86xx/interrupts.o (.text)
- arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
- arch/ppc/cpu/mpc86xx/cpu.o (.text)
- arch/ppc/cpu/mpc86xx/speed.o (.text)
+ arch/powerpc/cpu/mpc86xx/start.o (.text)
+ arch/powerpc/cpu/mpc86xx/traps.o (.text)
+ arch/powerpc/cpu/mpc86xx/interrupts.o (.text)
+ arch/powerpc/cpu/mpc86xx/cpu_init.o (.text)
+ arch/powerpc/cpu/mpc86xx/cpu.o (.text)
+ arch/powerpc/cpu/mpc86xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
lib/zlib.o (.text)
drivers/bios_emulator/atibios.o (.text)
*(.text)
diff --git a/board/gen860t/ioport.c b/board/gen860t/ioport.c
index 146573e1df7..8d4692533f6 100644
--- a/board/gen860t/ioport.c
+++ b/board/gen860t/ioport.c
@@ -197,7 +197,7 @@ const mpc8xx_iop_conf_t iop_conf_tab[NUM_PORTS][PORT_BITS] = {
/*
* Configure the MPC8XX I/O ports per the ioport configuration table
- * (taken from ./arch/ppc/cpu/mpc8260/cpu_init.c)
+ * (taken from ./arch/powerpc/cpu/mpc8260/cpu_init.c)
*/
void config_mpc8xx_ioports (volatile immap_t * immr)
{
diff --git a/board/gen860t/u-boot-flashenv.lds b/board/gen860t/u-boot-flashenv.lds
index 0e129253e7f..35e92d11140 100644
--- a/board/gen860t/u-boot-flashenv.lds
+++ b/board/gen860t/u-boot-flashenv.lds
@@ -55,7 +55,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
}
diff --git a/board/gen860t/u-boot.lds b/board/gen860t/u-boot.lds
index d184379dbc6..a4c30321168 100644
--- a/board/gen860t/u-boot.lds
+++ b/board/gen860t/u-boot.lds
@@ -54,7 +54,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
}
diff --git a/board/genietv/u-boot.lds b/board/genietv/u-boot.lds
index 22ada9ae1d7..bcfdd87af42 100644
--- a/board/genietv/u-boot.lds
+++ b/board/genietv/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug
index e5aa625b5ca..60936aaf34e 100644
--- a/board/genietv/u-boot.lds.debug
+++ b/board/genietv/u-boot.lds.debug
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/gth/u-boot.lds b/board/gth/u-boot.lds
index 0e68e141427..4145a91c744 100644
--- a/board/gth/u-boot.lds
+++ b/board/gth/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o(.text)
+ arch/powerpc/cpu/mpc8xx/start.o(.text)
*(.text)
common/env_embedded.o(.text)
*(.got1)
diff --git a/board/hermes/u-boot.lds b/board/hermes/u-boot.lds
index 23e3e3bc5ea..e121d65f7bc 100644
--- a/board/hermes/u-boot.lds
+++ b/board/hermes/u-boot.lds
@@ -55,12 +55,12 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/cpu/mpc8xx/interrupts.o (.text)
- arch/ppc/lib/time.o (.text)
- arch/ppc/lib/ticks.o (.text)
- arch/ppc/lib/cache.o (.text)
+ arch/powerpc/cpu/mpc8xx/interrupts.o (.text)
+ arch/powerpc/lib/time.o (.text)
+ arch/powerpc/lib/ticks.o (.text)
+ arch/powerpc/lib/cache.o (.text)
lib/crc32.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug
index 47e3927ec6e..7038ebc1dcd 100644
--- a/board/hermes/u-boot.lds.debug
+++ b/board/hermes/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
- arch/ppc/cpu/mpc8xx/interrupts.o (.text)
- arch/ppc/lib/time.o (.text)
- arch/ppc/lib/ticks.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
+ arch/powerpc/cpu/mpc8xx/interrupts.o (.text)
+ arch/powerpc/lib/time.o (.text)
+ arch/powerpc/lib/ticks.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/hmi1001/config.mk b/board/hmi1001/config.mk
index aebf30411e4..8ccf33e15c5 100644
--- a/board/hmi1001/config.mk
+++ b/board/hmi1001/config.mk
@@ -39,4 +39,4 @@ TEXT_BASE = 0xFFF00000
endif
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index 7086ced3486..0897715a94c 100644
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -55,10 +55,10 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8260/start.o (.text)
+ arch/powerpc/cpu/mpc8260/start.o (.text)
/*
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug
index 57cc3058686..c21890542f6 100644
--- a/board/hymod/u-boot.lds.debug
+++ b/board/hymod/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/icu862/u-boot.lds b/board/icu862/u-boot.lds
index d6837005f6c..7c5278adae7 100644
--- a/board/icu862/u-boot.lds
+++ b/board/icu862/u-boot.lds
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
/*
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug
index b331d5afc16..9c1e3ecd8ae 100644
--- a/board/icu862/u-boot.lds.debug
+++ b/board/icu862/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/inka4x0/config.mk b/board/inka4x0/config.mk
index 761efa1d172..9f6fb3b6805 100644
--- a/board/inka4x0/config.mk
+++ b/board/inka4x0/config.mk
@@ -39,4 +39,4 @@ TEXT_BASE = 0xFFE00000
endif
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds
index d8560423734..4ac77c29850 100644
--- a/board/ip860/u-boot.lds
+++ b/board/ip860/u-boot.lds
@@ -55,12 +55,12 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
- arch/ppc/cpu/mpc8xx/interrupts.o (.text)
- arch/ppc/lib/time.o (.text)
- arch/ppc/lib/ticks.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
+ arch/powerpc/cpu/mpc8xx/interrupts.o (.text)
+ arch/powerpc/lib/time.o (.text)
+ arch/powerpc/lib/ticks.o (.text)
/**
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug
index dd39b9ac79d..0c0bbb8f5db 100644
--- a/board/ip860/u-boot.lds.debug
+++ b/board/ip860/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
- arch/ppc/cpu/mpc8xx/interrupts.o (.text)
- arch/ppc/lib/time.o (.text)
- arch/ppc/lib/ticks.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
+ arch/powerpc/cpu/mpc8xx/interrupts.o (.text)
+ arch/powerpc/lib/time.o (.text)
+ arch/powerpc/lib/ticks.o (.text)
/**
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/ivm/u-boot.lds b/board/ivm/u-boot.lds
index 767408b52ba..b6e08843fa6 100644
--- a/board/ivm/u-boot.lds
+++ b/board/ivm/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
*(.got1)
diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug
index 5ec82f441dd..6bcf167a0a3 100644
--- a/board/ivm/u-boot.lds.debug
+++ b/board/ivm/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/jse/jse.c b/board/jse/jse.c
index e4c7b9dd94a..fb39c841690 100644
--- a/board/jse/jse.c
+++ b/board/jse/jse.c
@@ -26,7 +26,7 @@
/*
* This function is run very early, out of flash, and before devices are
- * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue
+ * initialized. It is called by arch/powerpc/lib/board.c:board_init_f by virtue
* of being in the init_sequence array.
*
* The SDRAM has been initialized already -- start.S:start called
@@ -85,7 +85,7 @@ int board_pre_init (void)
#endif
/*
- * This function is also called by arch/ppc/lib/board.c:board_init_f (it is
+ * This function is also called by arch/powerpc/lib/board.c:board_init_f (it is
* also in the init_sequence array) but later. Many more things are
* configured, but we are still running from flash.
*/
@@ -149,7 +149,7 @@ int checkboard (void)
/* **** No more functions called by board_init_f. **** */
/*
- * This function is called by arch/ppc/lib/board.c:board_init_r. At this
+ * This function is called by arch/powerpc/lib/board.c:board_init_r. At this
* point, basic setup is done, U-Boot has been moved into SDRAM and
* PCI has been set up. From here we done late setup.
*/
diff --git a/board/jse/sdram.c b/board/jse/sdram.c
index a12ebde2367..02eb6f2c3c5 100644
--- a/board/jse/sdram.c
+++ b/board/jse/sdram.c
@@ -27,7 +27,7 @@
/*
* this is even after checkboard. It returns the size of the SDRAM
* that we have installed. This function is called by board_init_f
- * in arch/ppc/lib/board.c to initialize the memory and return what I
+ * in arch/powerpc/lib/board.c to initialize the memory and return what I
* found.
*/
phys_size_t initdram (int board_type)
diff --git a/board/keymile/common/keymile_hdlc_enet.c b/board/keymile/common/keymile_hdlc_enet.c
index ceddaf752e4..ce5e4d6a45e 100644
--- a/board/keymile/common/keymile_hdlc_enet.c
+++ b/board/keymile/common/keymile_hdlc_enet.c
@@ -2,7 +2,7 @@
* (C) Copyright 2008
* Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de.
*
- * Based in part on arch/ppc/cpu/mpc8260/ether_scc.c.
+ * Based in part on arch/powerpc/cpu/mpc8260/ether_scc.c.
*
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/board/keymile/km8xx/km8xx_hdlc_enet.c b/board/keymile/km8xx/km8xx_hdlc_enet.c
index 543deafb9ee..04782884e43 100644
--- a/board/keymile/km8xx/km8xx_hdlc_enet.c
+++ b/board/keymile/km8xx/km8xx_hdlc_enet.c
@@ -2,7 +2,7 @@
* (C) Copyright 2008
* Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de.
*
- * Based in part on arch/ppc/cpu/mpc8xx/scc.c.
+ * Based in part on arch/powerpc/cpu/mpc8xx/scc.c.
*
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/board/keymile/km8xx/u-boot.lds b/board/keymile/km8xx/u-boot.lds
index 19936bd4b18..cba9c6c6814 100644
--- a/board/keymile/km8xx/u-boot.lds
+++ b/board/keymile/km8xx/u-boot.lds
@@ -55,15 +55,15 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv)
diff --git a/board/keymile/mgcoge/mgcoge_hdlc_enet.c b/board/keymile/mgcoge/mgcoge_hdlc_enet.c
index 6b8e7eaf7e6..98f68a66081 100644
--- a/board/keymile/mgcoge/mgcoge_hdlc_enet.c
+++ b/board/keymile/mgcoge/mgcoge_hdlc_enet.c
@@ -2,7 +2,7 @@
* (C) Copyright 2008
* Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de.
*
- * Based in part on arch/ppc/cpu/mpc8260/ether_scc.c.
+ * Based in part on arch/powerpc/cpu/mpc8260/ether_scc.c.
*
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/board/korat/u-boot-F7FC.lds b/board/korat/u-boot-F7FC.lds
index e483394539d..4d73180cd15 100644
--- a/board/korat/u-boot-F7FC.lds
+++ b/board/korat/u-boot-F7FC.lds
@@ -33,7 +33,7 @@ SECTIONS
.bootpg 0xF7FBF000 :
{
- arch/ppc/cpu/ppc4xx/start.o (.bootpg)
+ arch/powerpc/cpu/ppc4xx/start.o (.bootpg)
} = 0xffff
/* Read-only sections, merged into text segment: */
@@ -65,7 +65,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/board/kup/kup4k/u-boot.lds b/board/kup/kup4k/u-boot.lds
index 18cecaf5109..369ef19a473 100644
--- a/board/kup/kup4k/u-boot.lds
+++ b/board/kup/kup4k/u-boot.lds
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
/*
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug
index 723f5629114..a78d0b76bee 100644
--- a/board/kup/kup4k/u-boot.lds.debug
+++ b/board/kup/kup4k/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/kup/kup4x/u-boot.lds b/board/kup/kup4x/u-boot.lds
index 18cecaf5109..369ef19a473 100644
--- a/board/kup/kup4x/u-boot.lds
+++ b/board/kup/kup4x/u-boot.lds
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
/*
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug
index 723f5629114..a78d0b76bee 100644
--- a/board/kup/kup4x/u-boot.lds.debug
+++ b/board/kup/kup4x/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/lantec/u-boot.lds b/board/lantec/u-boot.lds
index 160f5cf386d..9fd4d1c61c8 100644
--- a/board/lantec/u-boot.lds
+++ b/board/lantec/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/lantec/u-boot.lds.debug b/board/lantec/u-boot.lds.debug
index 172482f880d..deea7e29fc1 100644
--- a/board/lantec/u-boot.lds.debug
+++ b/board/lantec/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/logicpd/zoom2/zoom2_serial.c b/board/logicpd/zoom2/zoom2_serial.c
index cfbad13478a..fcfe6247d04 100644
--- a/board/logicpd/zoom2/zoom2_serial.c
+++ b/board/logicpd/zoom2/zoom2_serial.c
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- * This file was adapted from arch/ppc/cpu/mpc5xxx/serial.c
+ * This file was adapted from arch/powerpc/cpu/mpc5xxx/serial.c
*
*/
diff --git a/board/lwmon/u-boot.lds b/board/lwmon/u-boot.lds
index ff2f56640b3..b871958f1ba 100644
--- a/board/lwmon/u-boot.lds
+++ b/board/lwmon/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
*(.got1)
diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug
index fcf2cbb96d1..131ad23c77c 100644
--- a/board/lwmon/u-boot.lds.debug
+++ b/board/lwmon/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/matrix_vision/mvsmr/u-boot.lds b/board/matrix_vision/mvsmr/u-boot.lds
index cfbb6ef3988..3e917a99c2e 100644
--- a/board/matrix_vision/mvsmr/u-boot.lds
+++ b/board/matrix_vision/mvsmr/u-boot.lds
@@ -55,11 +55,11 @@ SECTIONS
{
/* WARNING - the following is hand-optimized to fit within */
/* the first two sectors (=8KB) of our S29GL flash chip */
- cpu/mpc5xxx/start.o (.text)
- cpu/mpc5xxx/traps.o (.text)
- lib_generic/crc32.o (.text)
- lib_ppc/cache.o (.text)
- lib_ppc/time.o (.text)
+ arch/powerpc/cpu/mpc5xxx/start.o (.text)
+ arch/powerpc/cpu/mpc5xxx/traps.o (.text)
+ lib/crc32.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
/* This is only needed to force failure if size of above code will ever */
/* increase and grow into reserved space. */
diff --git a/board/mbx8xx/u-boot.lds b/board/mbx8xx/u-boot.lds
index 3572f1ad322..f883e7f0246 100644
--- a/board/mbx8xx/u-boot.lds
+++ b/board/mbx8xx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug
index 61c0d68d781..a7a67a9276f 100644
--- a/board/mbx8xx/u-boot.lds.debug
+++ b/board/mbx8xx/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/mbx8xx/vpd.c b/board/mbx8xx/vpd.c
index 3bc251d12d7..1c99fd6c751 100644
--- a/board/mbx8xx/vpd.c
+++ b/board/mbx8xx/vpd.c
@@ -3,7 +3,7 @@
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Marius Groeger <mgroeger@sysgo.de>
*
- * Code in faintly related to linux/arch/ppc/8xx_io:
+ * Code in faintly related to linux/arch/powerpc/8xx_io:
* MPC8xx CPM I2C interface. Copyright (c) 1999 Dan Malek (dmalek@jlc.net).
*
* This file implements functions to read the MBX's Vital Product Data
diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds
index e382283ea25..950f857976c 100644
--- a/board/ml2/u-boot.lds
+++ b/board/ml2/u-boot.lds
@@ -55,17 +55,17 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
board/ml2/init.o (.text)
- arch/ppc/cpu/ppc4xx/kgdb.o (.text)
- arch/ppc/cpu/ppc4xx/traps.o (.text)
- arch/ppc/cpu/ppc4xx/interrupts.o (.text)
- arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
- arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
- arch/ppc/cpu/ppc4xx/speed.o (.text)
+ arch/powerpc/cpu/ppc4xx/kgdb.o (.text)
+ arch/powerpc/cpu/ppc4xx/traps.o (.text)
+ arch/powerpc/cpu/ppc4xx/interrupts.o (.text)
+ arch/powerpc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/powerpc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/powerpc/cpu/ppc4xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
lib/zlib.o (.text)
/* . = env_offset;*/
diff --git a/board/ml2/u-boot.lds.debug b/board/ml2/u-boot.lds.debug
index 09c0191e5f6..0e9cdcf81d7 100644
--- a/board/ml2/u-boot.lds.debug
+++ b/board/ml2/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
common/env_embedded.o(.text)
diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index ed5492d45ed..0116dde4df2 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -52,9 +52,9 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc824x/start.o (.text)
- arch/ppc/lib/board.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/cpu/mpc824x/start.o (.text)
+ arch/powerpc/lib/board.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/mousse/u-boot.lds.ram b/board/mousse/u-boot.lds.ram
index d3169489b5a..449d0645e49 100644
--- a/board/mousse/u-boot.lds.ram
+++ b/board/mousse/u-boot.lds.ram
@@ -37,7 +37,7 @@ SECTIONS
PROVIDE(_f_init_rom = .);
.init : {
- arch/ppc/cpu/mpc824x/start.o (.text)
+ arch/powerpc/cpu/mpc824x/start.o (.text)
*(.init)
} > ram
_init_size = SIZEOF(.init);
diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom
index 2721fdc6f8a..4f42b329d83 100644
--- a/board/mousse/u-boot.lds.rom
+++ b/board/mousse/u-boot.lds.rom
@@ -52,9 +52,9 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc824x/start.o (.text)
+ arch/powerpc/cpu/mpc824x/start.o (.text)
common/board.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug
index 09c0191e5f6..0e9cdcf81d7 100644
--- a/board/mpl/pip405/u-boot.lds.debug
+++ b/board/mpl/pip405/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
common/env_embedded.o(.text)
diff --git a/board/mucmc52/config.mk b/board/mucmc52/config.mk
index 4e9ee73e6a5..6850728331e 100644
--- a/board/mucmc52/config.mk
+++ b/board/mucmc52/config.mk
@@ -42,4 +42,4 @@ TEXT_BASE = 0xFFF00000
endif
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot.lds
diff --git a/board/munices/u-boot.lds b/board/munices/u-boot.lds
index 2cd6d3c1ad4..4e27bc947d5 100644
--- a/board/munices/u-boot.lds
+++ b/board/munices/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc5xxx/start.o (.text)
+ arch/powerpc/cpu/mpc5xxx/start.o (.text)
*(.text)
*(.got1)
. = ALIGN(16);
diff --git a/board/nc650/u-boot.lds b/board/nc650/u-boot.lds
index 90ca165c44a..e89a9bc9cd7 100644
--- a/board/nc650/u-boot.lds
+++ b/board/nc650/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
}
diff --git a/board/nc650/u-boot.lds.debug b/board/nc650/u-boot.lds.debug
index 1405b1730b9..770adf78917 100644
--- a/board/nc650/u-boot.lds.debug
+++ b/board/nc650/u-boot.lds.debug
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
*(.text)
*(.got1)
}
diff --git a/board/netphone/u-boot.lds b/board/netphone/u-boot.lds
index d6e2404f9a3..77aebe6b49a 100644
--- a/board/netphone/u-boot.lds
+++ b/board/netphone/u-boot.lds
@@ -52,15 +52,15 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug
index ec479b1533e..df7b6adba47 100644
--- a/board/netphone/u-boot.lds.debug
+++ b/board/netphone/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c
index 1c99405bea9..6fd6138223c 100644
--- a/board/netstal/hcu4/hcu4.c
+++ b/board/netstal/hcu4/hcu4.c
@@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR;
/*
* This function is run very early, out of flash, and before devices are
- * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue
+ * initialized. It is called by arch/powerpc/lib/board.c:board_init_f by virtue
* of being in the init_sequence array.
*
* The SDRAM has been initialized already -- start.S:start called
diff --git a/board/netstal/hcu5/README.txt b/board/netstal/hcu5/README.txt
index 0be51925c10..c5737d043a7 100644
--- a/board/netstal/hcu5/README.txt
+++ b/board/netstal/hcu5/README.txt
@@ -83,11 +83,11 @@ System-LEDs ??? (Analog zu HCU4 ???)
Startup sequence
----------------
-(arch/ppc/cpu/ppc4xx/resetvec.S)
+(arch/powerpc/cpu/ppc4xx/resetvec.S)
depending on configs option
call _start_440 _start_pci oder _start
-(arch/ppc/cpu/ppc4xx/start.S)
+(arch/powerpc/cpu/ppc4xx/start.S)
_start_440:
initialize register like
@@ -109,7 +109,7 @@ _start:
call cpu_init_f /* run low-level CPU init code (from Flash) */
call cpu_init_f
- board_init_f: (arch/ppc/lib\board.c)
+ board_init_f: (arch/powerpc/lib\board.c)
init_sequence defines a list of function to be called
board_early_init_f: (board/netstal/hcu5/hcu5.c)
We are using Bootstrap-Option A
@@ -136,18 +136,18 @@ _start:
* - board info struct
Save local variables to board info struct
call relocate_code() does not return
- relocate_code: (arch/ppc/cpu/ppc4xx/start.S)
+ relocate_code: (arch/powerpc/cpu/ppc4xx/start.S)
-------------------------------------------------------
From now on our copy is in RAM and we will run from there,
starting with board_init_r
-------------------------------------------------------
- board_init_r: (arch/ppc/lib\board.c)
+ board_init_r: (arch/powerpc/lib\board.c)
setup bd function pointers
trap_init
flash_init: (board/netstal/hcu5/flash.c)
/* setup for u-boot erase, update */
setup bd flash info
- cpu_init_r: (arch/ppc/cpu/ppc4xx/cpu_init.c)
+ cpu_init_r: (arch/powerpc/cpu/ppc4xx/cpu_init.c)
peripheral chip select in using defines like
CONFIG_SYS_EBC_PB0A, CONFIG_SYS_EBC_PB0C from hcu5.h
mem_malloc_init
@@ -161,8 +161,8 @@ From now on our copy is in RAM and we will run from there,
Most of the HW specific code for the HCU5 may be found in
include/configs/hcu5.h
board/netstal/hcu5/*
-arch/ppc/cpu/ppc4xx/*
-arch/ppc/lib/*
+arch/powerpc/cpu/ppc4xx/*
+arch/powerpc/lib/*
include/ppc440.h
Drivers for serial etc are found under drivers/
diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c
index 90433fe82d5..5eb8efc5242 100644
--- a/board/netstal/hcu5/hcu5.c
+++ b/board/netstal/hcu5/hcu5.c
@@ -49,7 +49,7 @@ extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
/*
* This function is run very early, out of flash, and before devices are
- * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue
+ * initialized. It is called by arch/powerpc/lib/board.c:board_init_f by virtue
* of being in the init_sequence array.
*
* The SDRAM has been initialized already -- start.S:start called
diff --git a/board/netstal/mcu25/mcu25.c b/board/netstal/mcu25/mcu25.c
index 87bc45edb42..ed28e209fa3 100644
--- a/board/netstal/mcu25/mcu25.c
+++ b/board/netstal/mcu25/mcu25.c
@@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR;
/*
* This function is run very early, out of flash, and before devices are
- * initialized. It is called by arch/ppc/lib/board.c:board_init_f by virtue
+ * initialized. It is called by arch/powerpc/lib/board.c:board_init_f by virtue
* of being in the init_sequence array.
*
* The SDRAM has been initialized already -- start.S:start called
diff --git a/board/netta/u-boot.lds b/board/netta/u-boot.lds
index c4df378c978..9001767ef7c 100644
--- a/board/netta/u-boot.lds
+++ b/board/netta/u-boot.lds
@@ -52,15 +52,15 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug
index ec479b1533e..df7b6adba47 100644
--- a/board/netta/u-boot.lds.debug
+++ b/board/netta/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/netta2/u-boot.lds b/board/netta2/u-boot.lds
index c4df378c978..9001767ef7c 100644
--- a/board/netta2/u-boot.lds
+++ b/board/netta2/u-boot.lds
@@ -52,15 +52,15 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug
index ec479b1533e..df7b6adba47 100644
--- a/board/netta2/u-boot.lds.debug
+++ b/board/netta2/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/netvia/u-boot.lds b/board/netvia/u-boot.lds
index 6683361ea42..d05f80bb36b 100644
--- a/board/netvia/u-boot.lds
+++ b/board/netvia/u-boot.lds
@@ -52,15 +52,15 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug
index cef1a428bd0..58202dc9f51 100644
--- a/board/netvia/u-boot.lds.debug
+++ b/board/netvia/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/nx823/u-boot.lds b/board/nx823/u-boot.lds
index dc370eacf22..9fe9758c476 100644
--- a/board/nx823/u-boot.lds
+++ b/board/nx823/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug
index e62f6be5aa5..99098bffbed 100644
--- a/board/nx823/u-boot.lds.debug
+++ b/board/nx823/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/pcippc2/u-boot.lds b/board/pcippc2/u-boot.lds
index b2be3281249..87d8c67949c 100644
--- a/board/pcippc2/u-boot.lds
+++ b/board/pcippc2/u-boot.lds
@@ -59,7 +59,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c
index bed385c44b8..a6885d68953 100644
--- a/board/pcs440ep/pcs440ep.c
+++ b/board/pcs440ep/pcs440ep.c
@@ -148,7 +148,7 @@ int board_early_init_f(void)
mtdcr(EBC0_CFGDATA, reg | 0x04000000); /* Set ATC */
/*--------------------------------------------------------------------
- * GPIO's are alreay setup in arch/ppc/cpu/ppc4xx/cpu_init.c
+ * GPIO's are alreay setup in arch/powerpc/cpu/ppc4xx/cpu_init.c
* via define from board config file.
*-------------------------------------------------------------------*/
diff --git a/board/ppmc7xx/u-boot.lds b/board/ppmc7xx/u-boot.lds
index aae10571603..604d0d305d2 100644
--- a/board/ppmc7xx/u-boot.lds
+++ b/board/ppmc7xx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/prodrive/p3mx/mv_eth.c b/board/prodrive/p3mx/mv_eth.c
index 8203b3cbf18..8fcc1551e53 100644
--- a/board/prodrive/p3mx/mv_eth.c
+++ b/board/prodrive/p3mx/mv_eth.c
@@ -1137,7 +1137,7 @@ bool db64460_eth_start (struct eth_device *dev)
*************************************************************************/
/*
* based on Linux code
- * arch/ppc/galileo/EVB64460/mv64460_eth.c - Driver for MV64460X ethernet ports
+ * arch/powerpc/galileo/EVB64460/mv64460_eth.c - Driver for MV64460X ethernet ports
* Copyright (C) 2002 rabeeh@galileo.co.il
* This program is free software; you can redistribute it and/or
diff --git a/board/prodrive/p3mx/u-boot.lds b/board/prodrive/p3mx/u-boot.lds
index 6dff003dc1f..29dcc091005 100644
--- a/board/prodrive/p3mx/u-boot.lds
+++ b/board/prodrive/p3mx/u-boot.lds
@@ -56,7 +56,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/74xx_7xx/start.o (.text)
+ arch/powerpc/cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */
diff --git a/board/quantum/u-boot.lds b/board/quantum/u-boot.lds
index f7de95dc879..3f92a9dc438 100644
--- a/board/quantum/u-boot.lds
+++ b/board/quantum/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug
index a2b7bc70d9e..f212fab28ad 100644
--- a/board/quantum/u-boot.lds.debug
+++ b/board/quantum/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/r360mpi/u-boot.lds b/board/r360mpi/u-boot.lds
index 4fc18fcf2d9..3cf0ba4bff8 100644
--- a/board/r360mpi/u-boot.lds
+++ b/board/r360mpi/u-boot.lds
@@ -55,10 +55,10 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/cpu_init.o (.text)
- arch/ppc/cpu/mpc8xx/interrupts.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/cpu_init.o (.text)
+ arch/powerpc/cpu/mpc8xx/interrupts.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
/***
. = env_offset;
common/env_embedded.o (.text)
diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index 2161501fff9..f188b979a3c 100644
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/rmu/u-boot.lds b/board/rmu/u-boot.lds
index f7de95dc879..3f92a9dc438 100644
--- a/board/rmu/u-boot.lds
+++ b/board/rmu/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/rmu/u-boot.lds.debug b/board/rmu/u-boot.lds.debug
index a2b7bc70d9e..f212fab28ad 100644
--- a/board/rmu/u-boot.lds.debug
+++ b/board/rmu/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds
index 0c51d481277..7763c7fed7b 100644
--- a/board/rsdproto/u-boot.lds
+++ b/board/rsdproto/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8260/start.o (.text)
+ arch/powerpc/cpu/mpc8260/start.o (.text)
*(.text)
*(.got1)
/*. = env_offset; */
diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c
index 007f875f0ff..d286714919a 100644
--- a/board/sandburst/common/ppc440gx_i2c.c
+++ b/board/sandburst/common/ppc440gx_i2c.c
@@ -21,7 +21,7 @@
*/
/*
- * Ported from arch/ppc/cpu/ppc4xx/i2c.c by AS HARNOIS by
+ * Ported from arch/powerpc/cpu/ppc4xx/i2c.c by AS HARNOIS by
* Travis B. Sawyer
* Sandburst Corporation.
*/
diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
index c1743985378..6b31b1e7ce3 100644
--- a/board/sandburst/karef/u-boot.lds.debug
+++ b/board/sandburst/karef/u-boot.lds.debug
@@ -56,18 +56,18 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
board/sandburst/karef/init.o (.text)
- arch/ppc/cpu/ppc4xx/kgdb.o (.text)
- arch/ppc/cpu/ppc4xx/traps.o (.text)
- arch/ppc/cpu/ppc4xx/interrupts.o (.text)
- arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
- arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
- arch/ppc/cpu/ppc4xx/speed.o (.text)
+ arch/powerpc/cpu/ppc4xx/kgdb.o (.text)
+ arch/powerpc/cpu/ppc4xx/traps.o (.text)
+ arch/powerpc/cpu/ppc4xx/interrupts.o (.text)
+ arch/powerpc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/powerpc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/powerpc/cpu/ppc4xx/speed.o (.text)
drivers/net/4xx_enet.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
lib/zlib.o (.text)
/* common/env_embedded.o(.text) */
diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug
index 845841607c1..2fb3ad97dcc 100644
--- a/board/sandburst/metrobox/u-boot.lds.debug
+++ b/board/sandburst/metrobox/u-boot.lds.debug
@@ -56,18 +56,18 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
board/sandburst/metrobox/init.o (.text)
- arch/ppc/cpu/ppc4xx/kgdb.o (.text)
- arch/ppc/cpu/ppc4xx/traps.o (.text)
- arch/ppc/cpu/ppc4xx/interrupts.o (.text)
- arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
- arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
- arch/ppc/cpu/ppc4xx/speed.o (.text)
+ arch/powerpc/cpu/ppc4xx/kgdb.o (.text)
+ arch/powerpc/cpu/ppc4xx/traps.o (.text)
+ arch/powerpc/cpu/ppc4xx/interrupts.o (.text)
+ arch/powerpc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/powerpc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/powerpc/cpu/ppc4xx/speed.o (.text)
drivers/net/4xx_enet.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
lib/zlib.o (.text)
/* common/env_embedded.o(.text) */
diff --git a/board/sbc8641d/u-boot.lds b/board/sbc8641d/u-boot.lds
index 2f8730bf2bb..4cea3b30f0f 100644
--- a/board/sbc8641d/u-boot.lds
+++ b/board/sbc8641d/u-boot.lds
@@ -50,15 +50,15 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc86xx/start.o (.text)
- arch/ppc/cpu/mpc86xx/traps.o (.text)
- arch/ppc/cpu/mpc86xx/interrupts.o (.text)
- arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
- arch/ppc/cpu/mpc86xx/cpu.o (.text)
- arch/ppc/cpu/mpc86xx/speed.o (.text)
+ arch/powerpc/cpu/mpc86xx/start.o (.text)
+ arch/powerpc/cpu/mpc86xx/traps.o (.text)
+ arch/powerpc/cpu/mpc86xx/interrupts.o (.text)
+ arch/powerpc/cpu/mpc86xx/cpu_init.o (.text)
+ arch/powerpc/cpu/mpc86xx/cpu.o (.text)
+ arch/powerpc/cpu/mpc86xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
lib/zlib.o (.text)
*(.text)
*(.got1)
diff --git a/board/sc3/u-boot.lds b/board/sc3/u-boot.lds
index 573fbee937a..9b1a39bc848 100644
--- a/board/sc3/u-boot.lds
+++ b/board/sc3/u-boot.lds
@@ -60,17 +60,17 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
board/sc3/init.o (.text)
- arch/ppc/cpu/ppc4xx/kgdb.o (.text)
- arch/ppc/cpu/ppc4xx/traps.o (.text)
- arch/ppc/cpu/ppc4xx/interrupts.o (.text)
- arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
- arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
- arch/ppc/cpu/ppc4xx/speed.o (.text)
+ arch/powerpc/cpu/ppc4xx/kgdb.o (.text)
+ arch/powerpc/cpu/ppc4xx/traps.o (.text)
+ arch/powerpc/cpu/ppc4xx/interrupts.o (.text)
+ arch/powerpc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/powerpc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/powerpc/cpu/ppc4xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
lib/zlib.o (.text)
/* . = env_offset;*/
diff --git a/board/siemens/CCM/u-boot.lds b/board/siemens/CCM/u-boot.lds
index 5bd5a75c619..36dd55dee45 100644
--- a/board/siemens/CCM/u-boot.lds
+++ b/board/siemens/CCM/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/siemens/CCM/u-boot.lds.debug b/board/siemens/CCM/u-boot.lds.debug
index 460a9832153..7e066b11e59 100644
--- a/board/siemens/CCM/u-boot.lds.debug
+++ b/board/siemens/CCM/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/siemens/IAD210/u-boot.lds b/board/siemens/IAD210/u-boot.lds
index 904d45fccc5..a9b00cafae0 100644
--- a/board/siemens/IAD210/u-boot.lds
+++ b/board/siemens/IAD210/u-boot.lds
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
- arch/ppc/cpu/mpc8xx/interrupts.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
+ arch/powerpc/cpu/mpc8xx/interrupts.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/siemens/pcu_e/u-boot.lds b/board/siemens/pcu_e/u-boot.lds
index ff2f56640b3..b871958f1ba 100644
--- a/board/siemens/pcu_e/u-boot.lds
+++ b/board/siemens/pcu_e/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
*(.got1)
diff --git a/board/siemens/pcu_e/u-boot.lds.debug b/board/siemens/pcu_e/u-boot.lds.debug
index fcf2cbb96d1..131ad23c77c 100644
--- a/board/siemens/pcu_e/u-boot.lds.debug
+++ b/board/siemens/pcu_e/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/sixnet/u-boot.lds b/board/sixnet/u-boot.lds
index c3e7f501cb7..43a8e20f045 100644
--- a/board/sixnet/u-boot.lds
+++ b/board/sixnet/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
*(.got1)
diff --git a/board/snmc/qs850/u-boot.lds b/board/snmc/qs850/u-boot.lds
index f2154c429b0..1c008959fde 100644
--- a/board/snmc/qs850/u-boot.lds
+++ b/board/snmc/qs850/u-boot.lds
@@ -55,15 +55,15 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv)
diff --git a/board/snmc/qs860t/u-boot.lds b/board/snmc/qs860t/u-boot.lds
index f2154c429b0..1c008959fde 100644
--- a/board/snmc/qs860t/u-boot.lds
+++ b/board/snmc/qs860t/u-boot.lds
@@ -55,15 +55,15 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv)
diff --git a/board/spc1920/u-boot.lds b/board/spc1920/u-boot.lds
index c000746c54f..36310181163 100644
--- a/board/spc1920/u-boot.lds
+++ b/board/spc1920/u-boot.lds
@@ -55,15 +55,15 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv)
diff --git a/board/spd8xx/u-boot.lds b/board/spd8xx/u-boot.lds
index c4d83574d69..86677742839 100644
--- a/board/spd8xx/u-boot.lds
+++ b/board/spd8xx/u-boot.lds
@@ -52,7 +52,7 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/env_embedded.o(.text)
*(.text)
*(.got1)
diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug
index 61c0d68d781..a7a67a9276f 100644
--- a/board/spd8xx/u-boot.lds.debug
+++ b/board/spd8xx/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c
index 678ec5850f6..0b2584c6b1c 100644
--- a/board/stx/stxssa/stxssa.c
+++ b/board/stx/stxssa/stxssa.c
@@ -259,7 +259,7 @@ board_early_init_f(void)
#endif
/* Why is the phy reset done _after_ the ethernet
- * initialization in arch/ppc/lib/board.c?
+ * initialization in arch/powerpc/lib/board.c?
* Do it here so it's done before the TSECs are used.
*/
reset_phy();
diff --git a/board/stx/stxxtc/u-boot.lds b/board/stx/stxxtc/u-boot.lds
index c4df378c978..9001767ef7c 100644
--- a/board/stx/stxxtc/u-boot.lds
+++ b/board/stx/stxxtc/u-boot.lds
@@ -52,15 +52,15 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.text)
diff --git a/board/stx/stxxtc/u-boot.lds.debug b/board/stx/stxxtc/u-boot.lds.debug
index ec479b1533e..df7b6adba47 100644
--- a/board/stx/stxxtc/u-boot.lds.debug
+++ b/board/stx/stxxtc/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/svm_sc8xx/u-boot.lds b/board/svm_sc8xx/u-boot.lds
index 90270954e44..59f1844885d 100644
--- a/board/svm_sc8xx/u-boot.lds
+++ b/board/svm_sc8xx/u-boot.lds
@@ -55,15 +55,15 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
. = env_offset;
common/env_embedded.o (.ppcenv)
diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug
index a2b7bc70d9e..f212fab28ad 100644
--- a/board/svm_sc8xx/u-boot.lds.debug
+++ b/board/svm_sc8xx/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds
index a2277c260d6..32a3e2bf02a 100644
--- a/board/tqc/tqm8xx/u-boot.lds
+++ b/board/tqc/tqm8xx/u-boot.lds
@@ -55,14 +55,14 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
+ arch/powerpc/lib/cache.o (.text)
. = DEFINED(env_offset) ? env_offset : .;
common/env_embedded.o (.ppcenv)
diff --git a/board/tqc/tqm8xx/u-boot.lds.debug b/board/tqc/tqm8xx/u-boot.lds.debug
index 57cc3058686..c21890542f6 100644
--- a/board/tqc/tqm8xx/u-boot.lds.debug
+++ b/board/tqc/tqm8xx/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/uc100/u-boot.lds b/board/uc100/u-boot.lds
index f67b1d9c197..0d8f6059464 100644
--- a/board/uc100/u-boot.lds
+++ b/board/uc100/u-boot.lds
@@ -55,15 +55,15 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
common/env_embedded.o (.text)
diff --git a/board/uc100/u-boot.lds.debug b/board/uc100/u-boot.lds.debug
index 84b338a75de..a7caa8d90aa 100644
--- a/board/uc100/u-boot.lds.debug
+++ b/board/uc100/u-boot.lds.debug
@@ -55,7 +55,7 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
diff --git a/board/uc101/config.mk b/board/uc101/config.mk
index aebf30411e4..8ccf33e15c5 100644
--- a/board/uc101/config.mk
+++ b/board/uc101/config.mk
@@ -39,4 +39,4 @@ TEXT_BASE = 0xFFF00000
endif
PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board
-LDSCRIPT := $(SRCTREE)/arch/ppc/cpu/mpc5xxx/u-boot-customlayout.lds
+LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/v37/u-boot.lds b/board/v37/u-boot.lds
index bc47060f254..9bdc97fe4eb 100644
--- a/board/v37/u-boot.lds
+++ b/board/v37/u-boot.lds
@@ -55,15 +55,15 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
- arch/ppc/cpu/mpc8xx/traps.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/traps.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
- arch/ppc/lib/cache.o (.text)
- arch/ppc/lib/time.o (.text)
+ arch/powerpc/lib/cache.o (.text)
+ arch/powerpc/lib/time.o (.text)
/*
. = env_offset;
diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug
index 369c15a18c6..5ff67d13d45 100644
--- a/board/w7o/u-boot.lds.debug
+++ b/board/w7o/u-boot.lds.debug
@@ -59,7 +59,7 @@ SECTIONS
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
common/env_embedded.o(.text)
diff --git a/board/w7o/w7o.c b/board/w7o/w7o.c
index 96a12d73e5f..5c84e65a09d 100644
--- a/board/w7o/w7o.c
+++ b/board/w7o/w7o.c
@@ -157,7 +157,7 @@ phys_size_t initdram (int board_type)
/*
* ToDo: Move the asm init routine sdram_init() to this C file,
* or even better use some common ppc4xx code available
- * in arch/ppc/cpu/ppc4xx
+ * in arch/powerpc/cpu/ppc4xx
*/
sdram_init();
diff --git a/board/westel/amx860/u-boot.lds b/board/westel/amx860/u-boot.lds
index 5bd5a75c619..36dd55dee45 100644
--- a/board/westel/amx860/u-boot.lds
+++ b/board/westel/amx860/u-boot.lds
@@ -55,9 +55,9 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
- arch/ppc/lib/ppcstring.o (.text)
+ arch/powerpc/lib/ppcstring.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
lib/zlib.o (.text)
diff --git a/board/westel/amx860/u-boot.lds.debug b/board/westel/amx860/u-boot.lds.debug
index b331d5afc16..9c1e3ecd8ae 100644
--- a/board/westel/amx860/u-boot.lds.debug
+++ b/board/westel/amx860/u-boot.lds.debug
@@ -55,11 +55,11 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/mpc8xx/start.o (.text)
+ arch/powerpc/cpu/mpc8xx/start.o (.text)
common/dlmalloc.o (.text)
lib/vsprintf.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
. = env_offset;
common/env_embedded.o(.text)
diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug
index c3f6fefb45c..a7475785fa2 100644
--- a/board/xes/xpedite1000/u-boot.lds.debug
+++ b/board/xes/xpedite1000/u-boot.lds.debug
@@ -55,17 +55,17 @@ SECTIONS
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips! XXX FIXME XXX */
- arch/ppc/cpu/ppc4xx/start.o (.text)
+ arch/powerpc/cpu/ppc4xx/start.o (.text)
board/xes/xpedite1000/init.o (.text)
- arch/ppc/cpu/ppc4xx/kgdb.o (.text)
- arch/ppc/cpu/ppc4xx/traps.o (.text)
- arch/ppc/cpu/ppc4xx/interrupts.o (.text)
- arch/ppc/cpu/ppc4xx/4xx_uart.o (.text)
- arch/ppc/cpu/ppc4xx/cpu_init.o (.text)
- arch/ppc/cpu/ppc4xx/speed.o (.text)
+ arch/powerpc/cpu/ppc4xx/kgdb.o (.text)
+ arch/powerpc/cpu/ppc4xx/traps.o (.text)
+ arch/powerpc/cpu/ppc4xx/interrupts.o (.text)
+ arch/powerpc/cpu/ppc4xx/4xx_uart.o (.text)
+ arch/powerpc/cpu/ppc4xx/cpu_init.o (.text)
+ arch/powerpc/cpu/ppc4xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
lib/zlib.o (.text)
/* common/env_embedded.o(.text) */
diff --git a/board/xes/xpedite5170/u-boot.lds b/board/xes/xpedite5170/u-boot.lds
index 2f8730bf2bb..4cea3b30f0f 100644
--- a/board/xes/xpedite5170/u-boot.lds
+++ b/board/xes/xpedite5170/u-boot.lds
@@ -50,15 +50,15 @@ SECTIONS
.plt : { *(.plt) }
.text :
{
- arch/ppc/cpu/mpc86xx/start.o (.text)
- arch/ppc/cpu/mpc86xx/traps.o (.text)
- arch/ppc/cpu/mpc86xx/interrupts.o (.text)
- arch/ppc/cpu/mpc86xx/cpu_init.o (.text)
- arch/ppc/cpu/mpc86xx/cpu.o (.text)
- arch/ppc/cpu/mpc86xx/speed.o (.text)
+ arch/powerpc/cpu/mpc86xx/start.o (.text)
+ arch/powerpc/cpu/mpc86xx/traps.o (.text)
+ arch/powerpc/cpu/mpc86xx/interrupts.o (.text)
+ arch/powerpc/cpu/mpc86xx/cpu_init.o (.text)
+ arch/powerpc/cpu/mpc86xx/cpu.o (.text)
+ arch/powerpc/cpu/mpc86xx/speed.o (.text)
common/dlmalloc.o (.text)
lib/crc32.o (.text)
- arch/ppc/lib/extable.o (.text)
+ arch/powerpc/lib/extable.o (.text)
lib/zlib.o (.text)
*(.text)
*(.got1)
diff --git a/board/xilinx/ppc405-generic/u-boot-rom.lds b/board/xilinx/ppc405-generic/u-boot-rom.lds
index 8fafbd59c03..65d0e4dfd89 100644
--- a/board/xilinx/ppc405-generic/u-boot-rom.lds
+++ b/board/xilinx/ppc405-generic/u-boot-rom.lds
@@ -33,7 +33,7 @@ SECTIONS
.bootpg 0xFFFFF000 :
{
- arch/ppc/cpu/ppc4xx/start.o (.bootpg)
+ arch/powerpc/cpu/ppc4xx/start.o (.bootpg)
} = 0xffff
/* Read-only sections, merged into text segment: */
diff --git a/board/xilinx/ppc440-generic/u-boot-rom.lds b/board/xilinx/ppc440-generic/u-boot-rom.lds
index 0cbed8ea573..b8f8bedb817 100644
--- a/board/xilinx/ppc440-generic/u-boot-rom.lds
+++ b/board/xilinx/ppc440-generic/u-boot-rom.lds
@@ -33,7 +33,7 @@ SECTIONS
.bootpg 0xFFFFF000 :
{
- arch/ppc/cpu/ppc4xx/start.o (.bootpg)
+ arch/powerpc/cpu/ppc4xx/start.o (.bootpg)
} = 0xffff
/* Read-only sections, merged into text segment: */
diff --git a/common/kgdb.c b/common/kgdb.c
index 0531452a23b..9e3b64c379b 100644
--- a/common/kgdb.c
+++ b/common/kgdb.c
@@ -1,4 +1,4 @@
-/* taken from arch/ppc/kernel/ppc-stub.c */
+/* taken from arch/powerpc/kernel/ppc-stub.c */
/****************************************************************************
diff --git a/doc/README.IPHASE4539 b/doc/README.IPHASE4539
index b804e069a19..c5146d9b186 100644
--- a/doc/README.IPHASE4539
+++ b/doc/README.IPHASE4539
@@ -333,7 +333,7 @@ Linux:
$ make oldconfig
$ make dep
$ make uImage
- $ cp -p arch/ppc/mbxboot/uImage /tftpboot
+ $ cp -p arch/powerpc/mbxboot/uImage /tftpboot
Load uImage via tftp and boot it.
diff --git a/doc/README.PIP405 b/doc/README.PIP405
index e8a654128d0..012db1c5f74 100644
--- a/doc/README.PIP405
+++ b/doc/README.PIP405
@@ -17,11 +17,11 @@ Changed files:
added console settings from environment
- common/devices.c added ISA keyboard init
- common/main.c corrected the read of bootdelay
-- arch/ppc/cpu/ppc4xx/405gp_pci.c excluded file from PIP405
-- arch/ppc/cpu/ppc4xx/i2c.c added 16bit read write I2C support
+- arch/powerpc/cpu/ppc4xx/405gp_pci.c excluded file from PIP405
+- arch/powerpc/cpu/ppc4xx/i2c.c added 16bit read write I2C support
added page write
-- arch/ppc/cpu/ppc4xx/speed.c added get_PCI_freq
-- arch/ppc/cpu/ppc4xx/start.S added CONFIG_IDENT_STRING
+- arch/powerpc/cpu/ppc4xx/speed.c added get_PCI_freq
+- arch/powerpc/cpu/ppc4xx/start.S added CONFIG_IDENT_STRING
- disk/Makefile added part_iso for CD support
- disk/part.c changed to work with block device description
added ISO CD support
@@ -275,7 +275,7 @@ Added the config variable CONFIG_IDENT_STRING which will be added to the
"U_BOOT_VERSION __TIME__ DATE___ " String, to allows to identify intermidiate
and custom versions.
Changed files:
-- arch/ppc/cpu/ppc4xx/start.s
+- arch/powerpc/cpu/ppc4xx/start.s
Firmware Image:
---------------
@@ -288,11 +288,11 @@ Changed files:
Correct PCI Frequency for PPC405:
---------------------------------
-Added function (in arch/ppc/cpu/ppc4xx/speed.c) to get the PCI frequency for PPC405 CPU.
+Added function (in arch/powerpc/cpu/ppc4xx/speed.c) to get the PCI frequency for PPC405 CPU.
The PCI Frequency will now be set correct in the board description in common/board.c.
(was set to the busfreq before).
Changed files:
-- arch/ppc/cpu/ppc4xx/speed.c
+- arch/powerpc/cpu/ppc4xx/speed.c
- common/board.c
I2C Stuff:
@@ -301,7 +301,7 @@ Added defined(CONFIG_PIP405) at several points in common/cmd_i2c.c.
Added 16bit read/write support for I2C (PPC405), and page write to
I2C EEPROM if defined CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE.
Changed files:
-- arch/ppc/cpu/ppc4xx/i2c.c
+- arch/powerpc/cpu/ppc4xx/i2c.c
- common/cmd_i2c.c
Environment / Console:
diff --git a/doc/README.POST b/doc/README.POST
index 0d5e20e9773..eeb218d39c6 100644
--- a/doc/README.POST
+++ b/doc/README.POST
@@ -713,7 +713,7 @@ use external loopback for testing. That will need appropriate
reconfiguration of the physical interface chip.
The test routines for the SCC ethernet tests will be located in
-arch/ppc/cpu/mpc8xx/scc.c.
+arch/powerpc/cpu/mpc8xx/scc.c.
2.2.3.2. UART tests (SMC/SCC)
@@ -725,7 +725,7 @@ will be transmitted. These tests may be enhanced to make to perform
test will be executed manually.
The test routine for the SMC/SCC UART tests will be located in
-arch/ppc/cpu/mpc8xx/serial.c.
+arch/powerpc/cpu/mpc8xx/serial.c.
2.2.3.3. USB test
diff --git a/doc/README.RPXlite b/doc/README.RPXlite
index 0aa4d11303b..3ca671126d4 100644
--- a/doc/README.RPXlite
+++ b/doc/README.RPXlite
@@ -116,7 +116,7 @@
board/RPXLITE/RPXLITE.c /* DRAM-related routines */
board/RPXLITE/flash.c /* flash-related routines */
board/RPXLITE/config.mk /* set text base address */
- arch/ppc/cpu/mpc8xx/serial.c /* board specific register setting */
+ arch/powerpc/cpu/mpc8xx/serial.c /* board specific register setting */
include/config_RPXLITE.h /* board specific registers */
See 'reg_config.txt' for register values in detail.
diff --git a/doc/README.TQM8260 b/doc/README.TQM8260
index e64e64a3e2e..93b55068f57 100644
--- a/doc/README.TQM8260
+++ b/doc/README.TQM8260
@@ -14,10 +14,10 @@ The following common files have been modified by this project:
MAKEALL - TQM8260 entry added
Makefile - TQM8260_config entry added
-arch/ppc/cpu/mpc8260/Makefile - soft_i2c.o module added
-arch/ppc/cpu/mpc8260/ether_scc.c - TQM8260-specific definitions added, an obvious
+arch/powerpc/cpu/mpc8260/Makefile - soft_i2c.o module added
+arch/powerpc/cpu/mpc8260/ether_scc.c - TQM8260-specific definitions added, an obvious
bug fixed (fcr -> scr)
-arch/ppc/cpu/mpc8260/ether_fcc.c - TQM8260-specific definitions added
+arch/powerpc/cpu/mpc8260/ether_fcc.c - TQM8260-specific definitions added
include/flash.h - added definitions for the AM29LV640D Flash chip
@@ -33,7 +33,7 @@ board/tqm8260/config.mk - config file
board/tqm8260/flash.c - flash driver (for AM29LV640D)
board/tqm8260/ppcboot.lds - linker script
board/tqm8260/tqm8260.c - ioport and memory initialization
-arch/ppc/cpu/mpc8260/soft_i2c.c - software i2c EEPROM driver
+arch/powerpc/cpu/mpc8260/soft_i2c.c - software i2c EEPROM driver
include/config_TQM8260.h - main configuration file
diff --git a/doc/README.alaska8220 b/doc/README.alaska8220
index 9249cfb31e0..334507397d5 100644
--- a/doc/README.alaska8220
+++ b/doc/README.alaska8220
@@ -22,7 +22,7 @@ Changed files:
- include/asm-ppc/global_data.h added global variables - inp_clk, pci_clk,
vco_clk, pev_clk, flb_clk, and bExtUart
-- arch/ppc/lib/board.c added CONFIG_MPC8220 support
+- arch/powerpc/lib/board.c added CONFIG_MPC8220 support
- net/eth.c added FEC support for MPC8220
@@ -37,24 +37,24 @@ Added files:
- board/alaska/config.mk config make
- board/alaska/u-boot.lds Linker description
-- arch/ppc/cpu/mpc8220/dma.h multi-channel dma header file
-- arch/ppc/cpu/mpc8220/dramSetup.h dram setup header file
-- arch/ppc/cpu/mpc8220/fec.h MPC8220 FEC header file
-- arch/ppc/cpu/mpc8220/cpu.c cpu specific code
-- arch/ppc/cpu/mpc8220/cpu_init.c Flexbus ChipSelect and Mux pins setup
-- arch/ppc/cpu/mpc8220/dramSetup.c MPC8220 DDR SDRAM setup
-- arch/ppc/cpu/mpc8220/fec.c MPC8220 FEC driver
-- arch/ppc/cpu/mpc8220/i2c.c MPC8220 I2C driver
-- arch/ppc/cpu/mpc8220/interrupts.c interrupt support (not enable)
-- arch/ppc/cpu/mpc8220/loadtask.c load dma
-- arch/ppc/cpu/mpc8220/speed.c system, pci, flexbus, pev, and cpu clock
-- arch/ppc/cpu/mpc8220/traps.c exception
-- arch/ppc/cpu/mpc8220/uart.c MPC8220 UART driver
-- arch/ppc/cpu/mpc8220/Makefile Makefile
-- arch/ppc/cpu/mpc8220/config.mk config make
-- arch/ppc/cpu/mpc8220/fec_dma_task.S MPC8220 FEC multi-channel dma program
-- arch/ppc/cpu/mpc8220/io.S io functions
-- arch/ppc/cpu/mpc8220/start.S start up
+- arch/powerpc/cpu/mpc8220/dma.h multi-channel dma header file
+- arch/powerpc/cpu/mpc8220/dramSetup.h dram setup header file
+- arch/powerpc/cpu/mpc8220/fec.h MPC8220 FEC header file
+- arch/powerpc/cpu/mpc8220/cpu.c cpu specific code
+- arch/powerpc/cpu/mpc8220/cpu_init.c Flexbus ChipSelect and Mux pins setup
+- arch/powerpc/cpu/mpc8220/dramSetup.c MPC8220 DDR SDRAM setup
+- arch/powerpc/cpu/mpc8220/fec.c MPC8220 FEC driver
+- arch/powerpc/cpu/mpc8220/i2c.c MPC8220 I2C driver
+- arch/powerpc/cpu/mpc8220/interrupts.c interrupt support (not enable)
+- arch/powerpc/cpu/mpc8220/loadtask.c load dma
+- arch/powerpc/cpu/mpc8220/speed.c system, pci, flexbus, pev, and cpu clock
+- arch/powerpc/cpu/mpc8220/traps.c exception
+- arch/powerpc/cpu/mpc8220/uart.c MPC8220 UART driver
+- arch/powerpc/cpu/mpc8220/Makefile Makefile
+- arch/powerpc/cpu/mpc8220/config.mk config make
+- arch/powerpc/cpu/mpc8220/fec_dma_task.S MPC8220 FEC multi-channel dma program
+- arch/powerpc/cpu/mpc8220/io.S io functions
+- arch/powerpc/cpu/mpc8220/start.S start up
- include/mpc8220.h
diff --git a/doc/README.bedbug b/doc/README.bedbug
index 4c1e6c4d5ba..35e9d2706ab 100644
--- a/doc/README.bedbug
+++ b/doc/README.bedbug
@@ -18,15 +18,15 @@ can be easily implemented.
./common/board.c
Added call to initialize debugger on startup.
-./arch/ppc/cpu/ppc4xx/Makefile
+./arch/powerpc/cpu/ppc4xx/Makefile
Added bedbug_405.c to the Makefile.
-./arch/ppc/cpu/ppc4xx/start.S
+./arch/powerpc/cpu/ppc4xx/start.S
Added code to handle the debug exception (0x2000) on the 405.
Also added code to handle critical exceptions since the debug
is treated as critical on the 405.
-./arch/ppc/cpu/ppc4xx/traps.c
+./arch/powerpc/cpu/ppc4xx/traps.c
Added more detailed output for the program exception to tell
if it is an illegal instruction, privileged instruction or
a trap. Also added debug trap handler.
@@ -51,7 +51,7 @@ can be easily implemented.
hardware breakpoints and stepping through code. These
routines are common to all PowerPC processors.
-./arch/ppc/cpu/ppc4xx/bedbug_405.c
+./arch/powerpc/cpu/ppc4xx/bedbug_405.c
AMCC PPC405 specific debugger routines.
@@ -63,16 +63,16 @@ Changes:
common/cmd_bedbug.c
Added call to initialize 860 debugger.
- arch/ppc/cpu/mpc8xx/Makefile
+ arch/powerpc/cpu/mpc8xx/Makefile
Added new file "bedbug_860.c" to the makefile
- arch/ppc/cpu/mpc8xx/start.S
+ arch/powerpc/cpu/mpc8xx/start.S
Added handler for InstructionBreakpoint (0xfd00)
- arch/ppc/cpu/mpc8xx/traps.c
+ arch/powerpc/cpu/mpc8xx/traps.c
Added new routine DebugException()
New Files:
- arch/ppc/cpu/mpc8xx/bedbug_860.c
+ arch/powerpc/cpu/mpc8xx/bedbug_860.c
CPU-specific routines for 860 debug registers.
diff --git a/doc/README.mpc5xx b/doc/README.mpc5xx
index 26fb0c27dcf..df51b5cf5cc 100644
--- a/doc/README.mpc5xx
+++ b/doc/README.mpc5xx
@@ -25,7 +25,7 @@ Added or Changed Files:
u-boot-0.2.0/common/cmd_boot.c
u-boot-0.2.0/common/cmd_reginfo.c
u-boot-0.2.0/common/environment.c
-u-boot-0.2.0/arch/ppc/cpu/mpc5xx/*
+u-boot-0.2.0/arch/powerpc/cpu/mpc5xx/*
u-boot-0.2.0/include/cmd_reginfo.h
u-boot-0.2.0/include/common.h
u-boot-0.2.0/include/ppc_asm.tmpl
@@ -34,9 +34,9 @@ u-boot-0.2.0/include/mpc5xx.h
u-boot-0.2.0/include/status_led.h
u-boot-0.2.0/include/asm-ppc/u-boot.h
u-boot-0.2.0/include/asm-ppc/5xx_immap.h
-u-boot-0.2.0/arch/ppc/lib/board.c
-u-boot-0.2.0/arch/ppc/lib/cache.c
-u-boot-0.2.0/arch/ppc/lib/time.c
+u-boot-0.2.0/arch/powerpc/lib/board.c
+u-boot-0.2.0/arch/powerpc/lib/cache.c
+u-boot-0.2.0/arch/powerpc/lib/time.c
u-boot-0.2.0/Makefile
u-boot-0.2.0/CREDITS
u-boot-0.2.0/doc/README.mpc5xx
diff --git a/doc/README.mpc85xxads b/doc/README.mpc85xxads
index ae8202bdd17..046f981cf0d 100644
--- a/doc/README.mpc85xxads
+++ b/doc/README.mpc85xxads
@@ -124,8 +124,8 @@ Updated 13-July-2004 Jon Loeliger
kernel's ppcboot.h is consistent with U-Boot's u-boot.h. You can use two
default configuration files as your starting points to configure the
kernel:
- arch/ppc/configs/mpc8540_ads_defconfig
- arch/ppc/configs/mpc8560_ads_defconfig
+ arch/powerpc/configs/mpc8540_ads_defconfig
+ arch/powerpc/configs/mpc8560_ads_defconfig
3. DEFINITIONS AND COMPILATION
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index 82e4eed8068..87ee2c2408b 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -1,5 +1,5 @@
/*
- * arch/ppc/kernel/pci_auto.c
+ * arch/powerpc/kernel/pci_auto.c
*
* PCI autoconfiguration library
*
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c
index c1cc23bfcdd..fa48feaf042 100644
--- a/drivers/qe/uec_phy.c
+++ b/drivers/qe/uec_phy.c
@@ -47,7 +47,7 @@
/*--------------------------------------------------------------------+
* Fixed PHY (PHY-less) support for Ethernet Ports.
*
- * Copied from arch/ppc/cpu/ppc4xx/4xx_enet.c
+ * Copied from arch/powerpc/cpu/ppc4xx/4xx_enet.c
*--------------------------------------------------------------------*/
/*
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index b3bf10bb19c..23c0f76ddea 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -1,6 +1,6 @@
/*
* COM1 NS16550 support
- * originally from linux source (arch/ppc/boot/ns16550.c)
+ * originally from linux source (arch/powerpc/boot/ns16550.c)
* modified to use CONFIG_SYS_ISA_MEM and new defines
*/
diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c
index 687ffe6ace0..44ab39dd3ff 100644
--- a/drivers/spi/mpc8xxx_spi.c
+++ b/drivers/spi/mpc8xxx_spi.c
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2006 Ben Warren, Qstreams Networks Inc.
- * With help from the common/soft_spi and arch/ppc/cpu/mpc8260 drivers
+ * With help from the common/soft_spi and arch/powerpc/cpu/mpc8260 drivers
*
* See file CREDITS for list of people who contributed to this
* project.
diff --git a/examples/api/Makefile b/examples/api/Makefile
index bed16f15558..5b5f7a681c5 100644
--- a/examples/api/Makefile
+++ b/examples/api/Makefile
@@ -20,7 +20,7 @@
# MA 02111-1307 USA
#
-ifeq ($(ARCH),ppc)
+ifeq ($(ARCH),powerpc)
LOAD_ADDR = 0x40000
endif
ifeq ($(ARCH),arm)
@@ -46,8 +46,8 @@ EXT_COBJ_FILES-$(CONFIG_API) += lib/div64.o
EXT_COBJ_FILES-$(CONFIG_API) += lib/string.o
EXT_COBJ_FILES-$(CONFIG_API) += lib/time.o
EXT_COBJ_FILES-$(CONFIG_API) += lib/vsprintf.o
-ifeq ($(ARCH),ppc)
-EXT_SOBJ_FILES-$(CONFIG_API) += arch/ppc/lib/ppcstring.o
+ifeq ($(ARCH),powerpc)
+EXT_SOBJ_FILES-$(CONFIG_API) += arch/powerpc/lib/ppcstring.o
endif
# Create a list of source files so their dependencies can be auto-generated
diff --git a/examples/standalone/mem_to_mem_idma2intr.c b/examples/standalone/mem_to_mem_idma2intr.c
index eeff5f5f2de..f35f1ba5f6d 100644
--- a/examples/standalone/mem_to_mem_idma2intr.c
+++ b/examples/standalone/mem_to_mem_idma2intr.c
@@ -1,5 +1,5 @@
/* The dpalloc function used and implemented in this file was derieved
- * from PPCBoot/U-Boot file "arch/ppc/cpu/mpc8260/commproc.c".
+ * from PPCBoot/U-Boot file "arch/powerpc/cpu/mpc8260/commproc.c".
*/
/* Author: Arun Dharankar <ADharankar@ATTBI.Com>
@@ -7,7 +7,7 @@
*/
/*
- * This file is based on "arch/ppc/8260_io/commproc.c" - here is it's
+ * This file is based on "arch/powerpc/8260_io/commproc.c" - here is it's
* copyright notice:
*
* General Purpose functions for the global management of the
diff --git a/include/configs/aria.h b/include/configs/aria.h
index 06763c5d966..b6669e72a6a 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -190,7 +190,7 @@
/*
* Backward compatible definitions,
- * so we do not have to change arch/ppc/cpu/mpc512x/fixed_sdram.c
+ * so we do not have to change arch/powerpc/cpu/mpc512x/fixed_sdram.c
*/
#define CONFIG_SYS_DDRCMD_EM2 (CONFIG_SYS_MICRON_EMR2)
#define CONFIG_SYS_DDRCMD_EM3 (CONFIG_SYS_MICRON_EMR3)
diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index 44669ea44d3..29951f7f122 100644
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -141,7 +141,7 @@
#define CONFIG_SYS_FLASH_BASE 0xfe000000
/*
- * The flash size is autoconfigured, but arch/ppc/cpu/mpc5xxx/cpu_init.c needs this
+ * The flash size is autoconfigured, but arch/powerpc/cpu/mpc5xxx/cpu_init.c needs this
* variable defined
*/
#define CONFIG_SYS_FLASH_SIZE 0x02000000
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index e5537da4af0..48dc9463a8d 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -230,7 +230,7 @@
* SDRAM Controller DDR autocalibration values and takes a lot longer
* to run than Method_B.
* (See the Method_A and Method_B algorithm discription in the file:
- * arch/ppc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c)
+ * arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c)
* Define CONFIG_PPC4xx_DDR_METHOD_A to use DDR autocalibration Method_A
*
* DDR Autocalibration Method_B is the default.
diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index 3958d09eb93..6883e79e371 100644
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -290,7 +290,7 @@
* taken from the orignal Linkstation boot code
*
* Most of the low level configuration setttings are normally used
- * in arch/ppc/cpu/mpc824x/cpu_init.c which is NOT used by this implementation.
+ * in arch/powerpc/cpu/mpc824x/cpu_init.c which is NOT used by this implementation.
* Low level initialisation is done in board/linkstation/early_init.S
* The values below are included for reference purpose only
*/
diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 2472187520a..5538b18ef81 100644
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -233,7 +233,7 @@
* Definitions for initial stack pointer and data area (in data cache)
*/
/* use on chip memory (OCM) for temperary stack until sdram is tested */
-/* see ./arch/ppc/cpu/ppc4xx/start.S */
+/* see ./arch/powerpc/cpu/ppc4xx/start.S */
#define CONFIG_SYS_TEMP_STACK_OCM 1
/* On Chip Memory location */
@@ -251,7 +251,7 @@
* Taken from PPCBoot board/icecube/icecube.h
*/
-/* see ./arch/ppc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */
+/* see ./arch/powerpc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */
#define CONFIG_SYS_EBC_PB0AP 0x04002480
/* AMD NOR flash - this corresponds to FLASH_BASE so may be correct */
#define CONFIG_SYS_EBC_PB0CR 0xFFC5A000
@@ -269,7 +269,7 @@
*
* Taken in part from PPCBoot board/icecube/icecube.h
*/
-/* see ./arch/ppc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */
+/* see ./arch/powerpc/cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */
#define CONFIG_SYS_GPIO0_OSRH 0x55555550
#define CONFIG_SYS_GPIO0_OSRL 0x00000110
#define CONFIG_SYS_GPIO0_ISR1H 0x00000000
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 7423663a26e..61eb26ed843 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -456,7 +456,7 @@
* - internal SRAM (OCM=On Chip Memory) is placed to CONFIG_SYS_OCM_DATA_ADDR
* - Stackpointer will be located to
* (CONFIG_SYS_INIT_RAM_ADDR&0xFFFF0000) | (CONFIG_SYS_INIT_SP_OFFSET&0x0000FFFF)
- * in arch/ppc/cpu/ppc4xx/start.S
+ * in arch/powerpc/cpu/ppc4xx/start.S
*/
#undef CONFIG_SYS_INIT_DCACHE_CS
@@ -495,7 +495,7 @@
#define BOOTFLAG_WARM 0x02 /* Software reboot */
/* ################################################################################### */
-/* These defines will be used in arch/ppc/cpu/ppc4xx/cpu_init.c to setup external chip selects */
+/* These defines will be used in arch/powerpc/cpu/ppc4xx/cpu_init.c to setup external chip selects */
/* They are currently undefined cause they are initiaized in board/solidcard3/init.S */
/* This chip select accesses the boot device */
diff --git a/include/ns16550.h b/include/ns16550.h
index ce606b57383..9ea81e94632 100644
--- a/include/ns16550.h
+++ b/include/ns16550.h
@@ -1,6 +1,6 @@
/*
* NS16550 Serial Port
- * originally from linux source (arch/ppc/boot/ns16550.h)
+ * originally from linux source (arch/powerpc/boot/ns16550.h)
*
* Cleanup and unification
* (C) 2009 by Detlev Zundel, DENX Software Engineering GmbH
diff --git a/lib/div64.c b/lib/div64.c
index d9951b597f9..e688a91200d 100644
--- a/lib/div64.c
+++ b/lib/div64.c
@@ -13,7 +13,7 @@
*
* Code generated for this function might be very inefficient
* for some CPUs. __div64_32() can be overridden by linking arch-specific
- * assembly versions such as arch/ppc/lib/div64.S and arch/sh/lib/div64.S.
+ * assembly versions such as arch/powerpc/lib/div64.S and arch/sh/lib/div64.S.
*/
#include <linux/types.h>
diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile
index fce4582c252..46fbe3c85ba 100644
--- a/nand_spl/board/amcc/acadia/Makefile
+++ b/nand_spl/board/amcc/acadia/Makefile
@@ -68,11 +68,11 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# from cpu directory
$(obj)cache.S:
@rm -f $(obj)cache.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/cache.S $(obj)cache.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/cache.S $(obj)cache.S
$(obj)gpio.c:
@rm -f $(obj)gpio.c
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/gpio.c $(obj)gpio.c
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/gpio.c $(obj)gpio.c
$(obj)ndfc.c:
@rm -f $(obj)ndfc.c
@@ -80,11 +80,11 @@ $(obj)ndfc.c:
$(obj)resetvec.S:
@rm -f $(obj)resetvec.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
$(obj)start.S:
@rm -f $(obj)start.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/start.S $(obj)start.S
# from board directory
$(obj)memory.c:
diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile
index 48fde1d1dab..a114ca5f189 100644
--- a/nand_spl/board/amcc/bamboo/Makefile
+++ b/nand_spl/board/amcc/bamboo/Makefile
@@ -66,11 +66,11 @@ $(obj)ndfc.c:
$(obj)resetvec.S:
@rm -f $(obj)resetvec.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
$(obj)start.S:
@rm -f $(obj)start.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/start.S $(obj)start.S
# from board directory
$(obj)init.S:
diff --git a/nand_spl/board/amcc/canyonlands/Makefile b/nand_spl/board/amcc/canyonlands/Makefile
index 0012a9c99b3..e7982375fd6 100644
--- a/nand_spl/board/amcc/canyonlands/Makefile
+++ b/nand_spl/board/amcc/canyonlands/Makefile
@@ -71,11 +71,11 @@ $(obj)ndfc.c:
$(obj)resetvec.S:
@rm -f $(obj)resetvec.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
$(obj)start.S:
@rm -f $(obj)start.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/start.S $(obj)start.S
# from board directory
$(obj)init.S:
diff --git a/nand_spl/board/amcc/kilauea/Makefile b/nand_spl/board/amcc/kilauea/Makefile
index de4980a55c1..a49ba0796e9 100644
--- a/nand_spl/board/amcc/kilauea/Makefile
+++ b/nand_spl/board/amcc/kilauea/Makefile
@@ -62,15 +62,15 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# from cpu directory
$(obj)44x_spd_ddr2.c: $(obj)ecc.h
@rm -f $(obj)44x_spd_ddr2.c
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c $(obj)44x_spd_ddr2.c
$(obj)cache.S:
@rm -f $(obj)cache.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/cache.S $(obj)cache.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/cache.S $(obj)cache.S
$(obj)ecc.h:
@rm -f $(obj)ecc.h
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/ecc.h $(obj)ecc.h
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/ecc.h $(obj)ecc.h
$(obj)ndfc.c:
@rm -f $(obj)ndfc.c
@@ -78,11 +78,11 @@ $(obj)ndfc.c:
$(obj)resetvec.S:
@rm -f $(obj)resetvec.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
$(obj)start.S:
@rm -f $(obj)start.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/start.S $(obj)start.S
# from nand_spl directory
$(obj)nand_boot.c:
diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile
index e6f96fd3bce..951fe46305a 100644
--- a/nand_spl/board/amcc/sequoia/Makefile
+++ b/nand_spl/board/amcc/sequoia/Makefile
@@ -62,7 +62,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# from cpu directory
$(obj)denali_data_eye.c:
@rm -f $(obj)denali_data_eye.c
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/denali_data_eye.c $(obj)denali_data_eye.c
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/denali_data_eye.c $(obj)denali_data_eye.c
$(obj)ndfc.c:
@rm -f $(obj)ndfc.c
@@ -70,11 +70,11 @@ $(obj)ndfc.c:
$(obj)resetvec.S:
@rm -f $(obj)resetvec.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/resetvec.S $(obj)resetvec.S
$(obj)start.S:
@rm -f $(obj)start.S
- ln -s $(SRCTREE)/arch/ppc/cpu/ppc4xx/start.S $(obj)start.S
+ ln -s $(SRCTREE)/arch/powerpc/cpu/ppc4xx/start.S $(obj)start.S
# from board directory
$(obj)init.S:
diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile
index a23176c78af..98edb09362c 100644
--- a/nand_spl/board/freescale/mpc8313erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8313erdb/Makefile
@@ -65,7 +65,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# create symbolic links for common files
$(obj)start.S:
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $(obj)start.S
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc83xx/start.S $(obj)start.S
$(obj)nand_boot_fsl_elbc.c:
ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \
@@ -81,16 +81,16 @@ $(obj)ns16550.c:
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
$(obj)nand_init.c:
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
$(obj)cache.c:
- ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
+ ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $(obj)cache.c
$(obj)time.c:
- ln -sf $(SRCTREE)/arch/ppc/lib/time.c $(obj)time.c
+ ln -sf $(SRCTREE)/arch/powerpc/lib/time.c $(obj)time.c
$(obj)ticks.S:
- ln -sf $(SRCTREE)/arch/ppc/lib/ticks.S $(obj)ticks.S
+ ln -sf $(SRCTREE)/arch/powerpc/lib/ticks.S $(obj)ticks.S
#########################################################################
diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile
index a23176c78af..98edb09362c 100644
--- a/nand_spl/board/freescale/mpc8315erdb/Makefile
+++ b/nand_spl/board/freescale/mpc8315erdb/Makefile
@@ -65,7 +65,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
# create symbolic links for common files
$(obj)start.S:
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $(obj)start.S
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc83xx/start.S $(obj)start.S
$(obj)nand_boot_fsl_elbc.c:
ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c \
@@ -81,16 +81,16 @@ $(obj)ns16550.c:
ln -sf $(SRCTREE)/drivers/serial/ns16550.c $(obj)ns16550.c
$(obj)nand_init.c:
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc83xx/nand_init.c $(obj)nand_init.c
$(obj)cache.c:
- ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
+ ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $(obj)cache.c
$(obj)time.c:
- ln -sf $(SRCTREE)/arch/ppc/lib/time.c $(obj)time.c
+ ln -sf $(SRCTREE)/arch/powerpc/lib/time.c $(obj)time.c
$(obj)ticks.S:
- ln -sf $(SRCTREE)/arch/ppc/lib/ticks.S $(obj)ticks.S
+ ln -sf $(SRCTREE)/arch/powerpc/lib/ticks.S $(obj)ticks.S
#########################################################################
diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index 7f75afcb507..3d0936a4c5f 100644
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -64,15 +64,15 @@ $(nandobj)u-boot-spl: $(OBJS)
$(obj)cache.c:
@rm -f $(obj)cache.c
- ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
+ ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $(obj)cache.c
$(obj)cpu_init_early.c:
@rm -f $(obj)cpu_init_early.c
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
$(obj)cpu_init_nand.c:
@rm -f $(obj)cpu_init_nand.c
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
$(obj)fsl_law.c:
@rm -f $(obj)fsl_law.c
@@ -97,15 +97,15 @@ $(obj)resetvec.S:
$(obj)fixed_ivor.S:
@rm -f $(obj)fixed_ivor.S
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
$(obj)start.S: $(obj)fixed_ivor.S
@rm -f $(obj)start.S
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $(obj)start.S
$(obj)tlb.c:
@rm -f $(obj)tlb.c
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $(obj)tlb.c
$(obj)tlb_table.c:
@rm -f $(obj)tlb_table.c
diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index 7f75afcb507..3d0936a4c5f 100644
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -64,15 +64,15 @@ $(nandobj)u-boot-spl: $(OBJS)
$(obj)cache.c:
@rm -f $(obj)cache.c
- ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
+ ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $(obj)cache.c
$(obj)cpu_init_early.c:
@rm -f $(obj)cpu_init_early.c
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
$(obj)cpu_init_nand.c:
@rm -f $(obj)cpu_init_nand.c
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
$(obj)fsl_law.c:
@rm -f $(obj)fsl_law.c
@@ -97,15 +97,15 @@ $(obj)resetvec.S:
$(obj)fixed_ivor.S:
@rm -f $(obj)fixed_ivor.S
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
$(obj)start.S: $(obj)fixed_ivor.S
@rm -f $(obj)start.S
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $(obj)start.S
$(obj)tlb.c:
@rm -f $(obj)tlb.c
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $(obj)tlb.c
$(obj)tlb_table.c:
@rm -f $(obj)tlb_table.c
diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index 7f75afcb507..3d0936a4c5f 100644
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -64,15 +64,15 @@ $(nandobj)u-boot-spl: $(OBJS)
$(obj)cache.c:
@rm -f $(obj)cache.c
- ln -sf $(SRCTREE)/arch/ppc/lib/cache.c $(obj)cache.c
+ ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $(obj)cache.c
$(obj)cpu_init_early.c:
@rm -f $(obj)cpu_init_early.c
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $(obj)cpu_init_early.c
$(obj)cpu_init_nand.c:
@rm -f $(obj)cpu_init_nand.c
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/cpu_init_nand.c $(obj)cpu_init_nand.c
$(obj)fsl_law.c:
@rm -f $(obj)fsl_law.c
@@ -97,15 +97,15 @@ $(obj)resetvec.S:
$(obj)fixed_ivor.S:
@rm -f $(obj)fixed_ivor.S
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $(obj)fixed_ivor.S
$(obj)start.S: $(obj)fixed_ivor.S
@rm -f $(obj)start.S
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/start.S $(obj)start.S
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $(obj)start.S
$(obj)tlb.c:
@rm -f $(obj)tlb.c
- ln -sf $(SRCTREE)/arch/ppc/cpu/mpc85xx/tlb.c $(obj)tlb.c
+ ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $(obj)tlb.c
$(obj)tlb_table.c:
@rm -f $(obj)tlb_table.c
diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index 3ad6250db50..2da61420a8d 100644
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -66,7 +66,7 @@ $(nandobj)u-boot.lds: $(LDSCRIPT)
$(obj)start.S:
@rm -f $@
- ln -s $(SRCTREE)/arch/ppc/cpu/mpc83xx/start.S $@
+ ln -s $(SRCTREE)/arch/powerpc/cpu/mpc83xx/start.S $@
$(obj)nand_boot_fsl_elbc.c:
@rm -f $@
@@ -86,19 +86,19 @@ $(obj)ns16550.c:
$(obj)nand_init.c:
@rm -f $@
- ln -s $(SRCTREE)/arch/ppc/cpu/mpc83xx/nand_init.c $@
+ ln -s $(SRCTREE)/arch/powerpc/cpu/mpc83xx/nand_init.c $@
$(obj)cache.c:
@rm -f $@
- ln -s $(SRCTREE)/arch/ppc/lib/cache.c $@
+ ln -s $(SRCTREE)/arch/powerpc/lib/cache.c $@
$(obj)time.c:
@rm -f $@
- ln -s $(SRCTREE)/arch/ppc/lib/time.c $@
+ ln -s $(SRCTREE)/arch/powerpc/lib/time.c $@
$(obj)ticks.S:
@rm -f $@
- ln -s $(SRCTREE)/arch/ppc/lib/ticks.S $@
+ ln -s $(SRCTREE)/arch/powerpc/lib/ticks.S $@
#########################################################################
diff --git a/post/cpu/ppc4xx/spr.c b/post/cpu/ppc4xx/spr.c
index 6ff5c79aa90..cb18b6436d8 100644
--- a/post/cpu/ppc4xx/spr.c
+++ b/post/cpu/ppc4xx/spr.c
@@ -69,7 +69,7 @@ static struct {
/* Additional Special-Purpose Registers.
* The values must match the initialization
- * values from arch/ppc/cpu/ppc4xx/start.S
+ * values from arch/powerpc/cpu/ppc4xx/start.S
*/
{0x30, "PID", 0x00000000, 0x00000000},
{0x3a, "CSRR0", 0x00000000, 0x00000000},
diff --git a/post/lib_ppc/Makefile b/post/lib_powerpc/Makefile
index bd7a2329920..0cd15cfa137 100644
--- a/post/lib_ppc/Makefile
+++ b/post/lib_powerpc/Makefile
@@ -22,7 +22,7 @@
#
include $(TOPDIR)/config.mk
-LIB = libpostppc.a
+LIB = libpost$(ARCH).a
AOBJS-$(CONFIG_HAS_POST) += asm.o
COBJS-$(CONFIG_HAS_POST) += cpu.o cmp.o cmpi.o two.o twox.o three.o threex.o
diff --git a/post/lib_ppc/andi.c b/post/lib_powerpc/andi.c
index 52ec7c4d4e9..52ec7c4d4e9 100644
--- a/post/lib_ppc/andi.c
+++ b/post/lib_powerpc/andi.c
diff --git a/post/lib_ppc/asm.S b/post/lib_powerpc/asm.S
index f6b329aa4df..f6b329aa4df 100644
--- a/post/lib_ppc/asm.S
+++ b/post/lib_powerpc/asm.S
diff --git a/post/lib_ppc/b.c b/post/lib_powerpc/b.c
index 492fba4c535..492fba4c535 100644
--- a/post/lib_ppc/b.c
+++ b/post/lib_powerpc/b.c
diff --git a/post/lib_ppc/cmp.c b/post/lib_powerpc/cmp.c
index 5f6a3b90466..5f6a3b90466 100644
--- a/post/lib_ppc/cmp.c
+++ b/post/lib_powerpc/cmp.c
diff --git a/post/lib_ppc/cmpi.c b/post/lib_powerpc/cmpi.c
index 1a2fc3d094b..1a2fc3d094b 100644
--- a/post/lib_ppc/cmpi.c
+++ b/post/lib_powerpc/cmpi.c
diff --git a/post/lib_ppc/complex.c b/post/lib_powerpc/complex.c
index 4a3bc000310..4a3bc000310 100644
--- a/post/lib_ppc/complex.c
+++ b/post/lib_powerpc/complex.c
diff --git a/post/lib_ppc/cpu.c b/post/lib_powerpc/cpu.c
index 3793a60c3e0..3793a60c3e0 100644
--- a/post/lib_ppc/cpu.c
+++ b/post/lib_powerpc/cpu.c
diff --git a/post/lib_ppc/cpu_asm.h b/post/lib_powerpc/cpu_asm.h
index ef6fe61eff9..ef6fe61eff9 100644
--- a/post/lib_ppc/cpu_asm.h
+++ b/post/lib_powerpc/cpu_asm.h
diff --git a/post/lib_ppc/cr.c b/post/lib_powerpc/cr.c
index fbee6d5c406..fbee6d5c406 100644
--- a/post/lib_ppc/cr.c
+++ b/post/lib_powerpc/cr.c
diff --git a/post/lib_ppc/fpu/20001122-1.c b/post/lib_powerpc/fpu/20001122-1.c
index bef80c5f79e..bef80c5f79e 100644
--- a/post/lib_ppc/fpu/20001122-1.c
+++ b/post/lib_powerpc/fpu/20001122-1.c
diff --git a/post/lib_ppc/fpu/20010114-2.c b/post/lib_powerpc/fpu/20010114-2.c
index ee564e8d621..ee564e8d621 100644
--- a/post/lib_ppc/fpu/20010114-2.c
+++ b/post/lib_powerpc/fpu/20010114-2.c
diff --git a/post/lib_ppc/fpu/20010226-1.c b/post/lib_powerpc/fpu/20010226-1.c
index 099ca4a64f7..099ca4a64f7 100644
--- a/post/lib_ppc/fpu/20010226-1.c
+++ b/post/lib_powerpc/fpu/20010226-1.c
diff --git a/post/lib_ppc/fpu/980619-1.c b/post/lib_powerpc/fpu/980619-1.c
index 46a31aec45f..46a31aec45f 100644
--- a/post/lib_ppc/fpu/980619-1.c
+++ b/post/lib_powerpc/fpu/980619-1.c
diff --git a/post/lib_ppc/fpu/Makefile b/post/lib_powerpc/fpu/Makefile
index a6815398e5a..25726db73db 100644
--- a/post/lib_ppc/fpu/Makefile
+++ b/post/lib_powerpc/fpu/Makefile
@@ -22,7 +22,7 @@
#
include $(TOPDIR)/config.mk
-LIB = libpostppcfpu.a
+LIB = libpost$(ARCH)fpu.a
COBJS-$(CONFIG_HAS_POST) += fpu.o 20001122-1.o 20010114-2.o 20010226-1.o 980619-1.o
COBJS-$(CONFIG_HAS_POST) += acc1.o compare-fp-1.o mul-subnormal-single-1.o
diff --git a/post/lib_ppc/fpu/acc1.c b/post/lib_powerpc/fpu/acc1.c
index 9fca9b3788a..9fca9b3788a 100644
--- a/post/lib_ppc/fpu/acc1.c
+++ b/post/lib_powerpc/fpu/acc1.c
diff --git a/post/lib_ppc/fpu/compare-fp-1.c b/post/lib_powerpc/fpu/compare-fp-1.c
index f836b29c08e..f836b29c08e 100644
--- a/post/lib_ppc/fpu/compare-fp-1.c
+++ b/post/lib_powerpc/fpu/compare-fp-1.c
diff --git a/post/lib_ppc/fpu/fpu.c b/post/lib_powerpc/fpu/fpu.c
index 3f3adea197b..3f3adea197b 100644
--- a/post/lib_ppc/fpu/fpu.c
+++ b/post/lib_powerpc/fpu/fpu.c
diff --git a/post/lib_ppc/fpu/mul-subnormal-single-1.c b/post/lib_powerpc/fpu/mul-subnormal-single-1.c
index 1f3732d9243..1f3732d9243 100644
--- a/post/lib_ppc/fpu/mul-subnormal-single-1.c
+++ b/post/lib_powerpc/fpu/mul-subnormal-single-1.c
diff --git a/post/lib_ppc/load.c b/post/lib_powerpc/load.c
index 98d437318c6..98d437318c6 100644
--- a/post/lib_ppc/load.c
+++ b/post/lib_powerpc/load.c
diff --git a/post/lib_ppc/multi.c b/post/lib_powerpc/multi.c
index e42a7c07ebe..e42a7c07ebe 100644
--- a/post/lib_ppc/multi.c
+++ b/post/lib_powerpc/multi.c
diff --git a/post/lib_ppc/rlwimi.c b/post/lib_powerpc/rlwimi.c
index fd628b31f96..fd628b31f96 100644
--- a/post/lib_ppc/rlwimi.c
+++ b/post/lib_powerpc/rlwimi.c
diff --git a/post/lib_ppc/rlwinm.c b/post/lib_powerpc/rlwinm.c
index 88a28c6431f..88a28c6431f 100644
--- a/post/lib_ppc/rlwinm.c
+++ b/post/lib_powerpc/rlwinm.c
diff --git a/post/lib_ppc/rlwnm.c b/post/lib_powerpc/rlwnm.c
index 60bcb6d26c0..60bcb6d26c0 100644
--- a/post/lib_ppc/rlwnm.c
+++ b/post/lib_powerpc/rlwnm.c
diff --git a/post/lib_ppc/srawi.c b/post/lib_powerpc/srawi.c
index be153aded21..be153aded21 100644
--- a/post/lib_ppc/srawi.c
+++ b/post/lib_powerpc/srawi.c
diff --git a/post/lib_ppc/store.c b/post/lib_powerpc/store.c
index 1956f6baa3b..1956f6baa3b 100644
--- a/post/lib_ppc/store.c
+++ b/post/lib_powerpc/store.c
diff --git a/post/lib_ppc/string.c b/post/lib_powerpc/string.c
index c0ddeaf6550..c0ddeaf6550 100644
--- a/post/lib_ppc/string.c
+++ b/post/lib_powerpc/string.c
diff --git a/post/lib_ppc/three.c b/post/lib_powerpc/three.c
index 7f8c1e2b864..7f8c1e2b864 100644
--- a/post/lib_ppc/three.c
+++ b/post/lib_powerpc/three.c
diff --git a/post/lib_ppc/threei.c b/post/lib_powerpc/threei.c
index 31953f93543..31953f93543 100644
--- a/post/lib_ppc/threei.c
+++ b/post/lib_powerpc/threei.c
diff --git a/post/lib_ppc/threex.c b/post/lib_powerpc/threex.c
index 350a12ae78c..350a12ae78c 100644
--- a/post/lib_ppc/threex.c
+++ b/post/lib_powerpc/threex.c
diff --git a/post/lib_ppc/two.c b/post/lib_powerpc/two.c
index 2b111472b6e..2b111472b6e 100644
--- a/post/lib_ppc/two.c
+++ b/post/lib_powerpc/two.c
diff --git a/post/lib_ppc/twox.c b/post/lib_powerpc/twox.c
index d6714f9861c..d6714f9861c 100644
--- a/post/lib_ppc/twox.c
+++ b/post/lib_powerpc/twox.c