Skip to contentSkip to conversation

Reorganize directory structure

PATCH New Peter Tyser 5 participants 30 messages Dec 13, 2009 – Mar 26, 2010 Page 2 of 3

Subsystems (24)
lore
Share & tools
lore
#7 lore raw

PATCH 5/17 Move architecture-specific includes to arch/$ARCH/include/asm

In reply to Peter Tyser

This cleans up the include/ directory, speeds up architecture-specific grepping, and brings U-Boot in line with Linux's directory structure.

---
 arch/.gitignore                                    |    2 ++
 .../arm/include/asm}/arch-a320/a320.h              |    0
 .../arm/include/asm}/arch-a320/ftpmu010.h          |    0
 .../arm/include/asm}/arch-a320/ftsdmc020.h         |    0
 .../arm/include/asm}/arch-a320/ftsmc020.h          |    0
 .../arm/include/asm}/arch-a320/fttmr010.h          |    0
 .../arm/include/asm}/arch-arm720t/hardware.h       |    0
 .../include/asm}/arch-arm720t/netarm_dma_module.h  |    0
 .../include/asm}/arch-arm720t/netarm_eni_module.h  |    0
 .../include/asm}/arch-arm720t/netarm_eth_module.h  |    0
 .../include/asm}/arch-arm720t/netarm_gen_module.h  |    0
 .../include/asm}/arch-arm720t/netarm_mem_module.h  |    0
 .../include/asm}/arch-arm720t/netarm_registers.h   |    0
 .../include/asm}/arch-arm720t/netarm_ser_module.h  |    0
 .../arm/include/asm}/arch-arm925t/sizes.h          |    0
 .../arm/include/asm}/arch-arm926ejs/sizes.h        |    0
 .../arm/include/asm}/arch-at91/at91_common.h       |    0
 .../arm/include/asm}/arch-at91/at91_pio.h          |    0
 .../arm/include/asm}/arch-at91/at91_pit.h          |    0
 .../arm/include/asm}/arch-at91/at91_pmc.h          |    0
 .../arm/include/asm}/arch-at91/at91_rstc.h         |    0
 .../arm/include/asm}/arch-at91/at91_spi.h          |    0
 .../arm/include/asm}/arch-at91/at91_wdt.h          |    0
 .../arm/include/asm}/arch-at91/at91cap9.h          |    0
 .../arm/include/asm}/arch-at91/at91cap9_matrix.h   |    0
 .../arm/include/asm}/arch-at91/at91sam9260.h       |    0
 .../include/asm}/arch-at91/at91sam9260_matrix.h    |    0
 .../arm/include/asm}/arch-at91/at91sam9261.h       |    0
 .../include/asm}/arch-at91/at91sam9261_matrix.h    |    0
 .../arm/include/asm}/arch-at91/at91sam9263.h       |    0
 .../include/asm}/arch-at91/at91sam9263_matrix.h    |    0
 .../arm/include/asm}/arch-at91/at91sam9_matrix.h   |    0
 .../arm/include/asm}/arch-at91/at91sam9_sdramc.h   |    0
 .../arm/include/asm}/arch-at91/at91sam9_smc.h      |    0
 .../arm/include/asm}/arch-at91/at91sam9g45.h       |    0
 .../include/asm}/arch-at91/at91sam9g45_matrix.h    |    0
 .../arm/include/asm}/arch-at91/at91sam9rl.h        |    0
 .../arm/include/asm}/arch-at91/at91sam9rl_matrix.h |    0
 .../arm/include/asm}/arch-at91/clk.h               |    0
 .../arm/include/asm}/arch-at91/gpio.h              |    0
 .../arm/include/asm}/arch-at91/hardware.h          |    0
 .../arm/include/asm}/arch-at91/io.h                |    0
 .../arm/include/asm}/arch-at91/memory-map.h        |    0
 .../arm/include/asm}/arch-at91rm9200/AT91RM9200.h  |    0
 .../arm/include/asm}/arch-at91rm9200/hardware.h    |    0
 .../arm/include/asm}/arch-davinci/emac_defs.h      |    0
 .../arm/include/asm}/arch-davinci/emif_defs.h      |    0
 .../arm/include/asm}/arch-davinci/gpio_defs.h      |    0
 .../arm/include/asm}/arch-davinci/hardware.h       |    0
 .../arm/include/asm}/arch-davinci/i2c_defs.h       |    0
 .../arm/include/asm}/arch-davinci/nand_defs.h      |    0
 .../arm/include/asm}/arch-imx/imx-regs.h           |    0
 .../arm/include/asm}/arch-ixp/ixp425.h             |    0
 .../arm/include/asm}/arch-ixp/ixp425pci.h          |    0
 .../arm/include/asm}/arch-kirkwood/cpu.h           |    0
 .../arm/include/asm}/arch-kirkwood/gpio.h          |    0
 .../arm/include/asm}/arch-kirkwood/kirkwood.h      |    0
 .../arm/include/asm}/arch-kirkwood/kw88f6192.h     |    0
 .../arm/include/asm}/arch-kirkwood/kw88f6281.h     |    0
 .../arm/include/asm}/arch-kirkwood/mpp.h           |    0
 .../arm/include/asm}/arch-kirkwood/spi.h           |    0
 .../arm/include/asm}/arch-ks8695/platform.h        |    0
 .../arm/include/asm}/arch-lpc2292/hardware.h       |    0
 .../include/asm}/arch-lpc2292/lpc2292_registers.h  |    0
 .../arm/include/asm}/arch-lpc2292/spi.h            |    0
 .../arm/include/asm}/arch-mx27/asm-offsets.h       |    0
 .../arm/include/asm}/arch-mx27/clock.h             |    0
 .../arm/include/asm}/arch-mx27/imx-regs.h          |    0
 .../arm/include/asm}/arch-mx27/mxcmmc.h            |    0
 .../arm/include/asm}/arch-mx31/mx31-regs.h         |    0
 .../arm/include/asm}/arch-mx31/mx31.h              |    0
 .../arm/include/asm}/arch-nomadik/gpio.h           |    0
 .../arm/include/asm}/arch-nomadik/mtu.h            |    0
 .../arm/include/asm}/arch-omap/sizes.h             |    0
 .../arm/include/asm}/arch-omap24xx/bits.h          |    0
 .../arm/include/asm}/arch-omap24xx/clocks.h        |    0
 .../arm/include/asm}/arch-omap24xx/i2c.h           |    0
 .../arm/include/asm}/arch-omap24xx/mem.h           |    0
 .../arm/include/asm}/arch-omap24xx/mux.h           |    0
 .../arm/include/asm}/arch-omap24xx/omap2420.h      |    0
 .../arm/include/asm}/arch-omap24xx/sizes.h         |    0
 .../arm/include/asm}/arch-omap24xx/sys_info.h      |    0
 .../arm/include/asm}/arch-omap24xx/sys_proto.h     |    0
 .../arm/include/asm}/arch-omap3/clocks.h           |    0
 .../arm/include/asm}/arch-omap3/clocks_omap3.h     |    0
 .../arm/include/asm}/arch-omap3/cpu.h              |    0
 .../arm/include/asm}/arch-omap3/gpio.h             |    0
 .../arm/include/asm}/arch-omap3/i2c.h              |    0
 .../arm/include/asm}/arch-omap3/mem.h              |    0
 .../arm/include/asm}/arch-omap3/mmc.h              |    0
 .../arm/include/asm}/arch-omap3/mmc_host_def.h     |    0
 .../arm/include/asm}/arch-omap3/mux.h              |    0
 .../arm/include/asm}/arch-omap3/omap3.h            |    0
 .../arm/include/asm}/arch-omap3/omap_gpmc.h        |    0
 .../arm/include/asm}/arch-omap3/sys_proto.h        |    0
 .../arm/include/asm}/arch-pxa/bitfield.h           |    0
 .../arm/include/asm}/arch-pxa/hardware.h           |    0
 .../arm/include/asm}/arch-pxa/pxa-regs.h           |    0
 .../arm/include/asm}/arch-s3c24x0/memory.h         |    0
 .../arm/include/asm}/arch-s3c24x0/s3c2400.h        |    0
 .../arm/include/asm}/arch-s3c24x0/s3c2410.h        |    0
 .../arm/include/asm}/arch-s3c24x0/s3c24x0.h        |    0
 .../arm/include/asm}/arch-s3c24x0/s3c24x0_cpu.h    |    0
 .../arm/include/asm}/arch-s3c44b0/hardware.h       |    0
 .../arm/include/asm}/arch-s3c4510b/hardware.h      |    0
 .../arm/include/asm}/arch-s3c64xx/hardware.h       |    0
 .../arm/include/asm}/arch-s3c64xx/s3c6400.h        |    0
 .../arm/include/asm}/arch-s3c64xx/s3c64x0.h        |    0
 .../arm/include/asm}/arch-s5pc1xx/clk.h            |    0
 .../arm/include/asm}/arch-s5pc1xx/clock.h          |    0
 .../arm/include/asm}/arch-s5pc1xx/cpu.h            |    0
 .../arm/include/asm}/arch-s5pc1xx/gpio.h           |    0
 .../arm/include/asm}/arch-s5pc1xx/power.h          |    0
 .../arm/include/asm}/arch-s5pc1xx/pwm.h            |    0
 .../arm/include/asm}/arch-s5pc1xx/uart.h           |    0
 .../arm/include/asm}/arch-sa1100/bitfield.h        |    0
 {include/asm-arm => arch/arm/include/asm}/atomic.h |    0
 {include/asm-arm => arch/arm/include/asm}/bitops.h |    0
 .../asm-arm => arch/arm/include/asm}/byteorder.h   |    0
 {include/asm-arm => arch/arm/include/asm}/cache.h  |    0
 {include/asm-arm => arch/arm/include/asm}/config.h |    0
 .../asm-arm => arch/arm/include/asm}/dma-mapping.h |    0
 {include/asm-arm => arch/arm/include/asm}/errno.h  |    0
 .../asm-arm => arch/arm/include/asm}/global_data.h |    0
 .../asm-arm => arch/arm/include/asm}/hardware.h    |    0
 {include/asm-arm => arch/arm/include/asm}/io.h     |    0
 .../asm-arm => arch/arm/include/asm}/mach-types.h  |    0
 {include/asm-arm => arch/arm/include/asm}/macro.h  |    0
 {include/asm-arm => arch/arm/include/asm}/memory.h |    0
 .../asm-arm => arch/arm/include/asm}/posix_types.h |    0
 .../arm/include/asm}/proc-armv/domain.h            |    0
 .../arm/include/asm}/proc-armv/processor.h         |    0
 .../arm/include/asm}/proc-armv/ptrace.h            |    0
 .../arm/include/asm}/proc-armv/system.h            |    0
 .../asm-arm => arch/arm/include/asm}/processor.h   |    0
 {include/asm-arm => arch/arm/include/asm}/ptrace.h |    0
 {include/asm-arm => arch/arm/include/asm}/setup.h  |    0
 {include/asm-arm => arch/arm/include/asm}/sizes.h  |    0
 {include/asm-arm => arch/arm/include/asm}/string.h |    0
 {include/asm-arm => arch/arm/include/asm}/system.h |    0
 {include/asm-arm => arch/arm/include/asm}/types.h  |    0
 .../asm-arm => arch/arm/include/asm}/u-boot-arm.h  |    0
 {include/asm-arm => arch/arm/include/asm}/u-boot.h |    0
 .../asm-arm => arch/arm/include/asm}/unaligned.h   |    0
 .../avr32/include/asm}/arch-at32ap700x/addrspace.h |    0
 .../include/asm}/arch-at32ap700x/cacheflush.h      |    0
 .../include/asm}/arch-at32ap700x/chip-features.h   |    0
 .../avr32/include/asm}/arch-at32ap700x/clk.h       |    0
 .../avr32/include/asm}/arch-at32ap700x/gpio-impl.h |    0
 .../avr32/include/asm}/arch-at32ap700x/gpio.h      |    0
 .../avr32/include/asm}/arch-at32ap700x/hmatrix.h   |    0
 .../include/asm}/arch-at32ap700x/memory-map.h      |    0
 .../avr32/include/asm}/arch-at32ap700x/portmux.h   |    0
 .../avr32/include/asm}/arch-common/portmux-gpio.h  |    0
 .../avr32/include/asm}/arch-common/portmux-pio.h   |    0
 .../asm-avr32 => arch/avr32/include/asm}/bitops.h  |    0
 .../avr32/include/asm}/byteorder.h                 |    0
 .../asm-avr32 => arch/avr32/include/asm}/config.h  |    0
 .../avr32/include/asm}/dma-mapping.h               |    0
 .../asm-avr32 => arch/avr32/include/asm}/errno.h   |    0
 .../avr32/include/asm}/global_data.h               |    0
 .../avr32/include/asm}/hmatrix-common.h            |    0
 .../avr32/include/asm}/initcalls.h                 |    0
 {include/asm-avr32 => arch/avr32/include/asm}/io.h |    0
 .../avr32/include/asm}/posix_types.h               |    0
 .../avr32/include/asm}/processor.h                 |    0
 .../asm-avr32 => arch/avr32/include/asm}/ptrace.h  |    0
 .../asm-avr32 => arch/avr32/include/asm}/sdram.h   |    0
 .../avr32/include/asm}/sections.h                  |    0
 .../asm-avr32 => arch/avr32/include/asm}/setup.h   |    0
 .../asm-avr32 => arch/avr32/include/asm}/string.h  |    0
 .../asm-avr32 => arch/avr32/include/asm}/sysreg.h  |    0
 .../asm-avr32 => arch/avr32/include/asm}/types.h   |    0
 .../asm-avr32 => arch/avr32/include/asm}/u-boot.h  |    0
 .../blackfin/include/asm}/bfin_logo_230x230.h      |    0
 .../blackfin/include/asm}/bitops.h                 |    0
 .../blackfin/include/asm}/blackfin.h               |    0
 .../blackfin/include/asm}/blackfin_cdef.h          |    0
 .../blackfin/include/asm}/blackfin_def.h           |    0
 .../blackfin/include/asm}/blackfin_local.h         |    0
 .../blackfin/include/asm}/byteorder.h              |    0
 .../blackfin/include/asm}/config-pre.h             |    0
 .../blackfin/include/asm}/config.h                 |    0
 .../blackfin/include/asm}/cplb.h                   |    0
 .../blackfin/include/asm}/delay.h                  |    0
 .../blackfin/include/asm}/entry.h                  |    0
 .../blackfin/include/asm}/errno.h                  |    0
 .../blackfin/include/asm}/global_data.h            |    0
 .../blackfin/include/asm}/io.h                     |    0
 .../blackfin/include/asm}/linkage.h                |    0
 .../asm}/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h |    0
 .../asm}/mach-bf527/ADSP-EDN-BF52x-extended_def.h  |    0
 .../blackfin/include/asm}/mach-bf527/BF522_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf527/BF522_def.h   |    0
 .../blackfin/include/asm}/mach-bf527/BF523_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf527/BF523_def.h   |    0
 .../blackfin/include/asm}/mach-bf527/BF524_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf527/BF524_def.h   |    0
 .../blackfin/include/asm}/mach-bf527/BF525_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf527/BF525_def.h   |    0
 .../blackfin/include/asm}/mach-bf527/BF526_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf527/BF526_def.h   |    0
 .../blackfin/include/asm}/mach-bf527/BF527_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf527/BF527_def.h   |    0
 .../blackfin/include/asm}/mach-bf527/anomaly.h     |    0
 .../blackfin/include/asm}/mach-bf527/def_local.h   |    0
 .../blackfin/include/asm}/mach-bf527/ports.h       |    0
 .../blackfin/include/asm}/mach-bf533/BF531_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf533/BF531_def.h   |    0
 .../blackfin/include/asm}/mach-bf533/BF532_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf533/BF532_def.h   |    0
 .../blackfin/include/asm}/mach-bf533/BF533_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf533/BF533_def.h   |    0
 .../blackfin/include/asm}/mach-bf533/anomaly.h     |    0
 .../blackfin/include/asm}/mach-bf533/def_local.h   |    0
 .../blackfin/include/asm}/mach-bf533/ports.h       |    0
 .../asm}/mach-bf537/ADSP-EDN-BF534-extended_cdef.h |    0
 .../asm}/mach-bf537/ADSP-EDN-BF534-extended_def.h  |    0
 .../blackfin/include/asm}/mach-bf537/BF534_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf537/BF534_def.h   |    0
 .../blackfin/include/asm}/mach-bf537/BF536_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf537/BF536_def.h   |    0
 .../blackfin/include/asm}/mach-bf537/BF537_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf537/BF537_def.h   |    0
 .../blackfin/include/asm}/mach-bf537/anomaly.h     |    0
 .../blackfin/include/asm}/mach-bf537/def_local.h   |    0
 .../blackfin/include/asm}/mach-bf537/ports.h       |    0
 .../asm}/mach-bf548/ADSP-EDN-BF542-extended_cdef.h |    0
 .../asm}/mach-bf548/ADSP-EDN-BF542-extended_def.h  |    0
 .../asm}/mach-bf548/ADSP-EDN-BF544-extended_cdef.h |    0
 .../asm}/mach-bf548/ADSP-EDN-BF544-extended_def.h  |    0
 .../asm}/mach-bf548/ADSP-EDN-BF547-extended_cdef.h |    0
 .../asm}/mach-bf548/ADSP-EDN-BF547-extended_def.h  |    0
 .../asm}/mach-bf548/ADSP-EDN-BF548-extended_cdef.h |    0
 .../asm}/mach-bf548/ADSP-EDN-BF548-extended_def.h  |    0
 .../asm}/mach-bf548/ADSP-EDN-BF549-extended_cdef.h |    0
 .../asm}/mach-bf548/ADSP-EDN-BF549-extended_def.h  |    0
 .../blackfin/include/asm}/mach-bf548/BF541_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf548/BF541_def.h   |    0
 .../blackfin/include/asm}/mach-bf548/BF542_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf548/BF542_def.h   |    0
 .../blackfin/include/asm}/mach-bf548/BF544_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf548/BF544_def.h   |    0
 .../blackfin/include/asm}/mach-bf548/BF547_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf548/BF547_def.h   |    0
 .../blackfin/include/asm}/mach-bf548/BF548_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf548/BF548_def.h   |    0
 .../blackfin/include/asm}/mach-bf548/BF549_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf548/BF549_def.h   |    0
 .../blackfin/include/asm}/mach-bf548/anomaly.h     |    0
 .../blackfin/include/asm}/mach-bf548/def_local.h   |    0
 .../blackfin/include/asm}/mach-bf548/ports.h       |    0
 .../blackfin/include/asm}/mach-bf561/BF561_cdef.h  |    0
 .../blackfin/include/asm}/mach-bf561/BF561_def.h   |    0
 .../blackfin/include/asm}/mach-bf561/anomaly.h     |    0
 .../blackfin/include/asm}/mach-bf561/def_local.h   |    0
 .../blackfin/include/asm}/mach-bf561/ports.h       |    0
 .../mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h |    0
 .../mach-common/ADSP-EDN-DUAL-CORE-extended_def.h  |    0
 .../include/asm}/mach-common/ADSP-EDN-core_cdef.h  |    0
 .../include/asm}/mach-common/ADSP-EDN-core_def.h   |    0
 .../asm}/mach-common/ADSP-EDN-extended_cdef.h      |    0
 .../asm}/mach-common/ADSP-EDN-extended_def.h       |    0
 .../include/asm}/mach-common/bits/bootrom.h        |    0
 .../blackfin/include/asm}/mach-common/bits/core.h  |    0
 .../blackfin/include/asm}/mach-common/bits/dma.h   |    0
 .../blackfin/include/asm}/mach-common/bits/ebiu.h  |    0
 .../blackfin/include/asm}/mach-common/bits/emac.h  |    0
 .../blackfin/include/asm}/mach-common/bits/eppi.h  |    0
 .../include/asm}/mach-common/bits/lockbox.h        |    0
 .../blackfin/include/asm}/mach-common/bits/mpu.h   |    0
 .../blackfin/include/asm}/mach-common/bits/otp.h   |    0
 .../blackfin/include/asm}/mach-common/bits/pata.h  |    0
 .../blackfin/include/asm}/mach-common/bits/pll.h   |    0
 .../include/asm}/mach-common/bits/ports-a.h        |    0
 .../include/asm}/mach-common/bits/ports-b.h        |    0
 .../include/asm}/mach-common/bits/ports-c.h        |    0
 .../include/asm}/mach-common/bits/ports-d.h        |    0
 .../include/asm}/mach-common/bits/ports-e.h        |    0
 .../include/asm}/mach-common/bits/ports-f.h        |    0
 .../include/asm}/mach-common/bits/ports-g.h        |    0
 .../include/asm}/mach-common/bits/ports-h.h        |    0
 .../include/asm}/mach-common/bits/ports-i.h        |    0
 .../include/asm}/mach-common/bits/ports-j.h        |    0
 .../blackfin/include/asm}/mach-common/bits/ppi.h   |    0
 .../blackfin/include/asm}/mach-common/bits/rtc.h   |    0
 .../blackfin/include/asm}/mach-common/bits/sdh.h   |    0
 .../blackfin/include/asm}/mach-common/bits/spi.h   |    0
 .../blackfin/include/asm}/mach-common/bits/sport.h |    0
 .../blackfin/include/asm}/mach-common/bits/timer.h |    0
 .../blackfin/include/asm}/mach-common/bits/trace.h |    0
 .../blackfin/include/asm}/mach-common/bits/twi.h   |    0
 .../blackfin/include/asm}/mach-common/bits/uart.h  |    0
 .../include/asm}/mach-common/bits/watchdog.h       |    0
 .../blackfin/include/asm}/mmc.h                    |    0
 .../blackfin/include/asm}/net.h                    |    0
 .../blackfin/include/asm}/posix_types.h            |    0
 .../blackfin/include/asm}/processor.h              |    0
 .../blackfin/include/asm}/ptrace.h                 |    0
 .../blackfin/include/asm}/shared_resources.h       |    0
 .../blackfin/include/asm}/string.h                 |    0
 .../blackfin/include/asm}/system.h                 |    0
 .../blackfin/include/asm}/traps.h                  |    0
 .../blackfin/include/asm}/types.h                  |    0
 .../blackfin/include/asm}/u-boot.h                 |    0
 .../asm-i386 => arch/i386/include/asm}/bitops.h    |    0
 .../asm-i386 => arch/i386/include/asm}/byteorder.h |    0
 .../asm-i386 => arch/i386/include/asm}/config.h    |    0
 .../asm-i386 => arch/i386/include/asm}/errno.h     |    0
 .../i386/include/asm}/global_data.h                |    0
 .../asm-i386 => arch/i386/include/asm}/i8254.h     |    0
 .../asm-i386 => arch/i386/include/asm}/i8259.h     |    0
 .../asm-i386 => arch/i386/include/asm}/ibmpc.h     |    0
 .../asm-i386 => arch/i386/include/asm}/ic/pci.h    |    0
 .../asm-i386 => arch/i386/include/asm}/ic/sc520.h  |    0
 .../asm-i386 => arch/i386/include/asm}/ic/ssi.h    |    0
 .../asm-i386 => arch/i386/include/asm}/interrupt.h |    0
 {include/asm-i386 => arch/i386/include/asm}/io.h   |    0
 {include/asm-i386 => arch/i386/include/asm}/pci.h  |    0
 .../i386/include/asm}/posix_types.h                |    0
 .../asm-i386 => arch/i386/include/asm}/processor.h |    0
 .../asm-i386 => arch/i386/include/asm}/ptrace.h    |    0
 .../asm-i386 => arch/i386/include/asm}/realmode.h  |    0
 .../asm-i386 => arch/i386/include/asm}/string.h    |    0
 .../asm-i386 => arch/i386/include/asm}/types.h     |    0
 .../i386/include/asm}/u-boot-i386.h                |    0
 .../asm-i386 => arch/i386/include/asm}/u-boot.h    |    0
 .../asm-i386 => arch/i386/include/asm}/zimage.h    |    0
 .../asm-m68k => arch/m68k/include/asm}/bitops.h    |    0
 .../asm-m68k => arch/m68k/include/asm}/byteorder.h |    0
 .../m68k/include/asm}/coldfire/ata.h               |    0
 .../m68k/include/asm}/coldfire/crossbar.h          |    0
 .../m68k/include/asm}/coldfire/dspi.h              |    0
 .../m68k/include/asm}/coldfire/edma.h              |    0
 .../m68k/include/asm}/coldfire/eport.h             |    0
 .../m68k/include/asm}/coldfire/flexbus.h           |    0
 .../m68k/include/asm}/coldfire/flexcan.h           |    0
 .../m68k/include/asm}/coldfire/intctrl.h           |    0
 .../m68k/include/asm}/coldfire/lcd.h               |    0
 .../m68k/include/asm}/coldfire/mdha.h              |    0
 .../m68k/include/asm}/coldfire/pwm.h               |    0
 .../m68k/include/asm}/coldfire/qspi.h              |    0
 .../m68k/include/asm}/coldfire/rng.h               |    0
 .../m68k/include/asm}/coldfire/skha.h              |    0
 .../m68k/include/asm}/coldfire/ssi.h               |    0
 .../asm-m68k => arch/m68k/include/asm}/config.h    |    0
 .../asm-m68k => arch/m68k/include/asm}/errno.h     |    0
 {include/asm-m68k => arch/m68k/include/asm}/fec.h  |    0
 .../asm-m68k => arch/m68k/include/asm}/fsl_i2c.h   |    0
 .../m68k/include/asm}/fsl_mcdmafec.h               |    0
 .../m68k/include/asm}/global_data.h                |    0
 .../asm-m68k => arch/m68k/include/asm}/immap.h     |    0
 .../m68k/include/asm}/immap_520x.h                 |    0
 .../m68k/include/asm}/immap_5227x.h                |    0
 .../m68k/include/asm}/immap_5235.h                 |    0
 .../m68k/include/asm}/immap_5249.h                 |    0
 .../m68k/include/asm}/immap_5253.h                 |    0
 .../m68k/include/asm}/immap_5271.h                 |    0
 .../m68k/include/asm}/immap_5272.h                 |    0
 .../m68k/include/asm}/immap_5275.h                 |    0
 .../m68k/include/asm}/immap_5282.h                 |    0
 .../m68k/include/asm}/immap_5301x.h                |    0
 .../m68k/include/asm}/immap_5329.h                 |    0
 .../m68k/include/asm}/immap_5445x.h                |    0
 .../m68k/include/asm}/immap_547x_8x.h              |    0
 {include/asm-m68k => arch/m68k/include/asm}/io.h   |    0
 .../asm-m68k => arch/m68k/include/asm}/m520x.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/m5227x.h    |    0
 .../asm-m68k => arch/m68k/include/asm}/m5235.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/m5249.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/m5253.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/m5271.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/m5272.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/m5275.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/m5282.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/m5301x.h    |    0
 .../asm-m68k => arch/m68k/include/asm}/m5329.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/m5445x.h    |    0
 .../asm-m68k => arch/m68k/include/asm}/m547x_8x.h  |    0
 .../m68k/include/asm}/posix_types.h                |    0
 .../asm-m68k => arch/m68k/include/asm}/processor.h |    0
 .../asm-m68k => arch/m68k/include/asm}/ptrace.h    |    0
 {include/asm-m68k => arch/m68k/include/asm}/rtc.h  |    0
 .../asm-m68k => arch/m68k/include/asm}/string.h    |    0
 .../asm-m68k => arch/m68k/include/asm}/timer.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/types.h     |    0
 .../asm-m68k => arch/m68k/include/asm}/u-boot.h    |    0
 {include/asm-m68k => arch/m68k/include/asm}/uart.h |    0
 .../microblaze/include/asm}/asm.h                  |    0
 .../microblaze/include/asm}/bitops.h               |    0
 .../microblaze/include/asm}/byteorder.h            |    0
 .../microblaze/include/asm}/config.h               |    0
 .../microblaze/include/asm}/errno.h                |    0
 .../microblaze/include/asm}/global_data.h          |    0
 .../microblaze/include/asm}/io.h                   |    0
 .../microblaze/include/asm}/microblaze_intc.h      |    0
 .../microblaze/include/asm}/microblaze_timer.h     |    0
 .../microblaze/include/asm}/posix_types.h          |    0
 .../microblaze/include/asm}/processor.h            |    0
 .../microblaze/include/asm}/ptrace.h               |    0
 .../microblaze/include/asm}/string.h               |    0
 .../microblaze/include/asm}/system.h               |    0
 .../microblaze/include/asm}/types.h                |    0
 .../microblaze/include/asm}/u-boot.h               |    0
 .../asm-mips => arch/mips/include/asm}/addrspace.h |    0
 {include/asm-mips => arch/mips/include/asm}/asm.h  |    0
 .../asm-mips => arch/mips/include/asm}/au1x00.h    |    0
 .../asm-mips => arch/mips/include/asm}/bitops.h    |    0
 .../asm-mips => arch/mips/include/asm}/byteorder.h |    0
 .../asm-mips => arch/mips/include/asm}/cachectl.h  |    0
 .../asm-mips => arch/mips/include/asm}/cacheops.h  |    0
 .../asm-mips => arch/mips/include/asm}/config.h    |    0
 .../asm-mips => arch/mips/include/asm}/errno.h     |    0
 .../mips/include/asm}/global_data.h                |    0
 .../asm-mips => arch/mips/include/asm}/inca-ip.h   |    0
 {include/asm-mips => arch/mips/include/asm}/io.h   |    0
 .../asm-mips => arch/mips/include/asm}/isadep.h    |    0
 .../asm-mips => arch/mips/include/asm}/mipsregs.h  |    0
 .../mips/include/asm}/posix_types.h                |    0
 .../asm-mips => arch/mips/include/asm}/processor.h |    0
 .../asm-mips => arch/mips/include/asm}/ptrace.h    |    0
 .../asm-mips => arch/mips/include/asm}/reboot.h    |    0
 {include/asm-mips => arch/mips/include/asm}/reg.h  |    0
 .../asm-mips => arch/mips/include/asm}/regdef.h    |    0
 .../asm-mips => arch/mips/include/asm}/sgidefs.h   |    0
 .../asm-mips => arch/mips/include/asm}/string.h    |    0
 .../asm-mips => arch/mips/include/asm}/system.h    |    0
 .../asm-mips => arch/mips/include/asm}/types.h     |    0
 .../asm-mips => arch/mips/include/asm}/u-boot.h    |    0
 .../asm-nios => arch/nios/include/asm}/bitops.h    |    0
 .../asm-nios => arch/nios/include/asm}/byteorder.h |    0
 .../asm-nios => arch/nios/include/asm}/cache.h     |    0
 .../asm-nios => arch/nios/include/asm}/config.h    |    0
 .../nios/include/asm}/global_data.h                |    0
 {include/asm-nios => arch/nios/include/asm}/io.h   |    0
 .../nios/include/asm}/posix_types.h                |    0
 .../asm-nios => arch/nios/include/asm}/processor.h |    0
 {include/asm-nios => arch/nios/include/asm}/psr.h  |    0
 .../asm-nios => arch/nios/include/asm}/ptrace.h    |    0
 .../nios/include/asm}/status_led.h                 |    0
 .../asm-nios => arch/nios/include/asm}/string.h    |    0
 .../asm-nios => arch/nios/include/asm}/system.h    |    0
 .../asm-nios => arch/nios/include/asm}/types.h     |    0
 .../asm-nios => arch/nios/include/asm}/u-boot.h    |    0
 .../asm-nios2 => arch/nios2/include/asm}/bitops.h  |    0
 .../nios2/include/asm}/byteorder.h                 |    0
 .../asm-nios2 => arch/nios2/include/asm}/cache.h   |    0
 .../asm-nios2 => arch/nios2/include/asm}/config.h  |    0
 .../nios2/include/asm}/global_data.h               |    0
 {include/asm-nios2 => arch/nios2/include/asm}/io.h |    0
 .../asm-nios2 => arch/nios2/include/asm}/opcodes.h |    0
 .../nios2/include/asm}/posix_types.h               |    0
 .../nios2/include/asm}/processor.h                 |    0
 .../asm-nios2 => arch/nios2/include/asm}/psr.h     |    0
 .../asm-nios2 => arch/nios2/include/asm}/ptrace.h  |    0
 .../nios2/include/asm}/status_led.h                |    0
 .../asm-nios2 => arch/nios2/include/asm}/string.h  |    0
 .../asm-nios2 => arch/nios2/include/asm}/system.h  |    0
 .../asm-nios2 => arch/nios2/include/asm}/types.h   |    0
 .../asm-nios2 => arch/nios2/include/asm}/u-boot.h  |    0
 .../asm-ppc => arch/ppc/include/asm}/4xx_pci.h     |    0
 .../asm-ppc => arch/ppc/include/asm}/4xx_pcie.h    |    0
 .../asm-ppc => arch/ppc/include/asm}/5xx_immap.h   |    0
 .../asm-ppc => arch/ppc/include/asm}/8xx_immap.h   |    0
 {include/asm-ppc => arch/ppc/include/asm}/atomic.h |    0
 {include/asm-ppc => arch/ppc/include/asm}/bitops.h |    0
 .../asm-ppc => arch/ppc/include/asm}/byteorder.h   |    0
 {include/asm-ppc => arch/ppc/include/asm}/cache.h  |    0
 {include/asm-ppc => arch/ppc/include/asm}/config.h |    0
 .../asm-ppc => arch/ppc/include/asm}/cpm_8260.h    |    0
 .../asm-ppc => arch/ppc/include/asm}/cpm_85xx.h    |    0
 {include/asm-ppc => arch/ppc/include/asm}/e300.h   |    0
 {include/asm-ppc => arch/ppc/include/asm}/errno.h  |    0
 .../ppc/include/asm}/fsl_ddr_dimm_params.h         |    0
 .../ppc/include/asm}/fsl_ddr_sdram.h               |    0
 .../asm-ppc => arch/ppc/include/asm}/fsl_dma.h     |    0
 .../asm-ppc => arch/ppc/include/asm}/fsl_i2c.h     |    0
 .../asm-ppc => arch/ppc/include/asm}/fsl_law.h     |    0
 .../asm-ppc => arch/ppc/include/asm}/fsl_lbc.h     |    0
 .../asm-ppc => arch/ppc/include/asm}/fsl_pci.h     |    0
 .../asm-ppc => arch/ppc/include/asm}/fsl_serdes.h  |    0
 .../asm-ppc => arch/ppc/include/asm}/global_data.h |    0
 {include/asm-ppc => arch/ppc/include/asm}/gpio.h   |    0
 .../asm-ppc => arch/ppc/include/asm}/immap_512x.h  |    0
 .../asm-ppc => arch/ppc/include/asm}/immap_8220.h  |    0
 .../asm-ppc => arch/ppc/include/asm}/immap_8260.h  |    0
 .../asm-ppc => arch/ppc/include/asm}/immap_83xx.h  |    0
 .../asm-ppc => arch/ppc/include/asm}/immap_85xx.h  |    0
 .../asm-ppc => arch/ppc/include/asm}/immap_86xx.h  |    0
 .../asm-ppc => arch/ppc/include/asm}/immap_qe.h    |    0
 .../asm-ppc => arch/ppc/include/asm}/interrupt.h   |    0
 {include/asm-ppc => arch/ppc/include/asm}/io.h     |    0
 .../asm-ppc => arch/ppc/include/asm}/iopin_8260.h  |    0
 .../asm-ppc => arch/ppc/include/asm}/iopin_85xx.h  |    0
 .../asm-ppc => arch/ppc/include/asm}/iopin_8xx.h   |    0
 .../asm-ppc => arch/ppc/include/asm}/m8260_pci.h   |    0
 .../asm-ppc => arch/ppc/include/asm}/mc146818rtc.h |    0
 {include/asm-ppc => arch/ppc/include/asm}/mmu.h    |    0
 {include/asm-ppc => arch/ppc/include/asm}/mp.h     |    0
 .../asm-ppc => arch/ppc/include/asm}/mpc512x.h     |    0
 .../asm-ppc => arch/ppc/include/asm}/mpc8349_pci.h |    0
 .../asm-ppc => arch/ppc/include/asm}/mpc8xxx_spi.h |    0
 {include/asm-ppc => arch/ppc/include/asm}/pci_io.h |    0
 {include/asm-ppc => arch/ppc/include/asm}/pnp.h    |    0
 .../asm-ppc => arch/ppc/include/asm}/posix_types.h |    0
 .../asm-ppc => arch/ppc/include/asm}/ppc4xx-ebc.h  |    0
 .../ppc/include/asm}/ppc4xx-isram.h                |    0
 .../ppc/include/asm}/ppc4xx-sdram.h                |    0
 .../asm-ppc => arch/ppc/include/asm}/ppc4xx-uic.h  |    0
 .../ppc/include/asm}/ppc4xx_config.h               |    0
 .../asm-ppc => arch/ppc/include/asm}/processor.h   |    0
 {include/asm-ppc => arch/ppc/include/asm}/ptrace.h |    0
 .../asm-ppc => arch/ppc/include/asm}/residual.h    |    0
 .../asm-ppc => arch/ppc/include/asm}/sigcontext.h  |    0
 {include/asm-ppc => arch/ppc/include/asm}/signal.h |    0
 .../asm-ppc => arch/ppc/include/asm}/status_led.h  |    0
 {include/asm-ppc => arch/ppc/include/asm}/string.h |    0
 {include/asm-ppc => arch/ppc/include/asm}/types.h  |    0
 {include/asm-ppc => arch/ppc/include/asm}/u-boot.h |    0
 .../asm-ppc => arch/ppc/include/asm}/unaligned.h   |    0
 .../asm-ppc => arch/ppc/include/asm}/xilinx_irq.h  |    0
 {include/asm-sh => arch/sh/include/asm}/bitops.h   |    0
 .../asm-sh => arch/sh/include/asm}/byteorder.h     |    0
 {include/asm-sh => arch/sh/include/asm}/cache.h    |    0
 {include/asm-sh => arch/sh/include/asm}/clk.h      |    0
 {include/asm-sh => arch/sh/include/asm}/config.h   |    0
 {include/asm-sh => arch/sh/include/asm}/cpu_sh2.h  |    0
 {include/asm-sh => arch/sh/include/asm}/cpu_sh3.h  |    0
 {include/asm-sh => arch/sh/include/asm}/cpu_sh4.h  |    0
 .../asm-sh => arch/sh/include/asm}/cpu_sh7203.h    |    0
 .../asm-sh => arch/sh/include/asm}/cpu_sh7710.h    |    0
 .../asm-sh => arch/sh/include/asm}/cpu_sh7720.h    |    0
 .../asm-sh => arch/sh/include/asm}/cpu_sh7722.h    |    0
 .../asm-sh => arch/sh/include/asm}/cpu_sh7723.h    |    0
 .../asm-sh => arch/sh/include/asm}/cpu_sh7750.h    |    0
 .../asm-sh => arch/sh/include/asm}/cpu_sh7763.h    |    0
 .../asm-sh => arch/sh/include/asm}/cpu_sh7780.h    |    0
 .../asm-sh => arch/sh/include/asm}/cpu_sh7785.h    |    0
 {include/asm-sh => arch/sh/include/asm}/errno.h    |    0
 .../asm-sh => arch/sh/include/asm}/global_data.h   |    0
 {include/asm-sh => arch/sh/include/asm}/io.h       |    0
 {include/asm-sh => arch/sh/include/asm}/irqflags.h |    0
 {include/asm-sh => arch/sh/include/asm}/macro.h    |    0
 {include/asm-sh => arch/sh/include/asm}/pci.h      |    0
 .../asm-sh => arch/sh/include/asm}/posix_types.h   |    0
 .../asm-sh => arch/sh/include/asm}/processor.h     |    0
 {include/asm-sh => arch/sh/include/asm}/ptrace.h   |    0
 {include/asm-sh => arch/sh/include/asm}/string.h   |    0
 {include/asm-sh => arch/sh/include/asm}/system.h   |    0
 {include/asm-sh => arch/sh/include/asm}/types.h    |    0
 {include/asm-sh => arch/sh/include/asm}/u-boot.h   |    0
 .../sparc/include/asm}/arch-leon2/asi.h            |    0
 .../sparc/include/asm}/arch-leon3/asi.h            |    0
 .../asm-sparc => arch/sparc/include/asm}/asi.h     |    0
 .../sparc/include/asm}/asmmacro.h                  |    0
 .../asm-sparc => arch/sparc/include/asm}/atomic.h  |    0
 .../asm-sparc => arch/sparc/include/asm}/bitops.h  |    0
 .../sparc/include/asm}/byteorder.h                 |    0
 .../asm-sparc => arch/sparc/include/asm}/cache.h   |    0
 .../asm-sparc => arch/sparc/include/asm}/config.h  |    0
 .../asm-sparc => arch/sparc/include/asm}/errno.h   |    0
 .../sparc/include/asm}/global_data.h               |    0
 {include/asm-sparc => arch/sparc/include/asm}/io.h |    0
 .../asm-sparc => arch/sparc/include/asm}/irq.h     |    0
 .../asm-sparc => arch/sparc/include/asm}/leon.h    |    0
 .../asm-sparc => arch/sparc/include/asm}/leon2.h   |    0
 .../asm-sparc => arch/sparc/include/asm}/leon3.h   |    0
 .../sparc/include/asm}/machines.h                  |    0
 .../asm-sparc => arch/sparc/include/asm}/page.h    |    0
 .../sparc/include/asm}/posix_types.h               |    0
 .../sparc/include/asm}/processor.h                 |    0
 .../asm-sparc => arch/sparc/include/asm}/prom.h    |    0
 .../asm-sparc => arch/sparc/include/asm}/psr.h     |    0
 .../asm-sparc => arch/sparc/include/asm}/ptrace.h  |    0
 .../asm-sparc => arch/sparc/include/asm}/srmmu.h   |    0
 .../asm-sparc => arch/sparc/include/asm}/stack.h   |    0
 .../asm-sparc => arch/sparc/include/asm}/string.h  |    0
 .../asm-sparc => arch/sparc/include/asm}/types.h   |    0
 .../asm-sparc => arch/sparc/include/asm}/u-boot.h  |    0
 .../sparc/include/asm}/winmacro.h                  |    0
 include/.gitignore                                 |    2 --
 mkconfig                                           |   19 ++++++++-----------
 582 files changed, 10 insertions(+), 13 deletions(-)
 create mode 100644 arch/.gitignore
 rename {include/asm-arm => arch/arm/include/asm}/arch-a320/a320.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-a320/ftpmu010.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-a320/ftsdmc020.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-a320/ftsmc020.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-a320/fttmr010.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/hardware.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_dma_module.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_eni_module.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_eth_module.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_gen_module.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_mem_module.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_registers.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-arm720t/netarm_ser_module.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-arm925t/sizes.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-arm926ejs/sizes.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_common.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_pio.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_pit.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_pmc.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_rstc.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_spi.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91_wdt.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91cap9.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91cap9_matrix.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9260.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9260_matrix.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9261.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9261_matrix.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9263.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9263_matrix.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9_matrix.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9_sdramc.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9_smc.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9g45.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9g45_matrix.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9rl.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/at91sam9rl_matrix.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/clk.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/gpio.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/hardware.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/io.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91/memory-map.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91rm9200/AT91RM9200.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-at91rm9200/hardware.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/emac_defs.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/emif_defs.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/gpio_defs.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/hardware.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/i2c_defs.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-davinci/nand_defs.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-imx/imx-regs.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-ixp/ixp425.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-ixp/ixp425pci.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/cpu.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/gpio.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/kirkwood.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/kw88f6192.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/kw88f6281.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/mpp.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-kirkwood/spi.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-ks8695/platform.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-lpc2292/hardware.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-lpc2292/lpc2292_registers.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-lpc2292/spi.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/asm-offsets.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/clock.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/imx-regs.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-mx27/mxcmmc.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-mx31/mx31-regs.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-mx31/mx31.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-nomadik/gpio.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-nomadik/mtu.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap/sizes.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/bits.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/clocks.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/i2c.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/mem.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/mux.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/omap2420.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/sizes.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/sys_info.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap24xx/sys_proto.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/clocks.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/clocks_omap3.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/cpu.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/gpio.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/i2c.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mem.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mmc.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mmc_host_def.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/mux.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/omap3.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/omap_gpmc.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-omap3/sys_proto.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-pxa/bitfield.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-pxa/hardware.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-pxa/pxa-regs.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/memory.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c2400.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c2410.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c24x0.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s3c24x0/s3c24x0_cpu.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s3c44b0/hardware.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s3c4510b/hardware.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s3c64xx/hardware.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s3c64xx/s3c6400.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s3c64xx/s3c64x0.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/clk.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/clock.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/cpu.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/gpio.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/power.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/pwm.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-s5pc1xx/uart.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/arch-sa1100/bitfield.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/atomic.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/bitops.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/byteorder.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/cache.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/config.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/dma-mapping.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/errno.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/global_data.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/hardware.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/io.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/mach-types.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/macro.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/memory.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/posix_types.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/proc-armv/domain.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/proc-armv/processor.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/proc-armv/ptrace.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/proc-armv/system.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/processor.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/ptrace.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/setup.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/sizes.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/string.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/system.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/types.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/u-boot-arm.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/u-boot.h (100%)
 rename {include/asm-arm => arch/arm/include/asm}/unaligned.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/addrspace.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/cacheflush.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/chip-features.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/clk.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/gpio-impl.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/gpio.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/hmatrix.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/memory-map.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-at32ap700x/portmux.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-common/portmux-gpio.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/arch-common/portmux-pio.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/bitops.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/byteorder.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/config.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/dma-mapping.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/errno.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/global_data.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/hmatrix-common.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/initcalls.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/io.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/posix_types.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/processor.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/ptrace.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/sdram.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/sections.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/setup.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/string.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/sysreg.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/types.h (100%)
 rename {include/asm-avr32 => arch/avr32/include/asm}/u-boot.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/bfin_logo_230x230.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/bitops.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/blackfin_local.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/byteorder.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/config-pre.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/config.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/cplb.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/delay.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/entry.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/errno.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/global_data.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/io.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/linkage.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/ADSP-EDN-BF52x-extended_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF522_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF522_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF523_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF523_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF524_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF524_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF525_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF525_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF526_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF526_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF527_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/BF527_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/anomaly.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/def_local.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf527/ports.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF531_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF531_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF532_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF532_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF533_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/BF533_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/anomaly.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/def_local.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf533/ports.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/ADSP-EDN-BF534-extended_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/ADSP-EDN-BF534-extended_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF534_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF534_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF536_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF536_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF537_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/BF537_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/anomaly.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/def_local.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf537/ports.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF542-extended_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF542-extended_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF544-extended_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF544-extended_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF547-extended_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF547-extended_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF548-extended_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF548-extended_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF549-extended_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ADSP-EDN-BF549-extended_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF541_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF541_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF542_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF542_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF544_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF544_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF547_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF547_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF548_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF548_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF549_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/BF549_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/anomaly.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/def_local.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf548/ports.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/BF561_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/BF561_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/anomaly.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/def_local.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-bf561/ports.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-core_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-core_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-extended_cdef.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/ADSP-EDN-extended_def.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/bootrom.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/core.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/dma.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ebiu.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/emac.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/eppi.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/lockbox.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/mpu.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/otp.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/pata.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/pll.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-a.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-b.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-c.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-d.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-e.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-f.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-g.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-h.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-i.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ports-j.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/ppi.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/rtc.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/sdh.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/spi.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/sport.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/timer.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/trace.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/twi.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/uart.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mach-common/bits/watchdog.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/mmc.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/net.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/posix_types.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/processor.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/ptrace.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/shared_resources.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/string.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/system.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/traps.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/types.h (100%)
 rename {include/asm-blackfin => arch/blackfin/include/asm}/u-boot.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/bitops.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/byteorder.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/config.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/errno.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/global_data.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/i8254.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/i8259.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/ibmpc.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/ic/pci.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/ic/sc520.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/ic/ssi.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/interrupt.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/io.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/pci.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/posix_types.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/processor.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/ptrace.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/realmode.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/string.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/types.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/u-boot-i386.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/u-boot.h (100%)
 rename {include/asm-i386 => arch/i386/include/asm}/zimage.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/bitops.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/byteorder.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/ata.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/crossbar.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/dspi.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/edma.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/eport.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/flexbus.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/flexcan.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/intctrl.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/lcd.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/mdha.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/pwm.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/qspi.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/rng.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/skha.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/coldfire/ssi.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/config.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/errno.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/fec.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/fsl_i2c.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/fsl_mcdmafec.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/global_data.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_520x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5227x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5235.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5249.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5253.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5271.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5272.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5275.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5282.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5301x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5329.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_5445x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/immap_547x_8x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/io.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m520x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5227x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5235.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5249.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5253.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5271.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5272.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5275.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5282.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5301x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5329.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m5445x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/m547x_8x.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/posix_types.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/processor.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/ptrace.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/rtc.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/string.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/timer.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/types.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/u-boot.h (100%)
 rename {include/asm-m68k => arch/m68k/include/asm}/uart.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/asm.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/bitops.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/byteorder.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/config.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/errno.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/global_data.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/io.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/microblaze_intc.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/microblaze_timer.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/posix_types.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/processor.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/ptrace.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/string.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/system.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/types.h (100%)
 rename {include/asm-microblaze => arch/microblaze/include/asm}/u-boot.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/addrspace.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/asm.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/au1x00.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/bitops.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/byteorder.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/cachectl.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/cacheops.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/config.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/errno.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/global_data.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/inca-ip.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/io.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/isadep.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/mipsregs.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/posix_types.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/processor.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/ptrace.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/reboot.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/reg.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/regdef.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/sgidefs.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/string.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/system.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/types.h (100%)
 rename {include/asm-mips => arch/mips/include/asm}/u-boot.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/bitops.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/byteorder.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/cache.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/config.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/global_data.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/io.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/posix_types.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/processor.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/psr.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/ptrace.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/status_led.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/string.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/system.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/types.h (100%)
 rename {include/asm-nios => arch/nios/include/asm}/u-boot.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/bitops.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/byteorder.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/cache.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/config.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/global_data.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/io.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/opcodes.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/posix_types.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/processor.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/psr.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/ptrace.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/status_led.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/string.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/system.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/types.h (100%)
 rename {include/asm-nios2 => arch/nios2/include/asm}/u-boot.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/4xx_pci.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/4xx_pcie.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/5xx_immap.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/8xx_immap.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/atomic.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/bitops.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/byteorder.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/cache.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/config.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/cpm_8260.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/cpm_85xx.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/e300.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/errno.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/fsl_ddr_dimm_params.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/fsl_ddr_sdram.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/fsl_dma.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/fsl_i2c.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/fsl_law.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/fsl_lbc.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/fsl_pci.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/fsl_serdes.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/global_data.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/gpio.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/immap_512x.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/immap_8220.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/immap_8260.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/immap_83xx.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/immap_85xx.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/immap_86xx.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/immap_qe.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/interrupt.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/io.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/iopin_8260.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/iopin_85xx.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/iopin_8xx.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/m8260_pci.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/mc146818rtc.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/mmu.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/mp.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/mpc512x.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/mpc8349_pci.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/mpc8xxx_spi.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/pci_io.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/pnp.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/posix_types.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-ebc.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-isram.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-sdram.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx-uic.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/ppc4xx_config.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/processor.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/ptrace.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/residual.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/sigcontext.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/signal.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/status_led.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/string.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/types.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/u-boot.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/unaligned.h (100%)
 rename {include/asm-ppc => arch/ppc/include/asm}/xilinx_irq.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/bitops.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/byteorder.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cache.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/clk.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/config.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh2.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh3.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh4.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7203.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7710.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7720.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7722.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7723.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7750.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7763.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7780.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/cpu_sh7785.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/errno.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/global_data.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/io.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/irqflags.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/macro.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/pci.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/posix_types.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/processor.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/ptrace.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/string.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/system.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/types.h (100%)
 rename {include/asm-sh => arch/sh/include/asm}/u-boot.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/arch-leon2/asi.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/arch-leon3/asi.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/asi.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/asmmacro.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/atomic.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/bitops.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/byteorder.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/cache.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/config.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/errno.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/global_data.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/io.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/irq.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/leon.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/leon2.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/leon3.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/machines.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/page.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/posix_types.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/processor.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/prom.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/psr.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/ptrace.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/srmmu.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/stack.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/string.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/types.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/u-boot.h (100%)
 rename {include/asm-sparc => arch/sparc/include/asm}/winmacro.h (100%)
arch/.gitignore new file +2 -0
new file mode 100644
index 0000000..e05b593
@@ -0,0 +1,2 @@
+*/include/asm/arch
+*/include/asm/proc
arch/arm/include/asm/arch-a320/a320.h renamed from include/asm-arm/arch-a320/a320.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-a320/a320.h
rename to arch/arm/include/asm/arch-a320/a320.h
arch/arm/include/asm/arch-a320/ftpmu010.h renamed from include/asm-arm/arch-a320/ftpmu010.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-a320/ftpmu010.h
rename to arch/arm/include/asm/arch-a320/ftpmu010.h
arch/arm/include/asm/arch-a320/ftsdmc020.h renamed from include/asm-arm/arch-a320/ftsdmc020.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-a320/ftsdmc020.h
rename to arch/arm/include/asm/arch-a320/ftsdmc020.h
arch/arm/include/asm/arch-a320/ftsmc020.h renamed from include/asm-arm/arch-a320/ftsmc020.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-a320/ftsmc020.h
rename to arch/arm/include/asm/arch-a320/ftsmc020.h
arch/arm/include/asm/arch-a320/fttmr010.h renamed from include/asm-arm/arch-a320/fttmr010.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-a320/fttmr010.h
rename to arch/arm/include/asm/arch-a320/fttmr010.h
arch/arm/include/asm/arch-arm720t/hardware.h renamed from include/asm-arm/arch-arm720t/hardware.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm720t/hardware.h
rename to arch/arm/include/asm/arch-arm720t/hardware.h
arch/arm/include/asm/arch-arm720t/netarm_dma_module.h renamed from include/asm-arm/arch-arm720t/netarm_dma_module.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_dma_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_dma_module.h
arch/arm/include/asm/arch-arm720t/netarm_eni_module.h renamed from include/asm-arm/arch-arm720t/netarm_eni_module.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_eni_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_eni_module.h
arch/arm/include/asm/arch-arm720t/netarm_eth_module.h renamed from include/asm-arm/arch-arm720t/netarm_eth_module.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_eth_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_eth_module.h
arch/arm/include/asm/arch-arm720t/netarm_gen_module.h renamed from include/asm-arm/arch-arm720t/netarm_gen_module.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_gen_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_gen_module.h
arch/arm/include/asm/arch-arm720t/netarm_mem_module.h renamed from include/asm-arm/arch-arm720t/netarm_mem_module.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_mem_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_mem_module.h
arch/arm/include/asm/arch-arm720t/netarm_registers.h renamed from include/asm-arm/arch-arm720t/netarm_registers.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_registers.h
rename to arch/arm/include/asm/arch-arm720t/netarm_registers.h
arch/arm/include/asm/arch-arm720t/netarm_ser_module.h renamed from include/asm-arm/arch-arm720t/netarm_ser_module.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm720t/netarm_ser_module.h
rename to arch/arm/include/asm/arch-arm720t/netarm_ser_module.h
arch/arm/include/asm/arch-arm925t/sizes.h renamed from include/asm-arm/arch-arm925t/sizes.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm925t/sizes.h
rename to arch/arm/include/asm/arch-arm925t/sizes.h
arch/arm/include/asm/arch-arm926ejs/sizes.h renamed from include/asm-arm/arch-arm926ejs/sizes.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-arm926ejs/sizes.h
rename to arch/arm/include/asm/arch-arm926ejs/sizes.h
arch/arm/include/asm/arch-at91/at91_common.h renamed from include/asm-arm/arch-at91/at91_common.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91_common.h
rename to arch/arm/include/asm/arch-at91/at91_common.h
arch/arm/include/asm/arch-at91/at91_pio.h renamed from include/asm-arm/arch-at91/at91_pio.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91_pio.h
rename to arch/arm/include/asm/arch-at91/at91_pio.h
arch/arm/include/asm/arch-at91/at91_pit.h renamed from include/asm-arm/arch-at91/at91_pit.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91_pit.h
rename to arch/arm/include/asm/arch-at91/at91_pit.h
arch/arm/include/asm/arch-at91/at91_pmc.h renamed from include/asm-arm/arch-at91/at91_pmc.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91_pmc.h
rename to arch/arm/include/asm/arch-at91/at91_pmc.h
arch/arm/include/asm/arch-at91/at91_rstc.h renamed from include/asm-arm/arch-at91/at91_rstc.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91_rstc.h
rename to arch/arm/include/asm/arch-at91/at91_rstc.h
arch/arm/include/asm/arch-at91/at91_spi.h renamed from include/asm-arm/arch-at91/at91_spi.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91_spi.h
rename to arch/arm/include/asm/arch-at91/at91_spi.h
arch/arm/include/asm/arch-at91/at91_wdt.h renamed from include/asm-arm/arch-at91/at91_wdt.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91_wdt.h
rename to arch/arm/include/asm/arch-at91/at91_wdt.h
arch/arm/include/asm/arch-at91/at91cap9.h renamed from include/asm-arm/arch-at91/at91cap9.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91cap9.h
rename to arch/arm/include/asm/arch-at91/at91cap9.h
arch/arm/include/asm/arch-at91/at91cap9_matrix.h renamed from include/asm-arm/arch-at91/at91cap9_matrix.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91cap9_matrix.h
rename to arch/arm/include/asm/arch-at91/at91cap9_matrix.h
arch/arm/include/asm/arch-at91/at91sam9260.h renamed from include/asm-arm/arch-at91/at91sam9260.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9260.h
rename to arch/arm/include/asm/arch-at91/at91sam9260.h
arch/arm/include/asm/arch-at91/at91sam9260_matrix.h renamed from include/asm-arm/arch-at91/at91sam9260_matrix.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9260_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9260_matrix.h
arch/arm/include/asm/arch-at91/at91sam9261.h renamed from include/asm-arm/arch-at91/at91sam9261.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9261.h
rename to arch/arm/include/asm/arch-at91/at91sam9261.h
arch/arm/include/asm/arch-at91/at91sam9261_matrix.h renamed from include/asm-arm/arch-at91/at91sam9261_matrix.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9261_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9261_matrix.h
arch/arm/include/asm/arch-at91/at91sam9263.h renamed from include/asm-arm/arch-at91/at91sam9263.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9263.h
rename to arch/arm/include/asm/arch-at91/at91sam9263.h
arch/arm/include/asm/arch-at91/at91sam9263_matrix.h renamed from include/asm-arm/arch-at91/at91sam9263_matrix.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9263_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9263_matrix.h
arch/arm/include/asm/arch-at91/at91sam9_matrix.h renamed from include/asm-arm/arch-at91/at91sam9_matrix.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9_matrix.h
arch/arm/include/asm/arch-at91/at91sam9_sdramc.h renamed from include/asm-arm/arch-at91/at91sam9_sdramc.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9_sdramc.h
rename to arch/arm/include/asm/arch-at91/at91sam9_sdramc.h
arch/arm/include/asm/arch-at91/at91sam9_smc.h renamed from include/asm-arm/arch-at91/at91sam9_smc.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9_smc.h
rename to arch/arm/include/asm/arch-at91/at91sam9_smc.h
arch/arm/include/asm/arch-at91/at91sam9g45.h renamed from include/asm-arm/arch-at91/at91sam9g45.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9g45.h
rename to arch/arm/include/asm/arch-at91/at91sam9g45.h
arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h renamed from include/asm-arm/arch-at91/at91sam9g45_matrix.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9g45_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h
arch/arm/include/asm/arch-at91/at91sam9rl.h renamed from include/asm-arm/arch-at91/at91sam9rl.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9rl.h
rename to arch/arm/include/asm/arch-at91/at91sam9rl.h
arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h renamed from include/asm-arm/arch-at91/at91sam9rl_matrix.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/at91sam9rl_matrix.h
rename to arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h
arch/arm/include/asm/arch-at91/clk.h renamed from include/asm-arm/arch-at91/clk.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/clk.h
rename to arch/arm/include/asm/arch-at91/clk.h
arch/arm/include/asm/arch-at91/gpio.h renamed from include/asm-arm/arch-at91/gpio.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/gpio.h
rename to arch/arm/include/asm/arch-at91/gpio.h
arch/arm/include/asm/arch-at91/hardware.h renamed from include/asm-arm/arch-at91/hardware.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/hardware.h
rename to arch/arm/include/asm/arch-at91/hardware.h
arch/arm/include/asm/arch-at91/io.h renamed from include/asm-arm/arch-at91/io.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/io.h
rename to arch/arm/include/asm/arch-at91/io.h
arch/arm/include/asm/arch-at91/memory-map.h renamed from include/asm-arm/arch-at91/memory-map.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91/memory-map.h
rename to arch/arm/include/asm/arch-at91/memory-map.h
arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h renamed from include/asm-arm/arch-at91rm9200/AT91RM9200.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91rm9200/AT91RM9200.h
rename to arch/arm/include/asm/arch-at91rm9200/AT91RM9200.h
arch/arm/include/asm/arch-at91rm9200/hardware.h renamed from include/asm-arm/arch-at91rm9200/hardware.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-at91rm9200/hardware.h
rename to arch/arm/include/asm/arch-at91rm9200/hardware.h
arch/arm/include/asm/arch-davinci/emac_defs.h renamed from include/asm-arm/arch-davinci/emac_defs.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-davinci/emac_defs.h
rename to arch/arm/include/asm/arch-davinci/emac_defs.h
arch/arm/include/asm/arch-davinci/emif_defs.h renamed from include/asm-arm/arch-davinci/emif_defs.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-davinci/emif_defs.h
rename to arch/arm/include/asm/arch-davinci/emif_defs.h
arch/arm/include/asm/arch-davinci/gpio_defs.h renamed from include/asm-arm/arch-davinci/gpio_defs.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-davinci/gpio_defs.h
rename to arch/arm/include/asm/arch-davinci/gpio_defs.h
arch/arm/include/asm/arch-davinci/hardware.h renamed from include/asm-arm/arch-davinci/hardware.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-davinci/hardware.h
rename to arch/arm/include/asm/arch-davinci/hardware.h
arch/arm/include/asm/arch-davinci/i2c_defs.h renamed from include/asm-arm/arch-davinci/i2c_defs.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-davinci/i2c_defs.h
rename to arch/arm/include/asm/arch-davinci/i2c_defs.h
arch/arm/include/asm/arch-davinci/nand_defs.h renamed from include/asm-arm/arch-davinci/nand_defs.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-davinci/nand_defs.h
rename to arch/arm/include/asm/arch-davinci/nand_defs.h
arch/arm/include/asm/arch-imx/imx-regs.h renamed from include/asm-arm/arch-imx/imx-regs.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-imx/imx-regs.h
rename to arch/arm/include/asm/arch-imx/imx-regs.h
arch/arm/include/asm/arch-ixp/ixp425.h renamed from include/asm-arm/arch-ixp/ixp425.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-ixp/ixp425.h
rename to arch/arm/include/asm/arch-ixp/ixp425.h
arch/arm/include/asm/arch-ixp/ixp425pci.h renamed from include/asm-arm/arch-ixp/ixp425pci.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-ixp/ixp425pci.h
rename to arch/arm/include/asm/arch-ixp/ixp425pci.h
arch/arm/include/asm/arch-kirkwood/cpu.h renamed from include/asm-arm/arch-kirkwood/cpu.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-kirkwood/cpu.h
rename to arch/arm/include/asm/arch-kirkwood/cpu.h
arch/arm/include/asm/arch-kirkwood/gpio.h renamed from include/asm-arm/arch-kirkwood/gpio.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-kirkwood/gpio.h
rename to arch/arm/include/asm/arch-kirkwood/gpio.h
arch/arm/include/asm/arch-kirkwood/kirkwood.h renamed from include/asm-arm/arch-kirkwood/kirkwood.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-kirkwood/kirkwood.h
rename to arch/arm/include/asm/arch-kirkwood/kirkwood.h
arch/arm/include/asm/arch-kirkwood/kw88f6192.h renamed from include/asm-arm/arch-kirkwood/kw88f6192.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-kirkwood/kw88f6192.h
rename to arch/arm/include/asm/arch-kirkwood/kw88f6192.h
arch/arm/include/asm/arch-kirkwood/kw88f6281.h renamed from include/asm-arm/arch-kirkwood/kw88f6281.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-kirkwood/kw88f6281.h
rename to arch/arm/include/asm/arch-kirkwood/kw88f6281.h
arch/arm/include/asm/arch-kirkwood/mpp.h renamed from include/asm-arm/arch-kirkwood/mpp.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-kirkwood/mpp.h
rename to arch/arm/include/asm/arch-kirkwood/mpp.h
arch/arm/include/asm/arch-kirkwood/spi.h renamed from include/asm-arm/arch-kirkwood/spi.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-kirkwood/spi.h
rename to arch/arm/include/asm/arch-kirkwood/spi.h
arch/arm/include/asm/arch-ks8695/platform.h renamed from include/asm-arm/arch-ks8695/platform.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-ks8695/platform.h
rename to arch/arm/include/asm/arch-ks8695/platform.h
arch/arm/include/asm/arch-lpc2292/hardware.h renamed from include/asm-arm/arch-lpc2292/hardware.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-lpc2292/hardware.h
rename to arch/arm/include/asm/arch-lpc2292/hardware.h
arch/arm/include/asm/arch-lpc2292/lpc2292_registers.h renamed from include/asm-arm/arch-lpc2292/lpc2292_registers.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-lpc2292/lpc2292_registers.h
rename to arch/arm/include/asm/arch-lpc2292/lpc2292_registers.h
arch/arm/include/asm/arch-lpc2292/spi.h renamed from include/asm-arm/arch-lpc2292/spi.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-lpc2292/spi.h
rename to arch/arm/include/asm/arch-lpc2292/spi.h
arch/arm/include/asm/arch-mx27/asm-offsets.h renamed from include/asm-arm/arch-mx27/asm-offsets.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-mx27/asm-offsets.h
rename to arch/arm/include/asm/arch-mx27/asm-offsets.h
arch/arm/include/asm/arch-mx27/clock.h renamed from include/asm-arm/arch-mx27/clock.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-mx27/clock.h
rename to arch/arm/include/asm/arch-mx27/clock.h
arch/arm/include/asm/arch-mx27/imx-regs.h renamed from include/asm-arm/arch-mx27/imx-regs.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-mx27/imx-regs.h
rename to arch/arm/include/asm/arch-mx27/imx-regs.h
arch/arm/include/asm/arch-mx27/mxcmmc.h renamed from include/asm-arm/arch-mx27/mxcmmc.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-mx27/mxcmmc.h
rename to arch/arm/include/asm/arch-mx27/mxcmmc.h
arch/arm/include/asm/arch-mx31/mx31-regs.h renamed from include/asm-arm/arch-mx31/mx31-regs.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-mx31/mx31-regs.h
rename to arch/arm/include/asm/arch-mx31/mx31-regs.h
arch/arm/include/asm/arch-mx31/mx31.h renamed from include/asm-arm/arch-mx31/mx31.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-mx31/mx31.h
rename to arch/arm/include/asm/arch-mx31/mx31.h
arch/arm/include/asm/arch-nomadik/gpio.h renamed from include/asm-arm/arch-nomadik/gpio.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-nomadik/gpio.h
rename to arch/arm/include/asm/arch-nomadik/gpio.h
arch/arm/include/asm/arch-nomadik/mtu.h renamed from include/asm-arm/arch-nomadik/mtu.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-nomadik/mtu.h
rename to arch/arm/include/asm/arch-nomadik/mtu.h
arch/arm/include/asm/arch-omap/sizes.h renamed from include/asm-arm/arch-omap/sizes.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap/sizes.h
rename to arch/arm/include/asm/arch-omap/sizes.h
arch/arm/include/asm/arch-omap24xx/bits.h renamed from include/asm-arm/arch-omap24xx/bits.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap24xx/bits.h
rename to arch/arm/include/asm/arch-omap24xx/bits.h
arch/arm/include/asm/arch-omap24xx/clocks.h renamed from include/asm-arm/arch-omap24xx/clocks.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap24xx/clocks.h
rename to arch/arm/include/asm/arch-omap24xx/clocks.h
arch/arm/include/asm/arch-omap24xx/i2c.h renamed from include/asm-arm/arch-omap24xx/i2c.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap24xx/i2c.h
rename to arch/arm/include/asm/arch-omap24xx/i2c.h
arch/arm/include/asm/arch-omap24xx/mem.h renamed from include/asm-arm/arch-omap24xx/mem.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap24xx/mem.h
rename to arch/arm/include/asm/arch-omap24xx/mem.h
arch/arm/include/asm/arch-omap24xx/mux.h renamed from include/asm-arm/arch-omap24xx/mux.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap24xx/mux.h
rename to arch/arm/include/asm/arch-omap24xx/mux.h
arch/arm/include/asm/arch-omap24xx/omap2420.h renamed from include/asm-arm/arch-omap24xx/omap2420.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap24xx/omap2420.h
rename to arch/arm/include/asm/arch-omap24xx/omap2420.h
arch/arm/include/asm/arch-omap24xx/sizes.h renamed from include/asm-arm/arch-omap24xx/sizes.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap24xx/sizes.h
rename to arch/arm/include/asm/arch-omap24xx/sizes.h
arch/arm/include/asm/arch-omap24xx/sys_info.h renamed from include/asm-arm/arch-omap24xx/sys_info.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap24xx/sys_info.h
rename to arch/arm/include/asm/arch-omap24xx/sys_info.h
arch/arm/include/asm/arch-omap24xx/sys_proto.h renamed from include/asm-arm/arch-omap24xx/sys_proto.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap24xx/sys_proto.h
rename to arch/arm/include/asm/arch-omap24xx/sys_proto.h
arch/arm/include/asm/arch-omap3/clocks.h renamed from include/asm-arm/arch-omap3/clocks.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/clocks.h
rename to arch/arm/include/asm/arch-omap3/clocks.h
arch/arm/include/asm/arch-omap3/clocks_omap3.h renamed from include/asm-arm/arch-omap3/clocks_omap3.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/clocks_omap3.h
rename to arch/arm/include/asm/arch-omap3/clocks_omap3.h
arch/arm/include/asm/arch-omap3/cpu.h renamed from include/asm-arm/arch-omap3/cpu.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/cpu.h
rename to arch/arm/include/asm/arch-omap3/cpu.h
arch/arm/include/asm/arch-omap3/gpio.h renamed from include/asm-arm/arch-omap3/gpio.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/gpio.h
rename to arch/arm/include/asm/arch-omap3/gpio.h
arch/arm/include/asm/arch-omap3/i2c.h renamed from include/asm-arm/arch-omap3/i2c.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/i2c.h
rename to arch/arm/include/asm/arch-omap3/i2c.h
arch/arm/include/asm/arch-omap3/mem.h renamed from include/asm-arm/arch-omap3/mem.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/mem.h
rename to arch/arm/include/asm/arch-omap3/mem.h
arch/arm/include/asm/arch-omap3/mmc.h renamed from include/asm-arm/arch-omap3/mmc.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/mmc.h
rename to arch/arm/include/asm/arch-omap3/mmc.h
arch/arm/include/asm/arch-omap3/mmc_host_def.h renamed from include/asm-arm/arch-omap3/mmc_host_def.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/mmc_host_def.h
rename to arch/arm/include/asm/arch-omap3/mmc_host_def.h
arch/arm/include/asm/arch-omap3/mux.h renamed from include/asm-arm/arch-omap3/mux.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/mux.h
rename to arch/arm/include/asm/arch-omap3/mux.h
arch/arm/include/asm/arch-omap3/omap3.h renamed from include/asm-arm/arch-omap3/omap3.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/omap3.h
rename to arch/arm/include/asm/arch-omap3/omap3.h
arch/arm/include/asm/arch-omap3/omap_gpmc.h renamed from include/asm-arm/arch-omap3/omap_gpmc.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/omap_gpmc.h
rename to arch/arm/include/asm/arch-omap3/omap_gpmc.h
arch/arm/include/asm/arch-omap3/sys_proto.h renamed from include/asm-arm/arch-omap3/sys_proto.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-omap3/sys_proto.h
rename to arch/arm/include/asm/arch-omap3/sys_proto.h
arch/arm/include/asm/arch-pxa/bitfield.h renamed from include/asm-arm/arch-pxa/bitfield.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-pxa/bitfield.h
rename to arch/arm/include/asm/arch-pxa/bitfield.h
arch/arm/include/asm/arch-pxa/hardware.h renamed from include/asm-arm/arch-pxa/hardware.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-pxa/hardware.h
rename to arch/arm/include/asm/arch-pxa/hardware.h
arch/arm/include/asm/arch-pxa/pxa-regs.h renamed from include/asm-arm/arch-pxa/pxa-regs.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-pxa/pxa-regs.h
rename to arch/arm/include/asm/arch-pxa/pxa-regs.h
arch/arm/include/asm/arch-s3c24x0/memory.h renamed from include/asm-arm/arch-s3c24x0/memory.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s3c24x0/memory.h
rename to arch/arm/include/asm/arch-s3c24x0/memory.h
arch/arm/include/asm/arch-s3c24x0/s3c2400.h renamed from include/asm-arm/arch-s3c24x0/s3c2400.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s3c24x0/s3c2400.h
rename to arch/arm/include/asm/arch-s3c24x0/s3c2400.h
arch/arm/include/asm/arch-s3c24x0/s3c2410.h renamed from include/asm-arm/arch-s3c24x0/s3c2410.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s3c24x0/s3c2410.h
rename to arch/arm/include/asm/arch-s3c24x0/s3c2410.h
arch/arm/include/asm/arch-s3c24x0/s3c24x0.h renamed from include/asm-arm/arch-s3c24x0/s3c24x0.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s3c24x0/s3c24x0.h
rename to arch/arm/include/asm/arch-s3c24x0/s3c24x0.h
arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h renamed from include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s3c24x0/s3c24x0_cpu.h
rename to arch/arm/include/asm/arch-s3c24x0/s3c24x0_cpu.h
arch/arm/include/asm/arch-s3c44b0/hardware.h renamed from include/asm-arm/arch-s3c44b0/hardware.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s3c44b0/hardware.h
rename to arch/arm/include/asm/arch-s3c44b0/hardware.h
arch/arm/include/asm/arch-s3c4510b/hardware.h renamed from include/asm-arm/arch-s3c4510b/hardware.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s3c4510b/hardware.h
rename to arch/arm/include/asm/arch-s3c4510b/hardware.h
arch/arm/include/asm/arch-s3c64xx/hardware.h renamed from include/asm-arm/arch-s3c64xx/hardware.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s3c64xx/hardware.h
rename to arch/arm/include/asm/arch-s3c64xx/hardware.h
arch/arm/include/asm/arch-s3c64xx/s3c6400.h renamed from include/asm-arm/arch-s3c64xx/s3c6400.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s3c64xx/s3c6400.h
rename to arch/arm/include/asm/arch-s3c64xx/s3c6400.h
arch/arm/include/asm/arch-s3c64xx/s3c64x0.h renamed from include/asm-arm/arch-s3c64xx/s3c64x0.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s3c64xx/s3c64x0.h
rename to arch/arm/include/asm/arch-s3c64xx/s3c64x0.h
arch/arm/include/asm/arch-s5pc1xx/clk.h renamed from include/asm-arm/arch-s5pc1xx/clk.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/clk.h
rename to arch/arm/include/asm/arch-s5pc1xx/clk.h
arch/arm/include/asm/arch-s5pc1xx/clock.h renamed from include/asm-arm/arch-s5pc1xx/clock.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/clock.h
rename to arch/arm/include/asm/arch-s5pc1xx/clock.h
arch/arm/include/asm/arch-s5pc1xx/cpu.h renamed from include/asm-arm/arch-s5pc1xx/cpu.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/cpu.h
rename to arch/arm/include/asm/arch-s5pc1xx/cpu.h
arch/arm/include/asm/arch-s5pc1xx/gpio.h renamed from include/asm-arm/arch-s5pc1xx/gpio.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/gpio.h
rename to arch/arm/include/asm/arch-s5pc1xx/gpio.h
arch/arm/include/asm/arch-s5pc1xx/power.h renamed from include/asm-arm/arch-s5pc1xx/power.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/power.h
rename to arch/arm/include/asm/arch-s5pc1xx/power.h
arch/arm/include/asm/arch-s5pc1xx/pwm.h renamed from include/asm-arm/arch-s5pc1xx/pwm.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/pwm.h
rename to arch/arm/include/asm/arch-s5pc1xx/pwm.h
arch/arm/include/asm/arch-s5pc1xx/uart.h renamed from include/asm-arm/arch-s5pc1xx/uart.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-s5pc1xx/uart.h
rename to arch/arm/include/asm/arch-s5pc1xx/uart.h
arch/arm/include/asm/arch-sa1100/bitfield.h renamed from include/asm-arm/arch-sa1100/bitfield.h +0 -0
similarity index 100%
rename from include/asm-arm/arch-sa1100/bitfield.h
rename to arch/arm/include/asm/arch-sa1100/bitfield.h
arch/arm/include/asm/atomic.h renamed from include/asm-arm/atomic.h +0 -0
similarity index 100%
rename from include/asm-arm/atomic.h
rename to arch/arm/include/asm/atomic.h
arch/arm/include/asm/bitops.h renamed from include/asm-arm/bitops.h +0 -0
similarity index 100%
rename from include/asm-arm/bitops.h
rename to arch/arm/include/asm/bitops.h
arch/arm/include/asm/byteorder.h renamed from include/asm-arm/byteorder.h +0 -0
similarity index 100%
rename from include/asm-arm/byteorder.h
rename to arch/arm/include/asm/byteorder.h
arch/arm/include/asm/cache.h renamed from include/asm-arm/cache.h +0 -0
similarity index 100%
rename from include/asm-arm/cache.h
rename to arch/arm/include/asm/cache.h
arch/arm/include/asm/config.h renamed from include/asm-arm/config.h +0 -0
similarity index 100%
rename from include/asm-arm/config.h
rename to arch/arm/include/asm/config.h
arch/arm/include/asm/dma-mapping.h renamed from include/asm-arm/dma-mapping.h +0 -0
similarity index 100%
rename from include/asm-arm/dma-mapping.h
rename to arch/arm/include/asm/dma-mapping.h
arch/arm/include/asm/errno.h renamed from include/asm-arm/errno.h +0 -0
similarity index 100%
rename from include/asm-arm/errno.h
rename to arch/arm/include/asm/errno.h
arch/arm/include/asm/global_data.h renamed from include/asm-arm/global_data.h +0 -0
similarity index 100%
rename from include/asm-arm/global_data.h
rename to arch/arm/include/asm/global_data.h
arch/arm/include/asm/hardware.h renamed from include/asm-arm/hardware.h +0 -0
similarity index 100%
rename from include/asm-arm/hardware.h
rename to arch/arm/include/asm/hardware.h
arch/arm/include/asm/io.h renamed from include/asm-arm/io.h +0 -0
similarity index 100%
rename from include/asm-arm/io.h
rename to arch/arm/include/asm/io.h
arch/arm/include/asm/mach-types.h renamed from include/asm-arm/mach-types.h +0 -0
similarity index 100%
rename from include/asm-arm/mach-types.h
rename to arch/arm/include/asm/mach-types.h
arch/arm/include/asm/macro.h renamed from include/asm-arm/macro.h +0 -0
similarity index 100%
rename from include/asm-arm/macro.h
rename to arch/arm/include/asm/macro.h
arch/arm/include/asm/memory.h renamed from include/asm-arm/memory.h +0 -0
similarity index 100%
rename from include/asm-arm/memory.h
rename to arch/arm/include/asm/memory.h
arch/arm/include/asm/posix_types.h renamed from include/asm-arm/posix_types.h +0 -0
similarity index 100%
rename from include/asm-arm/posix_types.h
rename to arch/arm/include/asm/posix_types.h
arch/arm/include/asm/proc-armv/domain.h renamed from include/asm-arm/proc-armv/domain.h +0 -0
similarity index 100%
rename from include/asm-arm/proc-armv/domain.h
rename to arch/arm/include/asm/proc-armv/domain.h
arch/arm/include/asm/proc-armv/processor.h renamed from include/asm-arm/proc-armv/processor.h +0 -0
similarity index 100%
rename from include/asm-arm/proc-armv/processor.h
rename to arch/arm/include/asm/proc-armv/processor.h
arch/arm/include/asm/proc-armv/ptrace.h renamed from include/asm-arm/proc-armv/ptrace.h +0 -0
similarity index 100%
rename from include/asm-arm/proc-armv/ptrace.h
rename to arch/arm/include/asm/proc-armv/ptrace.h
arch/arm/include/asm/proc-armv/system.h renamed from include/asm-arm/proc-armv/system.h +0 -0
similarity index 100%
rename from include/asm-arm/proc-armv/system.h
rename to arch/arm/include/asm/proc-armv/system.h
arch/arm/include/asm/processor.h renamed from include/asm-arm/processor.h +0 -0
similarity index 100%
rename from include/asm-arm/processor.h
rename to arch/arm/include/asm/processor.h
arch/arm/include/asm/ptrace.h renamed from include/asm-arm/ptrace.h +0 -0
similarity index 100%
rename from include/asm-arm/ptrace.h
rename to arch/arm/include/asm/ptrace.h
arch/arm/include/asm/setup.h renamed from include/asm-arm/setup.h +0 -0
similarity index 100%
rename from include/asm-arm/setup.h
rename to arch/arm/include/asm/setup.h
arch/arm/include/asm/sizes.h renamed from include/asm-arm/sizes.h +0 -0
similarity index 100%
rename from include/asm-arm/sizes.h
rename to arch/arm/include/asm/sizes.h
arch/arm/include/asm/string.h renamed from include/asm-arm/string.h +0 -0
similarity index 100%
rename from include/asm-arm/string.h
rename to arch/arm/include/asm/string.h
arch/arm/include/asm/system.h renamed from include/asm-arm/system.h +0 -0
similarity index 100%
rename from include/asm-arm/system.h
rename to arch/arm/include/asm/system.h
arch/arm/include/asm/types.h renamed from include/asm-arm/types.h +0 -0
similarity index 100%
rename from include/asm-arm/types.h
rename to arch/arm/include/asm/types.h
arch/arm/include/asm/u-boot-arm.h renamed from include/asm-arm/u-boot-arm.h +0 -0
similarity index 100%
rename from include/asm-arm/u-boot-arm.h
rename to arch/arm/include/asm/u-boot-arm.h
arch/arm/include/asm/u-boot.h renamed from include/asm-arm/u-boot.h +0 -0
similarity index 100%
rename from include/asm-arm/u-boot.h
rename to arch/arm/include/asm/u-boot.h
arch/arm/include/asm/unaligned.h renamed from include/asm-arm/unaligned.h +0 -0
similarity index 100%
rename from include/asm-arm/unaligned.h
rename to arch/arm/include/asm/unaligned.h
arch/avr32/include/asm/arch-at32ap700x/addrspace.h renamed from include/asm-avr32/arch-at32ap700x/addrspace.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/addrspace.h
rename to arch/avr32/include/asm/arch-at32ap700x/addrspace.h
arch/avr32/include/asm/arch-at32ap700x/cacheflush.h renamed from include/asm-avr32/arch-at32ap700x/cacheflush.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/cacheflush.h
rename to arch/avr32/include/asm/arch-at32ap700x/cacheflush.h
arch/avr32/include/asm/arch-at32ap700x/chip-features.h renamed from include/asm-avr32/arch-at32ap700x/chip-features.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/chip-features.h
rename to arch/avr32/include/asm/arch-at32ap700x/chip-features.h
arch/avr32/include/asm/arch-at32ap700x/clk.h renamed from include/asm-avr32/arch-at32ap700x/clk.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/clk.h
rename to arch/avr32/include/asm/arch-at32ap700x/clk.h
arch/avr32/include/asm/arch-at32ap700x/gpio-impl.h renamed from include/asm-avr32/arch-at32ap700x/gpio-impl.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/gpio-impl.h
rename to arch/avr32/include/asm/arch-at32ap700x/gpio-impl.h
arch/avr32/include/asm/arch-at32ap700x/gpio.h renamed from include/asm-avr32/arch-at32ap700x/gpio.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/gpio.h
rename to arch/avr32/include/asm/arch-at32ap700x/gpio.h
arch/avr32/include/asm/arch-at32ap700x/hmatrix.h renamed from include/asm-avr32/arch-at32ap700x/hmatrix.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/hmatrix.h
rename to arch/avr32/include/asm/arch-at32ap700x/hmatrix.h
arch/avr32/include/asm/arch-at32ap700x/memory-map.h renamed from include/asm-avr32/arch-at32ap700x/memory-map.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/memory-map.h
rename to arch/avr32/include/asm/arch-at32ap700x/memory-map.h
arch/avr32/include/asm/arch-at32ap700x/portmux.h renamed from include/asm-avr32/arch-at32ap700x/portmux.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-at32ap700x/portmux.h
rename to arch/avr32/include/asm/arch-at32ap700x/portmux.h
arch/avr32/include/asm/arch-common/portmux-gpio.h renamed from include/asm-avr32/arch-common/portmux-gpio.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-common/portmux-gpio.h
rename to arch/avr32/include/asm/arch-common/portmux-gpio.h
arch/avr32/include/asm/arch-common/portmux-pio.h renamed from include/asm-avr32/arch-common/portmux-pio.h +0 -0
similarity index 100%
rename from include/asm-avr32/arch-common/portmux-pio.h
rename to arch/avr32/include/asm/arch-common/portmux-pio.h
arch/avr32/include/asm/bitops.h renamed from include/asm-avr32/bitops.h +0 -0
similarity index 100%
rename from include/asm-avr32/bitops.h
rename to arch/avr32/include/asm/bitops.h
arch/avr32/include/asm/byteorder.h renamed from include/asm-avr32/byteorder.h +0 -0
similarity index 100%
rename from include/asm-avr32/byteorder.h
rename to arch/avr32/include/asm/byteorder.h
arch/avr32/include/asm/config.h renamed from include/asm-avr32/config.h +0 -0
similarity index 100%
rename from include/asm-avr32/config.h
rename to arch/avr32/include/asm/config.h
arch/avr32/include/asm/dma-mapping.h renamed from include/asm-avr32/dma-mapping.h +0 -0
similarity index 100%
rename from include/asm-avr32/dma-mapping.h
rename to arch/avr32/include/asm/dma-mapping.h
arch/avr32/include/asm/errno.h renamed from include/asm-avr32/errno.h +0 -0
similarity index 100%
rename from include/asm-avr32/errno.h
rename to arch/avr32/include/asm/errno.h
arch/avr32/include/asm/global_data.h renamed from include/asm-avr32/global_data.h +0 -0
similarity index 100%
rename from include/asm-avr32/global_data.h
rename to arch/avr32/include/asm/global_data.h
arch/avr32/include/asm/hmatrix-common.h renamed from include/asm-avr32/hmatrix-common.h +0 -0
similarity index 100%
rename from include/asm-avr32/hmatrix-common.h
rename to arch/avr32/include/asm/hmatrix-common.h
arch/avr32/include/asm/initcalls.h renamed from include/asm-avr32/initcalls.h +0 -0
similarity index 100%
rename from include/asm-avr32/initcalls.h
rename to arch/avr32/include/asm/initcalls.h
arch/avr32/include/asm/io.h renamed from include/asm-avr32/io.h +0 -0
similarity index 100%
rename from include/asm-avr32/io.h
rename to arch/avr32/include/asm/io.h
arch/avr32/include/asm/posix_types.h renamed from include/asm-avr32/posix_types.h +0 -0
similarity index 100%
rename from include/asm-avr32/posix_types.h
rename to arch/avr32/include/asm/posix_types.h
arch/avr32/include/asm/processor.h renamed from include/asm-avr32/processor.h +0 -0
similarity index 100%
rename from include/asm-avr32/processor.h
rename to arch/avr32/include/asm/processor.h
arch/avr32/include/asm/ptrace.h renamed from include/asm-avr32/ptrace.h +0 -0
similarity index 100%
rename from include/asm-avr32/ptrace.h
rename to arch/avr32/include/asm/ptrace.h
arch/avr32/include/asm/sdram.h renamed from include/asm-avr32/sdram.h +0 -0
similarity index 100%
rename from include/asm-avr32/sdram.h
rename to arch/avr32/include/asm/sdram.h
arch/avr32/include/asm/sections.h renamed from include/asm-avr32/sections.h +0 -0
similarity index 100%
rename from include/asm-avr32/sections.h
rename to arch/avr32/include/asm/sections.h
arch/avr32/include/asm/setup.h renamed from include/asm-avr32/setup.h +0 -0
similarity index 100%
rename from include/asm-avr32/setup.h
rename to arch/avr32/include/asm/setup.h
arch/avr32/include/asm/string.h renamed from include/asm-avr32/string.h +0 -0
similarity index 100%
rename from include/asm-avr32/string.h
rename to arch/avr32/include/asm/string.h
arch/avr32/include/asm/sysreg.h renamed from include/asm-avr32/sysreg.h +0 -0
similarity index 100%
rename from include/asm-avr32/sysreg.h
rename to arch/avr32/include/asm/sysreg.h
arch/avr32/include/asm/types.h renamed from include/asm-avr32/types.h +0 -0
similarity index 100%
rename from include/asm-avr32/types.h
rename to arch/avr32/include/asm/types.h
arch/avr32/include/asm/u-boot.h renamed from include/asm-avr32/u-boot.h +0 -0
similarity index 100%
rename from include/asm-avr32/u-boot.h
rename to arch/avr32/include/asm/u-boot.h
arch/blackfin/include/asm/bfin_logo_230x230.h renamed from include/asm-blackfin/bfin_logo_230x230.h +0 -0
similarity index 100%
rename from include/asm-blackfin/bfin_logo_230x230.h
rename to arch/blackfin/include/asm/bfin_logo_230x230.h
arch/blackfin/include/asm/bitops.h renamed from include/asm-blackfin/bitops.h +0 -0
similarity index 100%
rename from include/asm-blackfin/bitops.h
rename to arch/blackfin/include/asm/bitops.h
arch/blackfin/include/asm/blackfin.h renamed from include/asm-blackfin/blackfin.h +0 -0
similarity index 100%
rename from include/asm-blackfin/blackfin.h
rename to arch/blackfin/include/asm/blackfin.h
arch/blackfin/include/asm/blackfin_cdef.h renamed from include/asm-blackfin/blackfin_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/blackfin_cdef.h
rename to arch/blackfin/include/asm/blackfin_cdef.h
arch/blackfin/include/asm/blackfin_def.h renamed from include/asm-blackfin/blackfin_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/blackfin_def.h
rename to arch/blackfin/include/asm/blackfin_def.h
arch/blackfin/include/asm/blackfin_local.h renamed from include/asm-blackfin/blackfin_local.h +0 -0
similarity index 100%
rename from include/asm-blackfin/blackfin_local.h
rename to arch/blackfin/include/asm/blackfin_local.h
arch/blackfin/include/asm/byteorder.h renamed from include/asm-blackfin/byteorder.h +0 -0
similarity index 100%
rename from include/asm-blackfin/byteorder.h
rename to arch/blackfin/include/asm/byteorder.h
arch/blackfin/include/asm/config-pre.h renamed from include/asm-blackfin/config-pre.h +0 -0
similarity index 100%
rename from include/asm-blackfin/config-pre.h
rename to arch/blackfin/include/asm/config-pre.h
arch/blackfin/include/asm/config.h renamed from include/asm-blackfin/config.h +0 -0
similarity index 100%
rename from include/asm-blackfin/config.h
rename to arch/blackfin/include/asm/config.h
arch/blackfin/include/asm/cplb.h renamed from include/asm-blackfin/cplb.h +0 -0
similarity index 100%
rename from include/asm-blackfin/cplb.h
rename to arch/blackfin/include/asm/cplb.h
arch/blackfin/include/asm/delay.h renamed from include/asm-blackfin/delay.h +0 -0
similarity index 100%
rename from include/asm-blackfin/delay.h
rename to arch/blackfin/include/asm/delay.h
arch/blackfin/include/asm/entry.h renamed from include/asm-blackfin/entry.h +0 -0
similarity index 100%
rename from include/asm-blackfin/entry.h
rename to arch/blackfin/include/asm/entry.h
arch/blackfin/include/asm/errno.h renamed from include/asm-blackfin/errno.h +0 -0
similarity index 100%
rename from include/asm-blackfin/errno.h
rename to arch/blackfin/include/asm/errno.h
arch/blackfin/include/asm/global_data.h renamed from include/asm-blackfin/global_data.h +0 -0
similarity index 100%
rename from include/asm-blackfin/global_data.h
rename to arch/blackfin/include/asm/global_data.h
arch/blackfin/include/asm/io.h renamed from include/asm-blackfin/io.h +0 -0
similarity index 100%
rename from include/asm-blackfin/io.h
rename to arch/blackfin/include/asm/io.h
arch/blackfin/include/asm/linkage.h renamed from include/asm-blackfin/linkage.h +0 -0
similarity index 100%
rename from include/asm-blackfin/linkage.h
rename to arch/blackfin/include/asm/linkage.h
arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h renamed from include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_cdef.h
arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h renamed from include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/ADSP-EDN-BF52x-extended_def.h
rename to arch/blackfin/include/asm/mach-bf527/ADSP-EDN-BF52x-extended_def.h
arch/blackfin/include/asm/mach-bf527/BF522_cdef.h renamed from include/asm-blackfin/mach-bf527/BF522_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF522_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF522_cdef.h
arch/blackfin/include/asm/mach-bf527/BF522_def.h renamed from include/asm-blackfin/mach-bf527/BF522_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF522_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF522_def.h
arch/blackfin/include/asm/mach-bf527/BF523_cdef.h renamed from include/asm-blackfin/mach-bf527/BF523_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF523_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF523_cdef.h
arch/blackfin/include/asm/mach-bf527/BF523_def.h renamed from include/asm-blackfin/mach-bf527/BF523_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF523_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF523_def.h
arch/blackfin/include/asm/mach-bf527/BF524_cdef.h renamed from include/asm-blackfin/mach-bf527/BF524_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF524_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF524_cdef.h
arch/blackfin/include/asm/mach-bf527/BF524_def.h renamed from include/asm-blackfin/mach-bf527/BF524_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF524_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF524_def.h
arch/blackfin/include/asm/mach-bf527/BF525_cdef.h renamed from include/asm-blackfin/mach-bf527/BF525_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF525_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF525_cdef.h
arch/blackfin/include/asm/mach-bf527/BF525_def.h renamed from include/asm-blackfin/mach-bf527/BF525_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF525_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF525_def.h
arch/blackfin/include/asm/mach-bf527/BF526_cdef.h renamed from include/asm-blackfin/mach-bf527/BF526_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF526_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF526_cdef.h
arch/blackfin/include/asm/mach-bf527/BF526_def.h renamed from include/asm-blackfin/mach-bf527/BF526_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF526_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF526_def.h
arch/blackfin/include/asm/mach-bf527/BF527_cdef.h renamed from include/asm-blackfin/mach-bf527/BF527_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF527_cdef.h
rename to arch/blackfin/include/asm/mach-bf527/BF527_cdef.h
arch/blackfin/include/asm/mach-bf527/BF527_def.h renamed from include/asm-blackfin/mach-bf527/BF527_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/BF527_def.h
rename to arch/blackfin/include/asm/mach-bf527/BF527_def.h
arch/blackfin/include/asm/mach-bf527/anomaly.h renamed from include/asm-blackfin/mach-bf527/anomaly.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/anomaly.h
rename to arch/blackfin/include/asm/mach-bf527/anomaly.h
arch/blackfin/include/asm/mach-bf527/def_local.h renamed from include/asm-blackfin/mach-bf527/def_local.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/def_local.h
rename to arch/blackfin/include/asm/mach-bf527/def_local.h
arch/blackfin/include/asm/mach-bf527/ports.h renamed from include/asm-blackfin/mach-bf527/ports.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf527/ports.h
rename to arch/blackfin/include/asm/mach-bf527/ports.h
arch/blackfin/include/asm/mach-bf533/BF531_cdef.h renamed from include/asm-blackfin/mach-bf533/BF531_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF531_cdef.h
rename to arch/blackfin/include/asm/mach-bf533/BF531_cdef.h
arch/blackfin/include/asm/mach-bf533/BF531_def.h renamed from include/asm-blackfin/mach-bf533/BF531_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF531_def.h
rename to arch/blackfin/include/asm/mach-bf533/BF531_def.h
arch/blackfin/include/asm/mach-bf533/BF532_cdef.h renamed from include/asm-blackfin/mach-bf533/BF532_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF532_cdef.h
rename to arch/blackfin/include/asm/mach-bf533/BF532_cdef.h
arch/blackfin/include/asm/mach-bf533/BF532_def.h renamed from include/asm-blackfin/mach-bf533/BF532_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF532_def.h
rename to arch/blackfin/include/asm/mach-bf533/BF532_def.h
arch/blackfin/include/asm/mach-bf533/BF533_cdef.h renamed from include/asm-blackfin/mach-bf533/BF533_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF533_cdef.h
rename to arch/blackfin/include/asm/mach-bf533/BF533_cdef.h
arch/blackfin/include/asm/mach-bf533/BF533_def.h renamed from include/asm-blackfin/mach-bf533/BF533_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf533/BF533_def.h
rename to arch/blackfin/include/asm/mach-bf533/BF533_def.h
arch/blackfin/include/asm/mach-bf533/anomaly.h renamed from include/asm-blackfin/mach-bf533/anomaly.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf533/anomaly.h
rename to arch/blackfin/include/asm/mach-bf533/anomaly.h
arch/blackfin/include/asm/mach-bf533/def_local.h renamed from include/asm-blackfin/mach-bf533/def_local.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf533/def_local.h
rename to arch/blackfin/include/asm/mach-bf533/def_local.h
arch/blackfin/include/asm/mach-bf533/ports.h renamed from include/asm-blackfin/mach-bf533/ports.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf533/ports.h
rename to arch/blackfin/include/asm/mach-bf533/ports.h
arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h renamed from include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_cdef.h
arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h renamed from include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/ADSP-EDN-BF534-extended_def.h
rename to arch/blackfin/include/asm/mach-bf537/ADSP-EDN-BF534-extended_def.h
arch/blackfin/include/asm/mach-bf537/BF534_cdef.h renamed from include/asm-blackfin/mach-bf537/BF534_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF534_cdef.h
rename to arch/blackfin/include/asm/mach-bf537/BF534_cdef.h
arch/blackfin/include/asm/mach-bf537/BF534_def.h renamed from include/asm-blackfin/mach-bf537/BF534_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF534_def.h
rename to arch/blackfin/include/asm/mach-bf537/BF534_def.h
arch/blackfin/include/asm/mach-bf537/BF536_cdef.h renamed from include/asm-blackfin/mach-bf537/BF536_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF536_cdef.h
rename to arch/blackfin/include/asm/mach-bf537/BF536_cdef.h
arch/blackfin/include/asm/mach-bf537/BF536_def.h renamed from include/asm-blackfin/mach-bf537/BF536_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF536_def.h
rename to arch/blackfin/include/asm/mach-bf537/BF536_def.h
arch/blackfin/include/asm/mach-bf537/BF537_cdef.h renamed from include/asm-blackfin/mach-bf537/BF537_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF537_cdef.h
rename to arch/blackfin/include/asm/mach-bf537/BF537_cdef.h
arch/blackfin/include/asm/mach-bf537/BF537_def.h renamed from include/asm-blackfin/mach-bf537/BF537_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/BF537_def.h
rename to arch/blackfin/include/asm/mach-bf537/BF537_def.h
arch/blackfin/include/asm/mach-bf537/anomaly.h renamed from include/asm-blackfin/mach-bf537/anomaly.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/anomaly.h
rename to arch/blackfin/include/asm/mach-bf537/anomaly.h
arch/blackfin/include/asm/mach-bf537/def_local.h renamed from include/asm-blackfin/mach-bf537/def_local.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/def_local.h
rename to arch/blackfin/include/asm/mach-bf537/def_local.h
arch/blackfin/include/asm/mach-bf537/ports.h renamed from include/asm-blackfin/mach-bf537/ports.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf537/ports.h
rename to arch/blackfin/include/asm/mach-bf537/ports.h
arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_cdef.h renamed from include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_cdef.h
arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_def.h renamed from include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF542-extended_def.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF542-extended_def.h
arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_cdef.h renamed from include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_cdef.h
arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_def.h renamed from include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF544-extended_def.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF544-extended_def.h
arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_cdef.h renamed from include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_cdef.h
arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_def.h renamed from include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF547-extended_def.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF547-extended_def.h
arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_cdef.h renamed from include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_cdef.h
arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_def.h renamed from include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF548-extended_def.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF548-extended_def.h
arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_cdef.h renamed from include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_cdef.h
arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_def.h renamed from include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ADSP-EDN-BF549-extended_def.h
rename to arch/blackfin/include/asm/mach-bf548/ADSP-EDN-BF549-extended_def.h
arch/blackfin/include/asm/mach-bf548/BF541_cdef.h renamed from include/asm-blackfin/mach-bf548/BF541_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF541_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF541_cdef.h
arch/blackfin/include/asm/mach-bf548/BF541_def.h renamed from include/asm-blackfin/mach-bf548/BF541_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF541_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF541_def.h
arch/blackfin/include/asm/mach-bf548/BF542_cdef.h renamed from include/asm-blackfin/mach-bf548/BF542_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF542_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF542_cdef.h
arch/blackfin/include/asm/mach-bf548/BF542_def.h renamed from include/asm-blackfin/mach-bf548/BF542_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF542_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF542_def.h
arch/blackfin/include/asm/mach-bf548/BF544_cdef.h renamed from include/asm-blackfin/mach-bf548/BF544_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF544_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF544_cdef.h
arch/blackfin/include/asm/mach-bf548/BF544_def.h renamed from include/asm-blackfin/mach-bf548/BF544_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF544_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF544_def.h
arch/blackfin/include/asm/mach-bf548/BF547_cdef.h renamed from include/asm-blackfin/mach-bf548/BF547_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF547_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF547_cdef.h
arch/blackfin/include/asm/mach-bf548/BF547_def.h renamed from include/asm-blackfin/mach-bf548/BF547_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF547_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF547_def.h
arch/blackfin/include/asm/mach-bf548/BF548_cdef.h renamed from include/asm-blackfin/mach-bf548/BF548_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF548_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF548_cdef.h
arch/blackfin/include/asm/mach-bf548/BF548_def.h renamed from include/asm-blackfin/mach-bf548/BF548_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF548_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF548_def.h
arch/blackfin/include/asm/mach-bf548/BF549_cdef.h renamed from include/asm-blackfin/mach-bf548/BF549_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF549_cdef.h
rename to arch/blackfin/include/asm/mach-bf548/BF549_cdef.h
arch/blackfin/include/asm/mach-bf548/BF549_def.h renamed from include/asm-blackfin/mach-bf548/BF549_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/BF549_def.h
rename to arch/blackfin/include/asm/mach-bf548/BF549_def.h
arch/blackfin/include/asm/mach-bf548/anomaly.h renamed from include/asm-blackfin/mach-bf548/anomaly.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/anomaly.h
rename to arch/blackfin/include/asm/mach-bf548/anomaly.h
arch/blackfin/include/asm/mach-bf548/def_local.h renamed from include/asm-blackfin/mach-bf548/def_local.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/def_local.h
rename to arch/blackfin/include/asm/mach-bf548/def_local.h
arch/blackfin/include/asm/mach-bf548/ports.h renamed from include/asm-blackfin/mach-bf548/ports.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf548/ports.h
rename to arch/blackfin/include/asm/mach-bf548/ports.h
arch/blackfin/include/asm/mach-bf561/BF561_cdef.h renamed from include/asm-blackfin/mach-bf561/BF561_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf561/BF561_cdef.h
rename to arch/blackfin/include/asm/mach-bf561/BF561_cdef.h
arch/blackfin/include/asm/mach-bf561/BF561_def.h renamed from include/asm-blackfin/mach-bf561/BF561_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf561/BF561_def.h
rename to arch/blackfin/include/asm/mach-bf561/BF561_def.h
arch/blackfin/include/asm/mach-bf561/anomaly.h renamed from include/asm-blackfin/mach-bf561/anomaly.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf561/anomaly.h
rename to arch/blackfin/include/asm/mach-bf561/anomaly.h
arch/blackfin/include/asm/mach-bf561/def_local.h renamed from include/asm-blackfin/mach-bf561/def_local.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf561/def_local.h
rename to arch/blackfin/include/asm/mach-bf561/def_local.h
arch/blackfin/include/asm/mach-bf561/ports.h renamed from include/asm-blackfin/mach-bf561/ports.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-bf561/ports.h
rename to arch/blackfin/include/asm/mach-bf561/ports.h
arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h renamed from include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_cdef.h
arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h renamed from include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-DUAL-CORE-extended_def.h
arch/blackfin/include/asm/mach-common/ADSP-EDN-core_cdef.h renamed from include/asm-blackfin/mach-common/ADSP-EDN-core_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-core_cdef.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-core_cdef.h
arch/blackfin/include/asm/mach-common/ADSP-EDN-core_def.h renamed from include/asm-blackfin/mach-common/ADSP-EDN-core_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-core_def.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-core_def.h
arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_cdef.h renamed from include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-extended_cdef.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_cdef.h
arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_def.h renamed from include/asm-blackfin/mach-common/ADSP-EDN-extended_def.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/ADSP-EDN-extended_def.h
rename to arch/blackfin/include/asm/mach-common/ADSP-EDN-extended_def.h
arch/blackfin/include/asm/mach-common/bits/bootrom.h renamed from include/asm-blackfin/mach-common/bits/bootrom.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/bootrom.h
rename to arch/blackfin/include/asm/mach-common/bits/bootrom.h
arch/blackfin/include/asm/mach-common/bits/core.h renamed from include/asm-blackfin/mach-common/bits/core.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/core.h
rename to arch/blackfin/include/asm/mach-common/bits/core.h
arch/blackfin/include/asm/mach-common/bits/dma.h renamed from include/asm-blackfin/mach-common/bits/dma.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/dma.h
rename to arch/blackfin/include/asm/mach-common/bits/dma.h
arch/blackfin/include/asm/mach-common/bits/ebiu.h renamed from include/asm-blackfin/mach-common/bits/ebiu.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ebiu.h
rename to arch/blackfin/include/asm/mach-common/bits/ebiu.h
arch/blackfin/include/asm/mach-common/bits/emac.h renamed from include/asm-blackfin/mach-common/bits/emac.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/emac.h
rename to arch/blackfin/include/asm/mach-common/bits/emac.h
arch/blackfin/include/asm/mach-common/bits/eppi.h renamed from include/asm-blackfin/mach-common/bits/eppi.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/eppi.h
rename to arch/blackfin/include/asm/mach-common/bits/eppi.h
arch/blackfin/include/asm/mach-common/bits/lockbox.h renamed from include/asm-blackfin/mach-common/bits/lockbox.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/lockbox.h
rename to arch/blackfin/include/asm/mach-common/bits/lockbox.h
arch/blackfin/include/asm/mach-common/bits/mpu.h renamed from include/asm-blackfin/mach-common/bits/mpu.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/mpu.h
rename to arch/blackfin/include/asm/mach-common/bits/mpu.h
arch/blackfin/include/asm/mach-common/bits/otp.h renamed from include/asm-blackfin/mach-common/bits/otp.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/otp.h
rename to arch/blackfin/include/asm/mach-common/bits/otp.h
arch/blackfin/include/asm/mach-common/bits/pata.h renamed from include/asm-blackfin/mach-common/bits/pata.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/pata.h
rename to arch/blackfin/include/asm/mach-common/bits/pata.h
arch/blackfin/include/asm/mach-common/bits/pll.h renamed from include/asm-blackfin/mach-common/bits/pll.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/pll.h
rename to arch/blackfin/include/asm/mach-common/bits/pll.h
arch/blackfin/include/asm/mach-common/bits/ports-a.h renamed from include/asm-blackfin/mach-common/bits/ports-a.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-a.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-a.h
arch/blackfin/include/asm/mach-common/bits/ports-b.h renamed from include/asm-blackfin/mach-common/bits/ports-b.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-b.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-b.h
arch/blackfin/include/asm/mach-common/bits/ports-c.h renamed from include/asm-blackfin/mach-common/bits/ports-c.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-c.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-c.h
arch/blackfin/include/asm/mach-common/bits/ports-d.h renamed from include/asm-blackfin/mach-common/bits/ports-d.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-d.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-d.h
arch/blackfin/include/asm/mach-common/bits/ports-e.h renamed from include/asm-blackfin/mach-common/bits/ports-e.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-e.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-e.h
arch/blackfin/include/asm/mach-common/bits/ports-f.h renamed from include/asm-blackfin/mach-common/bits/ports-f.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-f.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-f.h
arch/blackfin/include/asm/mach-common/bits/ports-g.h renamed from include/asm-blackfin/mach-common/bits/ports-g.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-g.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-g.h
arch/blackfin/include/asm/mach-common/bits/ports-h.h renamed from include/asm-blackfin/mach-common/bits/ports-h.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-h.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-h.h
arch/blackfin/include/asm/mach-common/bits/ports-i.h renamed from include/asm-blackfin/mach-common/bits/ports-i.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-i.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-i.h
arch/blackfin/include/asm/mach-common/bits/ports-j.h renamed from include/asm-blackfin/mach-common/bits/ports-j.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ports-j.h
rename to arch/blackfin/include/asm/mach-common/bits/ports-j.h
arch/blackfin/include/asm/mach-common/bits/ppi.h renamed from include/asm-blackfin/mach-common/bits/ppi.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/ppi.h
rename to arch/blackfin/include/asm/mach-common/bits/ppi.h
arch/blackfin/include/asm/mach-common/bits/rtc.h renamed from include/asm-blackfin/mach-common/bits/rtc.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/rtc.h
rename to arch/blackfin/include/asm/mach-common/bits/rtc.h
arch/blackfin/include/asm/mach-common/bits/sdh.h renamed from include/asm-blackfin/mach-common/bits/sdh.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/sdh.h
rename to arch/blackfin/include/asm/mach-common/bits/sdh.h
arch/blackfin/include/asm/mach-common/bits/spi.h renamed from include/asm-blackfin/mach-common/bits/spi.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/spi.h
rename to arch/blackfin/include/asm/mach-common/bits/spi.h
arch/blackfin/include/asm/mach-common/bits/sport.h renamed from include/asm-blackfin/mach-common/bits/sport.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/sport.h
rename to arch/blackfin/include/asm/mach-common/bits/sport.h
arch/blackfin/include/asm/mach-common/bits/timer.h renamed from include/asm-blackfin/mach-common/bits/timer.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/timer.h
rename to arch/blackfin/include/asm/mach-common/bits/timer.h
arch/blackfin/include/asm/mach-common/bits/trace.h renamed from include/asm-blackfin/mach-common/bits/trace.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/trace.h
rename to arch/blackfin/include/asm/mach-common/bits/trace.h
arch/blackfin/include/asm/mach-common/bits/twi.h renamed from include/asm-blackfin/mach-common/bits/twi.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/twi.h
rename to arch/blackfin/include/asm/mach-common/bits/twi.h
arch/blackfin/include/asm/mach-common/bits/uart.h renamed from include/asm-blackfin/mach-common/bits/uart.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/uart.h
rename to arch/blackfin/include/asm/mach-common/bits/uart.h
arch/blackfin/include/asm/mach-common/bits/watchdog.h renamed from include/asm-blackfin/mach-common/bits/watchdog.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mach-common/bits/watchdog.h
rename to arch/blackfin/include/asm/mach-common/bits/watchdog.h
arch/blackfin/include/asm/mmc.h renamed from include/asm-blackfin/mmc.h +0 -0
similarity index 100%
rename from include/asm-blackfin/mmc.h
rename to arch/blackfin/include/asm/mmc.h
arch/blackfin/include/asm/net.h renamed from include/asm-blackfin/net.h +0 -0
similarity index 100%
rename from include/asm-blackfin/net.h
rename to arch/blackfin/include/asm/net.h
arch/blackfin/include/asm/posix_types.h renamed from include/asm-blackfin/posix_types.h +0 -0
similarity index 100%
rename from include/asm-blackfin/posix_types.h
rename to arch/blackfin/include/asm/posix_types.h
arch/blackfin/include/asm/processor.h renamed from include/asm-blackfin/processor.h +0 -0
similarity index 100%
rename from include/asm-blackfin/processor.h
rename to arch/blackfin/include/asm/processor.h
arch/blackfin/include/asm/ptrace.h renamed from include/asm-blackfin/ptrace.h +0 -0
similarity index 100%
rename from include/asm-blackfin/ptrace.h
rename to arch/blackfin/include/asm/ptrace.h
arch/blackfin/include/asm/shared_resources.h renamed from include/asm-blackfin/shared_resources.h +0 -0
similarity index 100%
rename from include/asm-blackfin/shared_resources.h
rename to arch/blackfin/include/asm/shared_resources.h
arch/blackfin/include/asm/string.h renamed from include/asm-blackfin/string.h +0 -0
similarity index 100%
rename from include/asm-blackfin/string.h
rename to arch/blackfin/include/asm/string.h
arch/blackfin/include/asm/system.h renamed from include/asm-blackfin/system.h +0 -0
similarity index 100%
rename from include/asm-blackfin/system.h
rename to arch/blackfin/include/asm/system.h
arch/blackfin/include/asm/traps.h renamed from include/asm-blackfin/traps.h +0 -0
similarity index 100%
rename from include/asm-blackfin/traps.h
rename to arch/blackfin/include/asm/traps.h
arch/blackfin/include/asm/types.h renamed from include/asm-blackfin/types.h +0 -0
similarity index 100%
rename from include/asm-blackfin/types.h
rename to arch/blackfin/include/asm/types.h
arch/blackfin/include/asm/u-boot.h renamed from include/asm-blackfin/u-boot.h +0 -0
similarity index 100%
rename from include/asm-blackfin/u-boot.h
rename to arch/blackfin/include/asm/u-boot.h
arch/i386/include/asm/bitops.h renamed from include/asm-i386/bitops.h +0 -0
similarity index 100%
rename from include/asm-i386/bitops.h
rename to arch/i386/include/asm/bitops.h
arch/i386/include/asm/byteorder.h renamed from include/asm-i386/byteorder.h +0 -0
similarity index 100%
rename from include/asm-i386/byteorder.h
rename to arch/i386/include/asm/byteorder.h
arch/i386/include/asm/config.h renamed from include/asm-i386/config.h +0 -0
similarity index 100%
rename from include/asm-i386/config.h
rename to arch/i386/include/asm/config.h
arch/i386/include/asm/errno.h renamed from include/asm-i386/errno.h +0 -0
similarity index 100%
rename from include/asm-i386/errno.h
rename to arch/i386/include/asm/errno.h
arch/i386/include/asm/global_data.h renamed from include/asm-i386/global_data.h +0 -0
similarity index 100%
rename from include/asm-i386/global_data.h
rename to arch/i386/include/asm/global_data.h
arch/i386/include/asm/i8254.h renamed from include/asm-i386/i8254.h +0 -0
similarity index 100%
rename from include/asm-i386/i8254.h
rename to arch/i386/include/asm/i8254.h
arch/i386/include/asm/i8259.h renamed from include/asm-i386/i8259.h +0 -0
similarity index 100%
rename from include/asm-i386/i8259.h
rename to arch/i386/include/asm/i8259.h
arch/i386/include/asm/ibmpc.h renamed from include/asm-i386/ibmpc.h +0 -0
similarity index 100%
rename from include/asm-i386/ibmpc.h
rename to arch/i386/include/asm/ibmpc.h
arch/i386/include/asm/ic/pci.h renamed from include/asm-i386/ic/pci.h +0 -0
similarity index 100%
rename from include/asm-i386/ic/pci.h
rename to arch/i386/include/asm/ic/pci.h
arch/i386/include/asm/ic/sc520.h renamed from include/asm-i386/ic/sc520.h +0 -0
similarity index 100%
rename from include/asm-i386/ic/sc520.h
rename to arch/i386/include/asm/ic/sc520.h
arch/i386/include/asm/ic/ssi.h renamed from include/asm-i386/ic/ssi.h +0 -0
similarity index 100%
rename from include/asm-i386/ic/ssi.h
rename to arch/i386/include/asm/ic/ssi.h
arch/i386/include/asm/interrupt.h renamed from include/asm-i386/interrupt.h +0 -0
similarity index 100%
rename from include/asm-i386/interrupt.h
rename to arch/i386/include/asm/interrupt.h
arch/i386/include/asm/io.h renamed from include/asm-i386/io.h +0 -0
similarity index 100%
rename from include/asm-i386/io.h
rename to arch/i386/include/asm/io.h
arch/i386/include/asm/pci.h renamed from include/asm-i386/pci.h +0 -0
similarity index 100%
rename from include/asm-i386/pci.h
rename to arch/i386/include/asm/pci.h
arch/i386/include/asm/posix_types.h renamed from include/asm-i386/posix_types.h +0 -0
similarity index 100%
rename from include/asm-i386/posix_types.h
rename to arch/i386/include/asm/posix_types.h
arch/i386/include/asm/processor.h renamed from include/asm-i386/processor.h +0 -0
similarity index 100%
rename from include/asm-i386/processor.h
rename to arch/i386/include/asm/processor.h
arch/i386/include/asm/ptrace.h renamed from include/asm-i386/ptrace.h +0 -0
similarity index 100%
rename from include/asm-i386/ptrace.h
rename to arch/i386/include/asm/ptrace.h
arch/i386/include/asm/realmode.h renamed from include/asm-i386/realmode.h +0 -0
similarity index 100%
rename from include/asm-i386/realmode.h
rename to arch/i386/include/asm/realmode.h
arch/i386/include/asm/string.h renamed from include/asm-i386/string.h +0 -0
similarity index 100%
rename from include/asm-i386/string.h
rename to arch/i386/include/asm/string.h
arch/i386/include/asm/types.h renamed from include/asm-i386/types.h +0 -0
similarity index 100%
rename from include/asm-i386/types.h
rename to arch/i386/include/asm/types.h
arch/i386/include/asm/u-boot-i386.h renamed from include/asm-i386/u-boot-i386.h +0 -0
similarity index 100%
rename from include/asm-i386/u-boot-i386.h
rename to arch/i386/include/asm/u-boot-i386.h
arch/i386/include/asm/u-boot.h renamed from include/asm-i386/u-boot.h +0 -0
similarity index 100%
rename from include/asm-i386/u-boot.h
rename to arch/i386/include/asm/u-boot.h
arch/i386/include/asm/zimage.h renamed from include/asm-i386/zimage.h +0 -0
similarity index 100%
rename from include/asm-i386/zimage.h
rename to arch/i386/include/asm/zimage.h
arch/m68k/include/asm/bitops.h renamed from include/asm-m68k/bitops.h +0 -0
similarity index 100%
rename from include/asm-m68k/bitops.h
rename to arch/m68k/include/asm/bitops.h
arch/m68k/include/asm/byteorder.h renamed from include/asm-m68k/byteorder.h +0 -0
similarity index 100%
rename from include/asm-m68k/byteorder.h
rename to arch/m68k/include/asm/byteorder.h
arch/m68k/include/asm/coldfire/ata.h renamed from include/asm-m68k/coldfire/ata.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/ata.h
rename to arch/m68k/include/asm/coldfire/ata.h
arch/m68k/include/asm/coldfire/crossbar.h renamed from include/asm-m68k/coldfire/crossbar.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/crossbar.h
rename to arch/m68k/include/asm/coldfire/crossbar.h
arch/m68k/include/asm/coldfire/dspi.h renamed from include/asm-m68k/coldfire/dspi.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/dspi.h
rename to arch/m68k/include/asm/coldfire/dspi.h
arch/m68k/include/asm/coldfire/edma.h renamed from include/asm-m68k/coldfire/edma.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/edma.h
rename to arch/m68k/include/asm/coldfire/edma.h
arch/m68k/include/asm/coldfire/eport.h renamed from include/asm-m68k/coldfire/eport.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/eport.h
rename to arch/m68k/include/asm/coldfire/eport.h
arch/m68k/include/asm/coldfire/flexbus.h renamed from include/asm-m68k/coldfire/flexbus.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/flexbus.h
rename to arch/m68k/include/asm/coldfire/flexbus.h
arch/m68k/include/asm/coldfire/flexcan.h renamed from include/asm-m68k/coldfire/flexcan.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/flexcan.h
rename to arch/m68k/include/asm/coldfire/flexcan.h
arch/m68k/include/asm/coldfire/intctrl.h renamed from include/asm-m68k/coldfire/intctrl.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/intctrl.h
rename to arch/m68k/include/asm/coldfire/intctrl.h
arch/m68k/include/asm/coldfire/lcd.h renamed from include/asm-m68k/coldfire/lcd.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/lcd.h
rename to arch/m68k/include/asm/coldfire/lcd.h
arch/m68k/include/asm/coldfire/mdha.h renamed from include/asm-m68k/coldfire/mdha.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/mdha.h
rename to arch/m68k/include/asm/coldfire/mdha.h
arch/m68k/include/asm/coldfire/pwm.h renamed from include/asm-m68k/coldfire/pwm.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/pwm.h
rename to arch/m68k/include/asm/coldfire/pwm.h
arch/m68k/include/asm/coldfire/qspi.h renamed from include/asm-m68k/coldfire/qspi.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/qspi.h
rename to arch/m68k/include/asm/coldfire/qspi.h
arch/m68k/include/asm/coldfire/rng.h renamed from include/asm-m68k/coldfire/rng.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/rng.h
rename to arch/m68k/include/asm/coldfire/rng.h
arch/m68k/include/asm/coldfire/skha.h renamed from include/asm-m68k/coldfire/skha.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/skha.h
rename to arch/m68k/include/asm/coldfire/skha.h
arch/m68k/include/asm/coldfire/ssi.h renamed from include/asm-m68k/coldfire/ssi.h +0 -0
similarity index 100%
rename from include/asm-m68k/coldfire/ssi.h
rename to arch/m68k/include/asm/coldfire/ssi.h
arch/m68k/include/asm/config.h renamed from include/asm-m68k/config.h +0 -0
similarity index 100%
rename from include/asm-m68k/config.h
rename to arch/m68k/include/asm/config.h
arch/m68k/include/asm/errno.h renamed from include/asm-m68k/errno.h +0 -0
similarity index 100%
rename from include/asm-m68k/errno.h
rename to arch/m68k/include/asm/errno.h
arch/m68k/include/asm/fec.h renamed from include/asm-m68k/fec.h +0 -0
similarity index 100%
rename from include/asm-m68k/fec.h
rename to arch/m68k/include/asm/fec.h
arch/m68k/include/asm/fsl_i2c.h renamed from include/asm-m68k/fsl_i2c.h +0 -0
similarity index 100%
rename from include/asm-m68k/fsl_i2c.h
rename to arch/m68k/include/asm/fsl_i2c.h
arch/m68k/include/asm/fsl_mcdmafec.h renamed from include/asm-m68k/fsl_mcdmafec.h +0 -0
similarity index 100%
rename from include/asm-m68k/fsl_mcdmafec.h
rename to arch/m68k/include/asm/fsl_mcdmafec.h
arch/m68k/include/asm/global_data.h renamed from include/asm-m68k/global_data.h +0 -0
similarity index 100%
rename from include/asm-m68k/global_data.h
rename to arch/m68k/include/asm/global_data.h
arch/m68k/include/asm/immap.h renamed from include/asm-m68k/immap.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap.h
rename to arch/m68k/include/asm/immap.h
arch/m68k/include/asm/immap_520x.h renamed from include/asm-m68k/immap_520x.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_520x.h
rename to arch/m68k/include/asm/immap_520x.h
arch/m68k/include/asm/immap_5227x.h renamed from include/asm-m68k/immap_5227x.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5227x.h
rename to arch/m68k/include/asm/immap_5227x.h
arch/m68k/include/asm/immap_5235.h renamed from include/asm-m68k/immap_5235.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5235.h
rename to arch/m68k/include/asm/immap_5235.h
arch/m68k/include/asm/immap_5249.h renamed from include/asm-m68k/immap_5249.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5249.h
rename to arch/m68k/include/asm/immap_5249.h
arch/m68k/include/asm/immap_5253.h renamed from include/asm-m68k/immap_5253.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5253.h
rename to arch/m68k/include/asm/immap_5253.h
arch/m68k/include/asm/immap_5271.h renamed from include/asm-m68k/immap_5271.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5271.h
rename to arch/m68k/include/asm/immap_5271.h
arch/m68k/include/asm/immap_5272.h renamed from include/asm-m68k/immap_5272.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5272.h
rename to arch/m68k/include/asm/immap_5272.h
arch/m68k/include/asm/immap_5275.h renamed from include/asm-m68k/immap_5275.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5275.h
rename to arch/m68k/include/asm/immap_5275.h
arch/m68k/include/asm/immap_5282.h renamed from include/asm-m68k/immap_5282.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5282.h
rename to arch/m68k/include/asm/immap_5282.h
arch/m68k/include/asm/immap_5301x.h renamed from include/asm-m68k/immap_5301x.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5301x.h
rename to arch/m68k/include/asm/immap_5301x.h
arch/m68k/include/asm/immap_5329.h renamed from include/asm-m68k/immap_5329.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5329.h
rename to arch/m68k/include/asm/immap_5329.h
arch/m68k/include/asm/immap_5445x.h renamed from include/asm-m68k/immap_5445x.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_5445x.h
rename to arch/m68k/include/asm/immap_5445x.h
arch/m68k/include/asm/immap_547x_8x.h renamed from include/asm-m68k/immap_547x_8x.h +0 -0
similarity index 100%
rename from include/asm-m68k/immap_547x_8x.h
rename to arch/m68k/include/asm/immap_547x_8x.h
arch/m68k/include/asm/io.h renamed from include/asm-m68k/io.h +0 -0
similarity index 100%
rename from include/asm-m68k/io.h
rename to arch/m68k/include/asm/io.h
arch/m68k/include/asm/m520x.h renamed from include/asm-m68k/m520x.h +0 -0
similarity index 100%
rename from include/asm-m68k/m520x.h
rename to arch/m68k/include/asm/m520x.h
arch/m68k/include/asm/m5227x.h renamed from include/asm-m68k/m5227x.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5227x.h
rename to arch/m68k/include/asm/m5227x.h
arch/m68k/include/asm/m5235.h renamed from include/asm-m68k/m5235.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5235.h
rename to arch/m68k/include/asm/m5235.h
arch/m68k/include/asm/m5249.h renamed from include/asm-m68k/m5249.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5249.h
rename to arch/m68k/include/asm/m5249.h
arch/m68k/include/asm/m5253.h renamed from include/asm-m68k/m5253.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5253.h
rename to arch/m68k/include/asm/m5253.h
arch/m68k/include/asm/m5271.h renamed from include/asm-m68k/m5271.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5271.h
rename to arch/m68k/include/asm/m5271.h
arch/m68k/include/asm/m5272.h renamed from include/asm-m68k/m5272.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5272.h
rename to arch/m68k/include/asm/m5272.h
arch/m68k/include/asm/m5275.h renamed from include/asm-m68k/m5275.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5275.h
rename to arch/m68k/include/asm/m5275.h
arch/m68k/include/asm/m5282.h renamed from include/asm-m68k/m5282.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5282.h
rename to arch/m68k/include/asm/m5282.h
arch/m68k/include/asm/m5301x.h renamed from include/asm-m68k/m5301x.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5301x.h
rename to arch/m68k/include/asm/m5301x.h
arch/m68k/include/asm/m5329.h renamed from include/asm-m68k/m5329.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5329.h
rename to arch/m68k/include/asm/m5329.h
arch/m68k/include/asm/m5445x.h renamed from include/asm-m68k/m5445x.h +0 -0
similarity index 100%
rename from include/asm-m68k/m5445x.h
rename to arch/m68k/include/asm/m5445x.h
arch/m68k/include/asm/m547x_8x.h renamed from include/asm-m68k/m547x_8x.h +0 -0
similarity index 100%
rename from include/asm-m68k/m547x_8x.h
rename to arch/m68k/include/asm/m547x_8x.h
arch/m68k/include/asm/posix_types.h renamed from include/asm-m68k/posix_types.h +0 -0
similarity index 100%
rename from include/asm-m68k/posix_types.h
rename to arch/m68k/include/asm/posix_types.h
arch/m68k/include/asm/processor.h renamed from include/asm-m68k/processor.h +0 -0
similarity index 100%
rename from include/asm-m68k/processor.h
rename to arch/m68k/include/asm/processor.h
arch/m68k/include/asm/ptrace.h renamed from include/asm-m68k/ptrace.h +0 -0
similarity index 100%
rename from include/asm-m68k/ptrace.h
rename to arch/m68k/include/asm/ptrace.h
arch/m68k/include/asm/rtc.h renamed from include/asm-m68k/rtc.h +0 -0
similarity index 100%
rename from include/asm-m68k/rtc.h
rename to arch/m68k/include/asm/rtc.h
arch/m68k/include/asm/string.h renamed from include/asm-m68k/string.h +0 -0
similarity index 100%
rename from include/asm-m68k/string.h
rename to arch/m68k/include/asm/string.h
arch/m68k/include/asm/timer.h renamed from include/asm-m68k/timer.h +0 -0
similarity index 100%
rename from include/asm-m68k/timer.h
rename to arch/m68k/include/asm/timer.h
arch/m68k/include/asm/types.h renamed from include/asm-m68k/types.h +0 -0
similarity index 100%
rename from include/asm-m68k/types.h
rename to arch/m68k/include/asm/types.h
arch/m68k/include/asm/u-boot.h renamed from include/asm-m68k/u-boot.h +0 -0
similarity index 100%
rename from include/asm-m68k/u-boot.h
rename to arch/m68k/include/asm/u-boot.h
arch/m68k/include/asm/uart.h renamed from include/asm-m68k/uart.h +0 -0
similarity index 100%
rename from include/asm-m68k/uart.h
rename to arch/m68k/include/asm/uart.h
arch/microblaze/include/asm/asm.h renamed from include/asm-microblaze/asm.h +0 -0
similarity index 100%
rename from include/asm-microblaze/asm.h
rename to arch/microblaze/include/asm/asm.h
arch/microblaze/include/asm/bitops.h renamed from include/asm-microblaze/bitops.h +0 -0
similarity index 100%
rename from include/asm-microblaze/bitops.h
rename to arch/microblaze/include/asm/bitops.h
arch/microblaze/include/asm/byteorder.h renamed from include/asm-microblaze/byteorder.h +0 -0
similarity index 100%
rename from include/asm-microblaze/byteorder.h
rename to arch/microblaze/include/asm/byteorder.h
arch/microblaze/include/asm/config.h renamed from include/asm-microblaze/config.h +0 -0
similarity index 100%
rename from include/asm-microblaze/config.h
rename to arch/microblaze/include/asm/config.h
arch/microblaze/include/asm/errno.h renamed from include/asm-microblaze/errno.h +0 -0
similarity index 100%
rename from include/asm-microblaze/errno.h
rename to arch/microblaze/include/asm/errno.h
arch/microblaze/include/asm/global_data.h renamed from include/asm-microblaze/global_data.h +0 -0
similarity index 100%
rename from include/asm-microblaze/global_data.h
rename to arch/microblaze/include/asm/global_data.h
arch/microblaze/include/asm/io.h renamed from include/asm-microblaze/io.h +0 -0
similarity index 100%
rename from include/asm-microblaze/io.h
rename to arch/microblaze/include/asm/io.h
arch/microblaze/include/asm/microblaze_intc.h renamed from include/asm-microblaze/microblaze_intc.h +0 -0
similarity index 100%
rename from include/asm-microblaze/microblaze_intc.h
rename to arch/microblaze/include/asm/microblaze_intc.h
arch/microblaze/include/asm/microblaze_timer.h renamed from include/asm-microblaze/microblaze_timer.h +0 -0
similarity index 100%
rename from include/asm-microblaze/microblaze_timer.h
rename to arch/microblaze/include/asm/microblaze_timer.h
arch/microblaze/include/asm/posix_types.h renamed from include/asm-microblaze/posix_types.h +0 -0
similarity index 100%
rename from include/asm-microblaze/posix_types.h
rename to arch/microblaze/include/asm/posix_types.h
arch/microblaze/include/asm/processor.h renamed from include/asm-microblaze/processor.h +0 -0
similarity index 100%
rename from include/asm-microblaze/processor.h
rename to arch/microblaze/include/asm/processor.h
arch/microblaze/include/asm/ptrace.h renamed from include/asm-microblaze/ptrace.h +0 -0
similarity index 100%
rename from include/asm-microblaze/ptrace.h
rename to arch/microblaze/include/asm/ptrace.h
arch/microblaze/include/asm/string.h renamed from include/asm-microblaze/string.h +0 -0
similarity index 100%
rename from include/asm-microblaze/string.h
rename to arch/microblaze/include/asm/string.h
arch/microblaze/include/asm/system.h renamed from include/asm-microblaze/system.h +0 -0
similarity index 100%
rename from include/asm-microblaze/system.h
rename to arch/microblaze/include/asm/system.h
arch/microblaze/include/asm/types.h renamed from include/asm-microblaze/types.h +0 -0
similarity index 100%
rename from include/asm-microblaze/types.h
rename to arch/microblaze/include/asm/types.h
arch/microblaze/include/asm/u-boot.h renamed from include/asm-microblaze/u-boot.h +0 -0
similarity index 100%
rename from include/asm-microblaze/u-boot.h
rename to arch/microblaze/include/asm/u-boot.h
arch/mips/include/asm/addrspace.h renamed from include/asm-mips/addrspace.h +0 -0
similarity index 100%
rename from include/asm-mips/addrspace.h
rename to arch/mips/include/asm/addrspace.h
arch/mips/include/asm/asm.h renamed from include/asm-mips/asm.h +0 -0
similarity index 100%
rename from include/asm-mips/asm.h
rename to arch/mips/include/asm/asm.h
arch/mips/include/asm/au1x00.h renamed from include/asm-mips/au1x00.h +0 -0
similarity index 100%
rename from include/asm-mips/au1x00.h
rename to arch/mips/include/asm/au1x00.h
arch/mips/include/asm/bitops.h renamed from include/asm-mips/bitops.h +0 -0
similarity index 100%
rename from include/asm-mips/bitops.h
rename to arch/mips/include/asm/bitops.h
arch/mips/include/asm/byteorder.h renamed from include/asm-mips/byteorder.h +0 -0
similarity index 100%
rename from include/asm-mips/byteorder.h
rename to arch/mips/include/asm/byteorder.h
arch/mips/include/asm/cachectl.h renamed from include/asm-mips/cachectl.h +0 -0
similarity index 100%
rename from include/asm-mips/cachectl.h
rename to arch/mips/include/asm/cachectl.h
arch/mips/include/asm/cacheops.h renamed from include/asm-mips/cacheops.h +0 -0
similarity index 100%
rename from include/asm-mips/cacheops.h
rename to arch/mips/include/asm/cacheops.h
arch/mips/include/asm/config.h renamed from include/asm-mips/config.h +0 -0
similarity index 100%
rename from include/asm-mips/config.h
rename to arch/mips/include/asm/config.h
arch/mips/include/asm/errno.h renamed from include/asm-mips/errno.h +0 -0
similarity index 100%
rename from include/asm-mips/errno.h
rename to arch/mips/include/asm/errno.h
arch/mips/include/asm/global_data.h renamed from include/asm-mips/global_data.h +0 -0
similarity index 100%
rename from include/asm-mips/global_data.h
rename to arch/mips/include/asm/global_data.h
arch/mips/include/asm/inca-ip.h renamed from include/asm-mips/inca-ip.h +0 -0
similarity index 100%
rename from include/asm-mips/inca-ip.h
rename to arch/mips/include/asm/inca-ip.h
arch/mips/include/asm/io.h renamed from include/asm-mips/io.h +0 -0
similarity index 100%
rename from include/asm-mips/io.h
rename to arch/mips/include/asm/io.h
arch/mips/include/asm/isadep.h renamed from include/asm-mips/isadep.h +0 -0
similarity index 100%
rename from include/asm-mips/isadep.h
rename to arch/mips/include/asm/isadep.h
arch/mips/include/asm/mipsregs.h renamed from include/asm-mips/mipsregs.h +0 -0
similarity index 100%
rename from include/asm-mips/mipsregs.h
rename to arch/mips/include/asm/mipsregs.h
arch/mips/include/asm/posix_types.h renamed from include/asm-mips/posix_types.h +0 -0
similarity index 100%
rename from include/asm-mips/posix_types.h
rename to arch/mips/include/asm/posix_types.h
arch/mips/include/asm/processor.h renamed from include/asm-mips/processor.h +0 -0
similarity index 100%
rename from include/asm-mips/processor.h
rename to arch/mips/include/asm/processor.h
arch/mips/include/asm/ptrace.h renamed from include/asm-mips/ptrace.h +0 -0
similarity index 100%
rename from include/asm-mips/ptrace.h
rename to arch/mips/include/asm/ptrace.h
arch/mips/include/asm/reboot.h renamed from include/asm-mips/reboot.h +0 -0
similarity index 100%
rename from include/asm-mips/reboot.h
rename to arch/mips/include/asm/reboot.h
arch/mips/include/asm/reg.h renamed from include/asm-mips/reg.h +0 -0
similarity index 100%
rename from include/asm-mips/reg.h
rename to arch/mips/include/asm/reg.h
arch/mips/include/asm/regdef.h renamed from include/asm-mips/regdef.h +0 -0
similarity index 100%
rename from include/asm-mips/regdef.h
rename to arch/mips/include/asm/regdef.h
arch/mips/include/asm/sgidefs.h renamed from include/asm-mips/sgidefs.h +0 -0
similarity index 100%
rename from include/asm-mips/sgidefs.h
rename to arch/mips/include/asm/sgidefs.h
arch/mips/include/asm/string.h renamed from include/asm-mips/string.h +0 -0
similarity index 100%
rename from include/asm-mips/string.h
rename to arch/mips/include/asm/string.h
arch/mips/include/asm/system.h renamed from include/asm-mips/system.h +0 -0
similarity index 100%
rename from include/asm-mips/system.h
rename to arch/mips/include/asm/system.h
arch/mips/include/asm/types.h renamed from include/asm-mips/types.h +0 -0
similarity index 100%
rename from include/asm-mips/types.h
rename to arch/mips/include/asm/types.h
arch/mips/include/asm/u-boot.h renamed from include/asm-mips/u-boot.h +0 -0
similarity index 100%
rename from include/asm-mips/u-boot.h
rename to arch/mips/include/asm/u-boot.h
arch/nios/include/asm/bitops.h renamed from include/asm-nios/bitops.h +0 -0
similarity index 100%
rename from include/asm-nios/bitops.h
rename to arch/nios/include/asm/bitops.h
arch/nios/include/asm/byteorder.h renamed from include/asm-nios/byteorder.h +0 -0
similarity index 100%
rename from include/asm-nios/byteorder.h
rename to arch/nios/include/asm/byteorder.h
arch/nios/include/asm/cache.h renamed from include/asm-nios/cache.h +0 -0
similarity index 100%
rename from include/asm-nios/cache.h
rename to arch/nios/include/asm/cache.h
arch/nios/include/asm/config.h renamed from include/asm-nios/config.h +0 -0
similarity index 100%
rename from include/asm-nios/config.h
rename to arch/nios/include/asm/config.h
arch/nios/include/asm/global_data.h renamed from include/asm-nios/global_data.h +0 -0
similarity index 100%
rename from include/asm-nios/global_data.h
rename to arch/nios/include/asm/global_data.h
arch/nios/include/asm/io.h renamed from include/asm-nios/io.h +0 -0
similarity index 100%
rename from include/asm-nios/io.h
rename to arch/nios/include/asm/io.h
arch/nios/include/asm/posix_types.h renamed from include/asm-nios/posix_types.h +0 -0
similarity index 100%
rename from include/asm-nios/posix_types.h
rename to arch/nios/include/asm/posix_types.h
arch/nios/include/asm/processor.h renamed from include/asm-nios/processor.h +0 -0
similarity index 100%
rename from include/asm-nios/processor.h
rename to arch/nios/include/asm/processor.h
arch/nios/include/asm/psr.h renamed from include/asm-nios/psr.h +0 -0
similarity index 100%
rename from include/asm-nios/psr.h
rename to arch/nios/include/asm/psr.h
arch/nios/include/asm/ptrace.h renamed from include/asm-nios/ptrace.h +0 -0
similarity index 100%
rename from include/asm-nios/ptrace.h
rename to arch/nios/include/asm/ptrace.h
arch/nios/include/asm/status_led.h renamed from include/asm-nios/status_led.h +0 -0
similarity index 100%
rename from include/asm-nios/status_led.h
rename to arch/nios/include/asm/status_led.h
arch/nios/include/asm/string.h renamed from include/asm-nios/string.h +0 -0
similarity index 100%
rename from include/asm-nios/string.h
rename to arch/nios/include/asm/string.h
arch/nios/include/asm/system.h renamed from include/asm-nios/system.h +0 -0
similarity index 100%
rename from include/asm-nios/system.h
rename to arch/nios/include/asm/system.h
arch/nios/include/asm/types.h renamed from include/asm-nios/types.h +0 -0
similarity index 100%
rename from include/asm-nios/types.h
rename to arch/nios/include/asm/types.h
arch/nios/include/asm/u-boot.h renamed from include/asm-nios/u-boot.h +0 -0
similarity index 100%
rename from include/asm-nios/u-boot.h
rename to arch/nios/include/asm/u-boot.h
arch/nios2/include/asm/bitops.h renamed from include/asm-nios2/bitops.h +0 -0
similarity index 100%
rename from include/asm-nios2/bitops.h
rename to arch/nios2/include/asm/bitops.h
arch/nios2/include/asm/byteorder.h renamed from include/asm-nios2/byteorder.h +0 -0
similarity index 100%
rename from include/asm-nios2/byteorder.h
rename to arch/nios2/include/asm/byteorder.h
arch/nios2/include/asm/cache.h renamed from include/asm-nios2/cache.h +0 -0
similarity index 100%
rename from include/asm-nios2/cache.h
rename to arch/nios2/include/asm/cache.h
arch/nios2/include/asm/config.h renamed from include/asm-nios2/config.h +0 -0
similarity index 100%
rename from include/asm-nios2/config.h
rename to arch/nios2/include/asm/config.h
arch/nios2/include/asm/global_data.h renamed from include/asm-nios2/global_data.h +0 -0
similarity index 100%
rename from include/asm-nios2/global_data.h
rename to arch/nios2/include/asm/global_data.h
arch/nios2/include/asm/io.h renamed from include/asm-nios2/io.h +0 -0
similarity index 100%
rename from include/asm-nios2/io.h
rename to arch/nios2/include/asm/io.h
arch/nios2/include/asm/opcodes.h renamed from include/asm-nios2/opcodes.h +0 -0
similarity index 100%
rename from include/asm-nios2/opcodes.h
rename to arch/nios2/include/asm/opcodes.h
arch/nios2/include/asm/posix_types.h renamed from include/asm-nios2/posix_types.h +0 -0
similarity index 100%
rename from include/asm-nios2/posix_types.h
rename to arch/nios2/include/asm/posix_types.h
arch/nios2/include/asm/processor.h renamed from include/asm-nios2/processor.h +0 -0
similarity index 100%
rename from include/asm-nios2/processor.h
rename to arch/nios2/include/asm/processor.h
arch/nios2/include/asm/psr.h renamed from include/asm-nios2/psr.h +0 -0
similarity index 100%
rename from include/asm-nios2/psr.h
rename to arch/nios2/include/asm/psr.h
arch/nios2/include/asm/ptrace.h renamed from include/asm-nios2/ptrace.h +0 -0
similarity index 100%
rename from include/asm-nios2/ptrace.h
rename to arch/nios2/include/asm/ptrace.h
arch/nios2/include/asm/status_led.h renamed from include/asm-nios2/status_led.h +0 -0
similarity index 100%
rename from include/asm-nios2/status_led.h
rename to arch/nios2/include/asm/status_led.h
arch/nios2/include/asm/string.h renamed from include/asm-nios2/string.h +0 -0
similarity index 100%
rename from include/asm-nios2/string.h
rename to arch/nios2/include/asm/string.h
arch/nios2/include/asm/system.h renamed from include/asm-nios2/system.h +0 -0
similarity index 100%
rename from include/asm-nios2/system.h
rename to arch/nios2/include/asm/system.h
arch/nios2/include/asm/types.h renamed from include/asm-nios2/types.h +0 -0
similarity index 100%
rename from include/asm-nios2/types.h
rename to arch/nios2/include/asm/types.h
arch/nios2/include/asm/u-boot.h renamed from include/asm-nios2/u-boot.h +0 -0
similarity index 100%
rename from include/asm-nios2/u-boot.h
rename to arch/nios2/include/asm/u-boot.h
arch/ppc/include/asm/4xx_pci.h renamed from include/asm-ppc/4xx_pci.h +0 -0
similarity index 100%
rename from include/asm-ppc/4xx_pci.h
rename to arch/ppc/include/asm/4xx_pci.h
arch/ppc/include/asm/4xx_pcie.h renamed from include/asm-ppc/4xx_pcie.h +0 -0
similarity index 100%
rename from include/asm-ppc/4xx_pcie.h
rename to arch/ppc/include/asm/4xx_pcie.h
arch/ppc/include/asm/5xx_immap.h renamed from include/asm-ppc/5xx_immap.h +0 -0
similarity index 100%
rename from include/asm-ppc/5xx_immap.h
rename to arch/ppc/include/asm/5xx_immap.h
arch/ppc/include/asm/8xx_immap.h renamed from include/asm-ppc/8xx_immap.h +0 -0
similarity index 100%
rename from include/asm-ppc/8xx_immap.h
rename to arch/ppc/include/asm/8xx_immap.h
arch/ppc/include/asm/atomic.h renamed from include/asm-ppc/atomic.h +0 -0
similarity index 100%
rename from include/asm-ppc/atomic.h
rename to arch/ppc/include/asm/atomic.h
arch/ppc/include/asm/bitops.h renamed from include/asm-ppc/bitops.h +0 -0
similarity index 100%
rename from include/asm-ppc/bitops.h
rename to arch/ppc/include/asm/bitops.h
arch/ppc/include/asm/byteorder.h renamed from include/asm-ppc/byteorder.h +0 -0
similarity index 100%
rename from include/asm-ppc/byteorder.h
rename to arch/ppc/include/asm/byteorder.h
arch/ppc/include/asm/cache.h renamed from include/asm-ppc/cache.h +0 -0
similarity index 100%
rename from include/asm-ppc/cache.h
rename to arch/ppc/include/asm/cache.h
arch/ppc/include/asm/config.h renamed from include/asm-ppc/config.h +0 -0
similarity index 100%
rename from include/asm-ppc/config.h
rename to arch/ppc/include/asm/config.h
arch/ppc/include/asm/cpm_8260.h renamed from include/asm-ppc/cpm_8260.h +0 -0
similarity index 100%
rename from include/asm-ppc/cpm_8260.h
rename to arch/ppc/include/asm/cpm_8260.h
arch/ppc/include/asm/cpm_85xx.h renamed from include/asm-ppc/cpm_85xx.h +0 -0
similarity index 100%
rename from include/asm-ppc/cpm_85xx.h
rename to arch/ppc/include/asm/cpm_85xx.h
arch/ppc/include/asm/e300.h renamed from include/asm-ppc/e300.h +0 -0
similarity index 100%
rename from include/asm-ppc/e300.h
rename to arch/ppc/include/asm/e300.h
arch/ppc/include/asm/errno.h renamed from include/asm-ppc/errno.h +0 -0
similarity index 100%
rename from include/asm-ppc/errno.h
rename to arch/ppc/include/asm/errno.h
arch/ppc/include/asm/fsl_ddr_dimm_params.h renamed from include/asm-ppc/fsl_ddr_dimm_params.h +0 -0
similarity index 100%
rename from include/asm-ppc/fsl_ddr_dimm_params.h
rename to arch/ppc/include/asm/fsl_ddr_dimm_params.h
arch/ppc/include/asm/fsl_ddr_sdram.h renamed from include/asm-ppc/fsl_ddr_sdram.h +0 -0
similarity index 100%
rename from include/asm-ppc/fsl_ddr_sdram.h
rename to arch/ppc/include/asm/fsl_ddr_sdram.h
arch/ppc/include/asm/fsl_dma.h renamed from include/asm-ppc/fsl_dma.h +0 -0
similarity index 100%
rename from include/asm-ppc/fsl_dma.h
rename to arch/ppc/include/asm/fsl_dma.h
arch/ppc/include/asm/fsl_i2c.h renamed from include/asm-ppc/fsl_i2c.h +0 -0
similarity index 100%
rename from include/asm-ppc/fsl_i2c.h
rename to arch/ppc/include/asm/fsl_i2c.h
arch/ppc/include/asm/fsl_law.h renamed from include/asm-ppc/fsl_law.h +0 -0
similarity index 100%
rename from include/asm-ppc/fsl_law.h
rename to arch/ppc/include/asm/fsl_law.h
arch/ppc/include/asm/fsl_lbc.h renamed from include/asm-ppc/fsl_lbc.h +0 -0
similarity index 100%
rename from include/asm-ppc/fsl_lbc.h
rename to arch/ppc/include/asm/fsl_lbc.h
arch/ppc/include/asm/fsl_pci.h renamed from include/asm-ppc/fsl_pci.h +0 -0
similarity index 100%
rename from include/asm-ppc/fsl_pci.h
rename to arch/ppc/include/asm/fsl_pci.h
arch/ppc/include/asm/fsl_serdes.h renamed from include/asm-ppc/fsl_serdes.h +0 -0
similarity index 100%
rename from include/asm-ppc/fsl_serdes.h
rename to arch/ppc/include/asm/fsl_serdes.h
arch/ppc/include/asm/global_data.h renamed from include/asm-ppc/global_data.h +0 -0
similarity index 100%
rename from include/asm-ppc/global_data.h
rename to arch/ppc/include/asm/global_data.h
arch/ppc/include/asm/gpio.h renamed from include/asm-ppc/gpio.h +0 -0
similarity index 100%
rename from include/asm-ppc/gpio.h
rename to arch/ppc/include/asm/gpio.h
arch/ppc/include/asm/immap_512x.h renamed from include/asm-ppc/immap_512x.h +0 -0
similarity index 100%
rename from include/asm-ppc/immap_512x.h
rename to arch/ppc/include/asm/immap_512x.h
arch/ppc/include/asm/immap_8220.h renamed from include/asm-ppc/immap_8220.h +0 -0
similarity index 100%
rename from include/asm-ppc/immap_8220.h
rename to arch/ppc/include/asm/immap_8220.h
arch/ppc/include/asm/immap_8260.h renamed from include/asm-ppc/immap_8260.h +0 -0
similarity index 100%
rename from include/asm-ppc/immap_8260.h
rename to arch/ppc/include/asm/immap_8260.h
arch/ppc/include/asm/immap_83xx.h renamed from include/asm-ppc/immap_83xx.h +0 -0
similarity index 100%
rename from include/asm-ppc/immap_83xx.h
rename to arch/ppc/include/asm/immap_83xx.h
arch/ppc/include/asm/immap_85xx.h renamed from include/asm-ppc/immap_85xx.h +0 -0
similarity index 100%
rename from include/asm-ppc/immap_85xx.h
rename to arch/ppc/include/asm/immap_85xx.h
arch/ppc/include/asm/immap_86xx.h renamed from include/asm-ppc/immap_86xx.h +0 -0
similarity index 100%
rename from include/asm-ppc/immap_86xx.h
rename to arch/ppc/include/asm/immap_86xx.h
arch/ppc/include/asm/immap_qe.h renamed from include/asm-ppc/immap_qe.h +0 -0
similarity index 100%
rename from include/asm-ppc/immap_qe.h
rename to arch/ppc/include/asm/immap_qe.h
arch/ppc/include/asm/interrupt.h renamed from include/asm-ppc/interrupt.h +0 -0
similarity index 100%
rename from include/asm-ppc/interrupt.h
rename to arch/ppc/include/asm/interrupt.h
arch/ppc/include/asm/io.h renamed from include/asm-ppc/io.h +0 -0
similarity index 100%
rename from include/asm-ppc/io.h
rename to arch/ppc/include/asm/io.h
arch/ppc/include/asm/iopin_8260.h renamed from include/asm-ppc/iopin_8260.h +0 -0
similarity index 100%
rename from include/asm-ppc/iopin_8260.h
rename to arch/ppc/include/asm/iopin_8260.h
arch/ppc/include/asm/iopin_85xx.h renamed from include/asm-ppc/iopin_85xx.h +0 -0
similarity index 100%
rename from include/asm-ppc/iopin_85xx.h
rename to arch/ppc/include/asm/iopin_85xx.h
arch/ppc/include/asm/iopin_8xx.h renamed from include/asm-ppc/iopin_8xx.h +0 -0
similarity index 100%
rename from include/asm-ppc/iopin_8xx.h
rename to arch/ppc/include/asm/iopin_8xx.h
arch/ppc/include/asm/m8260_pci.h renamed from include/asm-ppc/m8260_pci.h +0 -0
similarity index 100%
rename from include/asm-ppc/m8260_pci.h
rename to arch/ppc/include/asm/m8260_pci.h
arch/ppc/include/asm/mc146818rtc.h renamed from include/asm-ppc/mc146818rtc.h +0 -0
similarity index 100%
rename from include/asm-ppc/mc146818rtc.h
rename to arch/ppc/include/asm/mc146818rtc.h
arch/ppc/include/asm/mmu.h renamed from include/asm-ppc/mmu.h +0 -0
similarity index 100%
rename from include/asm-ppc/mmu.h
rename to arch/ppc/include/asm/mmu.h
arch/ppc/include/asm/mp.h renamed from include/asm-ppc/mp.h +0 -0
similarity index 100%
rename from include/asm-ppc/mp.h
rename to arch/ppc/include/asm/mp.h
arch/ppc/include/asm/mpc512x.h renamed from include/asm-ppc/mpc512x.h +0 -0
similarity index 100%
rename from include/asm-ppc/mpc512x.h
rename to arch/ppc/include/asm/mpc512x.h
arch/ppc/include/asm/mpc8349_pci.h renamed from include/asm-ppc/mpc8349_pci.h +0 -0
similarity index 100%
rename from include/asm-ppc/mpc8349_pci.h
rename to arch/ppc/include/asm/mpc8349_pci.h
arch/ppc/include/asm/mpc8xxx_spi.h renamed from include/asm-ppc/mpc8xxx_spi.h +0 -0
similarity index 100%
rename from include/asm-ppc/mpc8xxx_spi.h
rename to arch/ppc/include/asm/mpc8xxx_spi.h
arch/ppc/include/asm/pci_io.h renamed from include/asm-ppc/pci_io.h +0 -0
similarity index 100%
rename from include/asm-ppc/pci_io.h
rename to arch/ppc/include/asm/pci_io.h
arch/ppc/include/asm/pnp.h renamed from include/asm-ppc/pnp.h +0 -0
similarity index 100%
rename from include/asm-ppc/pnp.h
rename to arch/ppc/include/asm/pnp.h
arch/ppc/include/asm/posix_types.h renamed from include/asm-ppc/posix_types.h +0 -0
similarity index 100%
rename from include/asm-ppc/posix_types.h
rename to arch/ppc/include/asm/posix_types.h
arch/ppc/include/asm/ppc4xx-ebc.h renamed from include/asm-ppc/ppc4xx-ebc.h +0 -0
similarity index 100%
rename from include/asm-ppc/ppc4xx-ebc.h
rename to arch/ppc/include/asm/ppc4xx-ebc.h
arch/ppc/include/asm/ppc4xx-isram.h renamed from include/asm-ppc/ppc4xx-isram.h +0 -0
similarity index 100%
rename from include/asm-ppc/ppc4xx-isram.h
rename to arch/ppc/include/asm/ppc4xx-isram.h
arch/ppc/include/asm/ppc4xx-sdram.h renamed from include/asm-ppc/ppc4xx-sdram.h +0 -0
similarity index 100%
rename from include/asm-ppc/ppc4xx-sdram.h
rename to arch/ppc/include/asm/ppc4xx-sdram.h
arch/ppc/include/asm/ppc4xx-uic.h renamed from include/asm-ppc/ppc4xx-uic.h +0 -0
similarity index 100%
rename from include/asm-ppc/ppc4xx-uic.h
rename to arch/ppc/include/asm/ppc4xx-uic.h
arch/ppc/include/asm/ppc4xx_config.h renamed from include/asm-ppc/ppc4xx_config.h +0 -0
similarity index 100%
rename from include/asm-ppc/ppc4xx_config.h
rename to arch/ppc/include/asm/ppc4xx_config.h
arch/ppc/include/asm/processor.h renamed from include/asm-ppc/processor.h +0 -0
similarity index 100%
rename from include/asm-ppc/processor.h
rename to arch/ppc/include/asm/processor.h
arch/ppc/include/asm/ptrace.h renamed from include/asm-ppc/ptrace.h +0 -0
similarity index 100%
rename from include/asm-ppc/ptrace.h
rename to arch/ppc/include/asm/ptrace.h
arch/ppc/include/asm/residual.h renamed from include/asm-ppc/residual.h +0 -0
similarity index 100%
rename from include/asm-ppc/residual.h
rename to arch/ppc/include/asm/residual.h
arch/ppc/include/asm/sigcontext.h renamed from include/asm-ppc/sigcontext.h +0 -0
similarity index 100%
rename from include/asm-ppc/sigcontext.h
rename to arch/ppc/include/asm/sigcontext.h
arch/ppc/include/asm/signal.h renamed from include/asm-ppc/signal.h +0 -0
similarity index 100%
rename from include/asm-ppc/signal.h
rename to arch/ppc/include/asm/signal.h
arch/ppc/include/asm/status_led.h renamed from include/asm-ppc/status_led.h +0 -0
similarity index 100%
rename from include/asm-ppc/status_led.h
rename to arch/ppc/include/asm/status_led.h
arch/ppc/include/asm/string.h renamed from include/asm-ppc/string.h +0 -0
similarity index 100%
rename from include/asm-ppc/string.h
rename to arch/ppc/include/asm/string.h
arch/ppc/include/asm/types.h renamed from include/asm-ppc/types.h +0 -0
similarity index 100%
rename from include/asm-ppc/types.h
rename to arch/ppc/include/asm/types.h
arch/ppc/include/asm/u-boot.h renamed from include/asm-ppc/u-boot.h +0 -0
similarity index 100%
rename from include/asm-ppc/u-boot.h
rename to arch/ppc/include/asm/u-boot.h
arch/ppc/include/asm/unaligned.h renamed from include/asm-ppc/unaligned.h +0 -0
similarity index 100%
rename from include/asm-ppc/unaligned.h
rename to arch/ppc/include/asm/unaligned.h
arch/ppc/include/asm/xilinx_irq.h renamed from include/asm-ppc/xilinx_irq.h +0 -0
similarity index 100%
rename from include/asm-ppc/xilinx_irq.h
rename to arch/ppc/include/asm/xilinx_irq.h
arch/sh/include/asm/bitops.h renamed from include/asm-sh/bitops.h +0 -0
similarity index 100%
rename from include/asm-sh/bitops.h
rename to arch/sh/include/asm/bitops.h
arch/sh/include/asm/byteorder.h renamed from include/asm-sh/byteorder.h +0 -0
similarity index 100%
rename from include/asm-sh/byteorder.h
rename to arch/sh/include/asm/byteorder.h
arch/sh/include/asm/cache.h renamed from include/asm-sh/cache.h +0 -0
similarity index 100%
rename from include/asm-sh/cache.h
rename to arch/sh/include/asm/cache.h
arch/sh/include/asm/clk.h renamed from include/asm-sh/clk.h +0 -0
similarity index 100%
rename from include/asm-sh/clk.h
rename to arch/sh/include/asm/clk.h
arch/sh/include/asm/config.h renamed from include/asm-sh/config.h +0 -0
similarity index 100%
rename from include/asm-sh/config.h
rename to arch/sh/include/asm/config.h
arch/sh/include/asm/cpu_sh2.h renamed from include/asm-sh/cpu_sh2.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh2.h
rename to arch/sh/include/asm/cpu_sh2.h
arch/sh/include/asm/cpu_sh3.h renamed from include/asm-sh/cpu_sh3.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh3.h
rename to arch/sh/include/asm/cpu_sh3.h
arch/sh/include/asm/cpu_sh4.h renamed from include/asm-sh/cpu_sh4.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh4.h
rename to arch/sh/include/asm/cpu_sh4.h
arch/sh/include/asm/cpu_sh7203.h renamed from include/asm-sh/cpu_sh7203.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh7203.h
rename to arch/sh/include/asm/cpu_sh7203.h
arch/sh/include/asm/cpu_sh7710.h renamed from include/asm-sh/cpu_sh7710.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh7710.h
rename to arch/sh/include/asm/cpu_sh7710.h
arch/sh/include/asm/cpu_sh7720.h renamed from include/asm-sh/cpu_sh7720.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh7720.h
rename to arch/sh/include/asm/cpu_sh7720.h
arch/sh/include/asm/cpu_sh7722.h renamed from include/asm-sh/cpu_sh7722.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh7722.h
rename to arch/sh/include/asm/cpu_sh7722.h
arch/sh/include/asm/cpu_sh7723.h renamed from include/asm-sh/cpu_sh7723.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh7723.h
rename to arch/sh/include/asm/cpu_sh7723.h
arch/sh/include/asm/cpu_sh7750.h renamed from include/asm-sh/cpu_sh7750.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh7750.h
rename to arch/sh/include/asm/cpu_sh7750.h
arch/sh/include/asm/cpu_sh7763.h renamed from include/asm-sh/cpu_sh7763.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh7763.h
rename to arch/sh/include/asm/cpu_sh7763.h
arch/sh/include/asm/cpu_sh7780.h renamed from include/asm-sh/cpu_sh7780.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh7780.h
rename to arch/sh/include/asm/cpu_sh7780.h
arch/sh/include/asm/cpu_sh7785.h renamed from include/asm-sh/cpu_sh7785.h +0 -0
similarity index 100%
rename from include/asm-sh/cpu_sh7785.h
rename to arch/sh/include/asm/cpu_sh7785.h
arch/sh/include/asm/errno.h renamed from include/asm-sh/errno.h +0 -0
similarity index 100%
rename from include/asm-sh/errno.h
rename to arch/sh/include/asm/errno.h
arch/sh/include/asm/global_data.h renamed from include/asm-sh/global_data.h +0 -0
similarity index 100%
rename from include/asm-sh/global_data.h
rename to arch/sh/include/asm/global_data.h
arch/sh/include/asm/io.h renamed from include/asm-sh/io.h +0 -0
similarity index 100%
rename from include/asm-sh/io.h
rename to arch/sh/include/asm/io.h
arch/sh/include/asm/irqflags.h renamed from include/asm-sh/irqflags.h +0 -0
similarity index 100%
rename from include/asm-sh/irqflags.h
rename to arch/sh/include/asm/irqflags.h
arch/sh/include/asm/macro.h renamed from include/asm-sh/macro.h +0 -0
similarity index 100%
rename from include/asm-sh/macro.h
rename to arch/sh/include/asm/macro.h
arch/sh/include/asm/pci.h renamed from include/asm-sh/pci.h +0 -0
similarity index 100%
rename from include/asm-sh/pci.h
rename to arch/sh/include/asm/pci.h
arch/sh/include/asm/posix_types.h renamed from include/asm-sh/posix_types.h +0 -0
similarity index 100%
rename from include/asm-sh/posix_types.h
rename to arch/sh/include/asm/posix_types.h
arch/sh/include/asm/processor.h renamed from include/asm-sh/processor.h +0 -0
similarity index 100%
rename from include/asm-sh/processor.h
rename to arch/sh/include/asm/processor.h
arch/sh/include/asm/ptrace.h renamed from include/asm-sh/ptrace.h +0 -0
similarity index 100%
rename from include/asm-sh/ptrace.h
rename to arch/sh/include/asm/ptrace.h
arch/sh/include/asm/string.h renamed from include/asm-sh/string.h +0 -0
similarity index 100%
rename from include/asm-sh/string.h
rename to arch/sh/include/asm/string.h
arch/sh/include/asm/system.h renamed from include/asm-sh/system.h +0 -0
similarity index 100%
rename from include/asm-sh/system.h
rename to arch/sh/include/asm/system.h
arch/sh/include/asm/types.h renamed from include/asm-sh/types.h +0 -0
similarity index 100%
rename from include/asm-sh/types.h
rename to arch/sh/include/asm/types.h
arch/sh/include/asm/u-boot.h renamed from include/asm-sh/u-boot.h +0 -0
similarity index 100%
rename from include/asm-sh/u-boot.h
rename to arch/sh/include/asm/u-boot.h
arch/sparc/include/asm/arch-leon2/asi.h renamed from include/asm-sparc/arch-leon2/asi.h +0 -0
similarity index 100%
rename from include/asm-sparc/arch-leon2/asi.h
rename to arch/sparc/include/asm/arch-leon2/asi.h
arch/sparc/include/asm/arch-leon3/asi.h renamed from include/asm-sparc/arch-leon3/asi.h +0 -0
similarity index 100%
rename from include/asm-sparc/arch-leon3/asi.h
rename to arch/sparc/include/asm/arch-leon3/asi.h
arch/sparc/include/asm/asi.h renamed from include/asm-sparc/asi.h +0 -0
similarity index 100%
rename from include/asm-sparc/asi.h
rename to arch/sparc/include/asm/asi.h
arch/sparc/include/asm/asmmacro.h renamed from include/asm-sparc/asmmacro.h +0 -0
similarity index 100%
rename from include/asm-sparc/asmmacro.h
rename to arch/sparc/include/asm/asmmacro.h
arch/sparc/include/asm/atomic.h renamed from include/asm-sparc/atomic.h +0 -0
similarity index 100%
rename from include/asm-sparc/atomic.h
rename to arch/sparc/include/asm/atomic.h
arch/sparc/include/asm/bitops.h renamed from include/asm-sparc/bitops.h +0 -0
similarity index 100%
rename from include/asm-sparc/bitops.h
rename to arch/sparc/include/asm/bitops.h
arch/sparc/include/asm/byteorder.h renamed from include/asm-sparc/byteorder.h +0 -0
similarity index 100%
rename from include/asm-sparc/byteorder.h
rename to arch/sparc/include/asm/byteorder.h
arch/sparc/include/asm/cache.h renamed from include/asm-sparc/cache.h +0 -0
similarity index 100%
rename from include/asm-sparc/cache.h
rename to arch/sparc/include/asm/cache.h
arch/sparc/include/asm/config.h renamed from include/asm-sparc/config.h +0 -0
similarity index 100%
rename from include/asm-sparc/config.h
rename to arch/sparc/include/asm/config.h
arch/sparc/include/asm/errno.h renamed from include/asm-sparc/errno.h +0 -0
similarity index 100%
rename from include/asm-sparc/errno.h
rename to arch/sparc/include/asm/errno.h
arch/sparc/include/asm/global_data.h renamed from include/asm-sparc/global_data.h +0 -0
similarity index 100%
rename from include/asm-sparc/global_data.h
rename to arch/sparc/include/asm/global_data.h
arch/sparc/include/asm/io.h renamed from include/asm-sparc/io.h +0 -0
similarity index 100%
rename from include/asm-sparc/io.h
rename to arch/sparc/include/asm/io.h
arch/sparc/include/asm/irq.h renamed from include/asm-sparc/irq.h +0 -0
similarity index 100%
rename from include/asm-sparc/irq.h
rename to arch/sparc/include/asm/irq.h
arch/sparc/include/asm/leon.h renamed from include/asm-sparc/leon.h +0 -0
similarity index 100%
rename from include/asm-sparc/leon.h
rename to arch/sparc/include/asm/leon.h
arch/sparc/include/asm/leon2.h renamed from include/asm-sparc/leon2.h +0 -0
similarity index 100%
rename from include/asm-sparc/leon2.h
rename to arch/sparc/include/asm/leon2.h
arch/sparc/include/asm/leon3.h renamed from include/asm-sparc/leon3.h +0 -0
similarity index 100%
rename from include/asm-sparc/leon3.h
rename to arch/sparc/include/asm/leon3.h
arch/sparc/include/asm/machines.h renamed from include/asm-sparc/machines.h +0 -0
similarity index 100%
rename from include/asm-sparc/machines.h
rename to arch/sparc/include/asm/machines.h
arch/sparc/include/asm/page.h renamed from include/asm-sparc/page.h +0 -0
similarity index 100%
rename from include/asm-sparc/page.h
rename to arch/sparc/include/asm/page.h
arch/sparc/include/asm/posix_types.h renamed from include/asm-sparc/posix_types.h +0 -0
similarity index 100%
rename from include/asm-sparc/posix_types.h
rename to arch/sparc/include/asm/posix_types.h
arch/sparc/include/asm/processor.h renamed from include/asm-sparc/processor.h +0 -0
similarity index 100%
rename from include/asm-sparc/processor.h
rename to arch/sparc/include/asm/processor.h
arch/sparc/include/asm/prom.h renamed from include/asm-sparc/prom.h +0 -0
similarity index 100%
rename from include/asm-sparc/prom.h
rename to arch/sparc/include/asm/prom.h
arch/sparc/include/asm/psr.h renamed from include/asm-sparc/psr.h +0 -0
similarity index 100%
rename from include/asm-sparc/psr.h
rename to arch/sparc/include/asm/psr.h
arch/sparc/include/asm/ptrace.h renamed from include/asm-sparc/ptrace.h +0 -0
similarity index 100%
rename from include/asm-sparc/ptrace.h
rename to arch/sparc/include/asm/ptrace.h
arch/sparc/include/asm/srmmu.h renamed from include/asm-sparc/srmmu.h +0 -0
similarity index 100%
rename from include/asm-sparc/srmmu.h
rename to arch/sparc/include/asm/srmmu.h
arch/sparc/include/asm/stack.h renamed from include/asm-sparc/stack.h +0 -0
similarity index 100%
rename from include/asm-sparc/stack.h
rename to arch/sparc/include/asm/stack.h
arch/sparc/include/asm/string.h renamed from include/asm-sparc/string.h +0 -0
similarity index 100%
rename from include/asm-sparc/string.h
rename to arch/sparc/include/asm/string.h
arch/sparc/include/asm/types.h renamed from include/asm-sparc/types.h +0 -0
similarity index 100%
rename from include/asm-sparc/types.h
rename to arch/sparc/include/asm/types.h
arch/sparc/include/asm/u-boot.h renamed from include/asm-sparc/u-boot.h +0 -0
similarity index 100%
rename from include/asm-sparc/u-boot.h
rename to arch/sparc/include/asm/u-boot.h
arch/sparc/include/asm/winmacro.h renamed from include/asm-sparc/winmacro.h +0 -0
similarity index 100%
rename from include/asm-sparc/winmacro.h
rename to arch/sparc/include/asm/winmacro.h
include/.gitignore +0 -2
index 4481412..77594e5 100644
@@ -1,7 +1,5 @@
 /autoconf.mk*
 /asm
-/asm-*/arch
-/asm-*/proc
 /bmp_logo.h
 /config.h
 /config.mk
mkconfig +8 -11
index 27d9f2b..44366a6 100755
@@ -42,30 +42,27 @@ if [ "$SRCTREE" != "$OBJTREE" ] ; then
 	mkdir -p ${OBJTREE}/include2
 	cd ${OBJTREE}/include2
 	rm -f asm
-	ln -s ${SRCTREE}/include/asm-$2 asm
+	ln -s ${SRCTREE}/arch/$2/include/asm asm
 	LNPREFIX="../../include2/asm/"
 	cd ../include
-	rm -rf asm-$2
 	rm -f asm
-	mkdir asm-$2
-	ln -s asm-$2 asm
+	ln -s ${SRCTREE}/arch/$2/include/asm asm
 else
 	cd ./include
-	rm -f asm
-	ln -s asm-$2 asm
+	ln -s ../arch/$2/include/asm asm
 fi
 
-rm -f asm-$2/arch
+rm -f asm/arch
 
 if [ -z "$6" -o "$6" = "NULL" ] ; then
-	ln -s ${LNPREFIX}arch-$3 asm-$2/arch
+	ln -s ${LNPREFIX}arch-$3 asm/arch
 else
-	ln -s ${LNPREFIX}arch-$6 asm-$2/arch
+	ln -s ${LNPREFIX}arch-$6 asm/arch
 fi
 
 if [ "$2" = "arm" ] ; then
-	rm -f asm-$2/proc
-	ln -s ${LNPREFIX}proc-armv asm-$2/proc
+	rm -f asm/proc
+	ln -s ${LNPREFIX}proc-armv asm/proc
 fi
 
 #
Signature · 1 line
1.6.2-rc2.GIT
#8 lore raw

PATCH 6/17 ppc: Move appropriate cpu/ dirs to arch/ppc/cpu/

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

PATCH 6/17 ppc: Move appropriate cpu/ dirs to arch/ppc/cpu/

Quoted 1 line · Peter Tyser
 {cpu/mpc8260 => arch/ppc/cpu/mpc824x}/u-boot.lds   |    2 +-

[snip]

Quoted 1 line
 {cpu/mpc824x => arch/ppc/cpu/mpc8260}/u-boot.lds   |    2 +-

These seem to have gotten mixed up.

-Scott

#10 lore raw

PATCH 6/17 ppc: Move appropriate cpu/ dirs to arch/ppc/cpu/

Quoted 6 lines · Scott Wood
Quoted 1 line · Peter Tyser
 {cpu/mpc8260 => arch/ppc/cpu/mpc824x}/u-boot.lds   |    2 +-

[snip]

Quoted 1 line
 {cpu/mpc824x => arch/ppc/cpu/mpc8260}/u-boot.lds   |    2 +-

These seem to have gotten mixed up.

Impressive attention to detail! It looks like git got fancy detecting the renames. It swapped the file locations and also modified their contents accordingly:

arch/ppc/cpu/mpc8260/u-boot.lds renamed from cpu/mpc824x/u-boot.lds +1 -1
similarity index 98%
rename from cpu/mpc824x/u-boot.lds
rename to arch/ppc/cpu/mpc8260/u-boot.lds
index 0eac48f..9887844 100644
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc824x/start.o                (.text)
+    arch/ppc/cpu/mpc8260/start.o               (.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
arch/ppc/cpu/mpc824x/u-boot.lds renamed from cpu/mpc8260/u-boot.lds +1 -1
similarity index 98%
rename from cpu/mpc8260/u-boot.lds
rename to arch/ppc/cpu/mpc824x/u-boot.lds
index c777cf9..8a6d508 100644
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8260/start.o                (.text)
+    arch/ppc/cpu/mpc824x/start.o               (.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);

Weird stuff. Thanks for looking the change over,
Peter

#11 lore raw

PATCH 6/17 ppc: Move appropriate cpu/ dirs to arch/ppc/cpu/

Quoted 8 lines · Peter Tyser
Quoted 5 lines · Scott Wood
Quoted 1 line · Peter Tyser
 {cpu/mpc8260 => arch/ppc/cpu/mpc824x}/u-boot.lds   |    2 +-

[snip]

Quoted 1 line
 {cpu/mpc824x => arch/ppc/cpu/mpc8260}/u-boot.lds   |    2 +-

These seem to have gotten mixed up.

Impressive attention to detail!

Well, they stood out due to not starting with "{cpu =>"...

Quoted 29 lines

It looks like git got fancy detecting
the renames. It swapped the file locations and also modified their contents accordingly:

arch/ppc/cpu/mpc8260/u-boot.lds renamed from cpu/mpc824x/u-boot.lds +1 -1
similarity index 98%
rename from cpu/mpc824x/u-boot.lds
rename to arch/ppc/cpu/mpc8260/u-boot.lds
index 0eac48f..9887844 100644
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc824x/start.o                (.text)
+    arch/ppc/cpu/mpc8260/start.o               (.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);
arch/ppc/cpu/mpc824x/u-boot.lds renamed from cpu/mpc8260/u-boot.lds +0 -0
similarity index 98%
rename from cpu/mpc8260/u-boot.lds
rename to arch/ppc/cpu/mpc824x/u-boot.lds
index c777cf9..8a6d508 100644

arch/ppc/cpu/mpc824x/u-boot.lds SECTIONS · line 58

Quoted 8 lines
arch/ppc/cpu/mpc824x/u-boot.lds renamed from cpu/mpc8260/u-boot.lds +1 -1
@@ -52,7 +52,7 @@ SECTIONS
   .plt : { *(.plt) }
   .text      :
   {
-    cpu/mpc8260/start.o                (.text)
+    arch/ppc/cpu/mpc824x/start.o               (.text)
     *(.text)
     *(.got1)
     . = ALIGN(16);

Ah, OK. Heuristics are fun. :-)

-Scott

#12 lore raw

PATCH 7/17 sh: Move appropriate cpu/ dirs to arch/sh/cpu/

In reply to Peter Tyser
---
 {cpu => arch/sh/cpu}/sh2/Makefile     |    0
 {cpu => arch/sh/cpu}/sh2/cache.c      |    0
 {cpu => arch/sh/cpu}/sh2/config.mk    |    0
 {cpu => arch/sh/cpu}/sh2/cpu.c        |    0
 {cpu => arch/sh/cpu}/sh2/interrupts.c |    0
 {cpu => arch/sh/cpu}/sh2/start.S      |    0
 {cpu => arch/sh/cpu}/sh2/u-boot.lds   |    2 +-
 {cpu => arch/sh/cpu}/sh2/watchdog.c   |    0
 {cpu => arch/sh/cpu}/sh3/Makefile     |    0
 {cpu => arch/sh/cpu}/sh3/cache.c      |    0
 {cpu => arch/sh/cpu}/sh3/config.mk    |    0
 {cpu => arch/sh/cpu}/sh3/cpu.c        |    0
 {cpu => arch/sh/cpu}/sh3/interrupts.c |    0
 {cpu => arch/sh/cpu}/sh3/start.S      |    0
 {cpu => arch/sh/cpu}/sh3/u-boot.lds   |    2 +-
 {cpu => arch/sh/cpu}/sh3/watchdog.c   |    0
 {cpu => arch/sh/cpu}/sh4/Makefile     |    0
 {cpu => arch/sh/cpu}/sh4/cache.c      |    0
 {cpu => arch/sh/cpu}/sh4/config.mk    |    0
 {cpu => arch/sh/cpu}/sh4/cpu.c        |    0
 {cpu => arch/sh/cpu}/sh4/interrupts.c |    0
 {cpu => arch/sh/cpu}/sh4/start.S      |    0
 {cpu => arch/sh/cpu}/sh4/u-boot.lds   |    2 +-
 {cpu => arch/sh/cpu}/sh4/watchdog.c   |    0
 drivers/pci/pci_sh4.c                 |    2 +-
 25 files changed, 4 insertions(+), 4 deletions(-)
 rename {cpu => arch/sh/cpu}/sh2/Makefile (100%)
 rename {cpu => arch/sh/cpu}/sh2/cache.c (100%)
 rename {cpu => arch/sh/cpu}/sh2/config.mk (100%)
 rename {cpu => arch/sh/cpu}/sh2/cpu.c (100%)
 rename {cpu => arch/sh/cpu}/sh2/interrupts.c (100%)
 rename {cpu => arch/sh/cpu}/sh2/start.S (100%)
 rename {cpu => arch/sh/cpu}/sh2/u-boot.lds (98%)
 rename {cpu => arch/sh/cpu}/sh2/watchdog.c (100%)
 rename {cpu => arch/sh/cpu}/sh3/Makefile (100%)
 rename {cpu => arch/sh/cpu}/sh3/cache.c (100%)
 rename {cpu => arch/sh/cpu}/sh3/config.mk (100%)
 rename {cpu => arch/sh/cpu}/sh3/cpu.c (100%)
 rename {cpu => arch/sh/cpu}/sh3/interrupts.c (100%)
 rename {cpu => arch/sh/cpu}/sh3/start.S (100%)
 rename {cpu => arch/sh/cpu}/sh3/u-boot.lds (98%)
 rename {cpu => arch/sh/cpu}/sh3/watchdog.c (100%)
 rename {cpu => arch/sh/cpu}/sh4/Makefile (100%)
 rename {cpu => arch/sh/cpu}/sh4/cache.c (100%)
 rename {cpu => arch/sh/cpu}/sh4/config.mk (100%)
 rename {cpu => arch/sh/cpu}/sh4/cpu.c (100%)
 rename {cpu => arch/sh/cpu}/sh4/interrupts.c (100%)
 rename {cpu => arch/sh/cpu}/sh4/start.S (100%)
 rename {cpu => arch/sh/cpu}/sh4/u-boot.lds (98%)
 rename {cpu => arch/sh/cpu}/sh4/watchdog.c (100%)
arch/sh/cpu/sh2/Makefile renamed from cpu/sh2/Makefile +0 -0
similarity index 100%
rename from cpu/sh2/Makefile
rename to arch/sh/cpu/sh2/Makefile
arch/sh/cpu/sh2/cache.c renamed from cpu/sh2/cache.c +0 -0
similarity index 100%
rename from cpu/sh2/cache.c
rename to arch/sh/cpu/sh2/cache.c
arch/sh/cpu/sh2/config.mk renamed from cpu/sh2/config.mk +0 -0
similarity index 100%
rename from cpu/sh2/config.mk
rename to arch/sh/cpu/sh2/config.mk
arch/sh/cpu/sh2/cpu.c renamed from cpu/sh2/cpu.c +0 -0
similarity index 100%
rename from cpu/sh2/cpu.c
rename to arch/sh/cpu/sh2/cpu.c
arch/sh/cpu/sh2/interrupts.c renamed from cpu/sh2/interrupts.c +0 -0
similarity index 100%
rename from cpu/sh2/interrupts.c
rename to arch/sh/cpu/sh2/interrupts.c
arch/sh/cpu/sh2/start.S renamed from cpu/sh2/start.S +0 -0
similarity index 100%
rename from cpu/sh2/start.S
rename to arch/sh/cpu/sh2/start.S
arch/sh/cpu/sh2/u-boot.lds renamed from cpu/sh2/u-boot.lds +1 -1
similarity index 98%
rename from cpu/sh2/u-boot.lds
rename to arch/sh/cpu/sh2/u-boot.lds
index 6db5a00..e4e8b60 100644
@@ -38,7 +38,7 @@ SECTIONS
 
 	.text :
 	{
-		cpu/sh2/start.o		(.text)
+		arch/sh/cpu/sh2/start.o		(.text)
 		. = ALIGN(8192);
 		common/env_embedded.o	(.ppcenv)
 		. = ALIGN(8192);
arch/sh/cpu/sh2/watchdog.c renamed from cpu/sh2/watchdog.c +0 -0
similarity index 100%
rename from cpu/sh2/watchdog.c
rename to arch/sh/cpu/sh2/watchdog.c
arch/sh/cpu/sh3/Makefile renamed from cpu/sh3/Makefile +0 -0
similarity index 100%
rename from cpu/sh3/Makefile
rename to arch/sh/cpu/sh3/Makefile
arch/sh/cpu/sh3/cache.c renamed from cpu/sh3/cache.c +0 -0
similarity index 100%
rename from cpu/sh3/cache.c
rename to arch/sh/cpu/sh3/cache.c
arch/sh/cpu/sh3/config.mk renamed from cpu/sh3/config.mk +0 -0
similarity index 100%
rename from cpu/sh3/config.mk
rename to arch/sh/cpu/sh3/config.mk
arch/sh/cpu/sh3/cpu.c renamed from cpu/sh3/cpu.c +0 -0
similarity index 100%
rename from cpu/sh3/cpu.c
rename to arch/sh/cpu/sh3/cpu.c
arch/sh/cpu/sh3/interrupts.c renamed from cpu/sh3/interrupts.c +0 -0
similarity index 100%
rename from cpu/sh3/interrupts.c
rename to arch/sh/cpu/sh3/interrupts.c
arch/sh/cpu/sh3/start.S renamed from cpu/sh3/start.S +0 -0
similarity index 100%
rename from cpu/sh3/start.S
rename to arch/sh/cpu/sh3/start.S
arch/sh/cpu/sh3/u-boot.lds renamed from cpu/sh3/u-boot.lds +1 -1
similarity index 98%
rename from cpu/sh3/u-boot.lds
rename to arch/sh/cpu/sh3/u-boot.lds
index 1e55b83..8afe160 100644
@@ -44,7 +44,7 @@ SECTIONS
 
 	.text :
 	{
-		cpu/sh3/start.o		(.text)
+		arch/sh/cpu/sh3/start.o		(.text)
 		. = ALIGN(8192);
 		common/env_embedded.o	(.ppcenv)
 		. = ALIGN(8192);
arch/sh/cpu/sh3/watchdog.c renamed from cpu/sh3/watchdog.c +0 -0
similarity index 100%
rename from cpu/sh3/watchdog.c
rename to arch/sh/cpu/sh3/watchdog.c
arch/sh/cpu/sh4/Makefile renamed from cpu/sh4/Makefile +0 -0
similarity index 100%
rename from cpu/sh4/Makefile
rename to arch/sh/cpu/sh4/Makefile
arch/sh/cpu/sh4/cache.c renamed from cpu/sh4/cache.c +0 -0
similarity index 100%
rename from cpu/sh4/cache.c
rename to arch/sh/cpu/sh4/cache.c
arch/sh/cpu/sh4/config.mk renamed from cpu/sh4/config.mk +0 -0
similarity index 100%
rename from cpu/sh4/config.mk
rename to arch/sh/cpu/sh4/config.mk
arch/sh/cpu/sh4/cpu.c renamed from cpu/sh4/cpu.c +0 -0
similarity index 100%
rename from cpu/sh4/cpu.c
rename to arch/sh/cpu/sh4/cpu.c
arch/sh/cpu/sh4/interrupts.c renamed from cpu/sh4/interrupts.c +0 -0
similarity index 100%
rename from cpu/sh4/interrupts.c
rename to arch/sh/cpu/sh4/interrupts.c
arch/sh/cpu/sh4/start.S renamed from cpu/sh4/start.S +0 -0
similarity index 100%
rename from cpu/sh4/start.S
rename to arch/sh/cpu/sh4/start.S
arch/sh/cpu/sh4/u-boot.lds renamed from cpu/sh4/u-boot.lds +1 -1
similarity index 98%
rename from cpu/sh4/u-boot.lds
rename to arch/sh/cpu/sh4/u-boot.lds
index bff9f43..d3719df 100644
@@ -41,7 +41,7 @@ SECTIONS
 
 	.text :
 	{
-		cpu/sh4/start.o		(.text)
+		arch/sh/cpu/sh4/start.o		(.text)
 		. = ALIGN(8192);
 		common/env_embedded.o	(.ppcenv)
 		. = ALIGN(8192);
arch/sh/cpu/sh4/watchdog.c renamed from cpu/sh4/watchdog.c +0 -0
similarity index 100%
rename from cpu/sh4/watchdog.c
rename to arch/sh/cpu/sh4/watchdog.c
drivers/pci/pci_sh4.c +1 -1
index c7963ed..62915b6 100644
@@ -4,7 +4,7 @@
  * (C) 2007,2008 Nobuhiro Iwamatsu <[email protected]>
  * (C) 2008 Yusuke Goda <[email protected]>
  *
- * u-boot/cpu/sh4/pci-sh4.c
+ * u-boot/arch/sh/cpu/sh4/pci-sh4.c
  *
  * See file CREDITS for list of people who contributed to this
  * project.
Signature · 1 line
1.6.2-rc2.GIT