This series can be applied on the current u-boot/master (commit 1320112c8aa58345d71a5a46f3bf6a52589f1f2b)
Just rebased onto u-boot/master. No other specail update from the RFC version.
Masahiro Yamada (19): ARM: at91: move board select menu and common settings ARM: prepare for moving SoC sources into mach-* ARM: at91: collect SoC sources into mach-at91 ARM: tegra: collect SoC sources into mach-tegra ARM: davinci: move SoC sources to mach-davinci ARM: kirkwood: move SOC sources to mach-kirkwood ARM: nomadik: move SoC sources to mach-nomadik ARM: highbank: move SoC sources to mach-highbank ARM: orion5x: move SoC sources to mach-orion5x ARM: versatile: move SoC sources to mach-versatile ARM: keystone: move SoC sources to mach-keystone kbuild: prepare for moving headers into mach-*/include/mach ARM: at91: move SoC headers to mach-at91/include/mach ARM: davinci: move SoC headers to mach-davinci/include/mach ARM: kirkwood: move SoC headers to mach-kirkwood/include/mach ARM: nomadik: move SoC headers to mach-nomadik/include/mach ARM: orion5x: move SoC headers to mach-orion5x/include/mach ARM: keystone: move SoC headers to mach-keystone/include/mach ARM: prepare for including <mach/*.h>
MAINTAINERS | 11 +- arch/arm/Kconfig | 175 ++------------------- arch/arm/Makefile | 24 +++ arch/arm/cpu/Makefile | 7 +- arch/arm/cpu/arm720t/Makefile | 6 - arch/arm/cpu/arm720t/tegra-common/Makefile | 11 -- arch/arm/cpu/arm720t/tegra114/Makefile | 21 --- arch/arm/cpu/arm720t/tegra124/Makefile | 8 - arch/arm/cpu/arm720t/tegra20/Makefile | 10 -- arch/arm/cpu/arm720t/tegra30/Makefile | 20 --- arch/arm/cpu/arm920t/Makefile | 1 - arch/arm/cpu/arm926ejs/Makefile | 6 - arch/arm/cpu/arm926ejs/at91/config.mk | 2 - arch/arm/cpu/armv7/Makefile | 5 - arch/arm/cpu/armv7/at91/config.mk | 8 - arch/arm/cpu/armv7/tegra-common/Makefile | 10 -- arch/arm/cpu/armv7/tegra20/Makefile | 11 -- arch/arm/mach-at91/Kconfig | 168 ++++++++++++++++++++ arch/arm/{cpu/at91-common => mach-at91}/Makefile | 14 +- .../arm920t/at91 => mach-at91/arm920t}/Makefile | 0 .../arm920t}/at91rm9200_devices.c | 0 .../arm920t/at91 => mach-at91/arm920t}/clock.c | 0 .../{cpu/arm920t/at91 => mach-at91/arm920t}/cpu.c | 0 .../at91 => mach-at91/arm920t}/lowlevel_init.S | 0 .../arm920t/at91 => mach-at91/arm920t}/reset.c | 0 .../arm920t/at91 => mach-at91/arm920t}/timer.c | 0 .../at91 => mach-at91/arm926ejs}/Makefile | 0 .../arm926ejs}/at91sam9260_devices.c | 0 .../arm926ejs}/at91sam9261_devices.c | 0 .../arm926ejs}/at91sam9263_devices.c | 0 .../arm926ejs}/at91sam9m10g45_devices.c | 0 .../arm926ejs}/at91sam9n12_devices.c | 0 .../arm926ejs}/at91sam9rl_devices.c | 0 .../arm926ejs}/at91sam9x5_devices.c | 0 .../arm926ejs/at91 => mach-at91/arm926ejs}/clock.c | 0 .../arm926ejs/at91 => mach-at91/arm926ejs}/cpu.c | 0 .../at91 => mach-at91/arm926ejs}/eflash.c | 0 .../arm926ejs/at91 => mach-at91/arm926ejs}/led.c | 0 .../at91 => mach-at91/arm926ejs}/lowlevel_init.S | 0 .../arm926ejs/at91 => mach-at91/arm926ejs}/reset.c | 0 .../arm926ejs/at91 => mach-at91/arm926ejs}/timer.c | 0 .../{cpu/armv7/at91 => mach-at91/armv7}/Makefile | 0 .../{cpu/armv7/at91 => mach-at91/armv7}/clock.c | 0 arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/cpu.c | 0 .../{cpu/armv7/at91 => mach-at91/armv7}/reset.c | 0 .../at91 => mach-at91/armv7}/sama5d3_devices.c | 0 .../at91 => mach-at91/armv7}/sama5d4_devices.c | 0 .../{cpu/armv7/at91 => mach-at91/armv7}/timer.c | 0 arch/arm/mach-at91/config.mk | 9 ++ .../include/mach}/at91_common.h | 0 .../include/mach}/at91_dbu.h | 0 .../include/mach}/at91_eefc.h | 0 .../include/mach}/at91_emac.h | 0 .../include/mach}/at91_gpbr.h | 0 .../include/mach}/at91_matrix.h | 0 .../arch-at91 => mach-at91/include/mach}/at91_mc.h | 0 .../include/mach}/at91_pdc.h | 0 .../include/mach}/at91_pio.h | 0 .../include/mach}/at91_pit.h | 0 .../include/mach}/at91_pmc.h | 0 .../include/mach}/at91_rstc.h | 0 .../include/mach}/at91_rtt.h | 0 .../include/mach}/at91_spi.h | 0 .../arch-at91 => mach-at91/include/mach}/at91_st.h | 0 .../arch-at91 => mach-at91/include/mach}/at91_tc.h | 0 .../include/mach}/at91_wdt.h | 0 .../include/mach}/at91rm9200.h | 0 .../include/mach}/at91sam9260.h | 0 .../include/mach}/at91sam9260_matrix.h | 0 .../include/mach}/at91sam9261.h | 0 .../include/mach}/at91sam9261_matrix.h | 0 .../include/mach}/at91sam9263.h | 0 .../include/mach}/at91sam9263_matrix.h | 0 .../include/mach}/at91sam9_matrix.h | 0 .../include/mach}/at91sam9_sdramc.h | 0 .../include/mach}/at91sam9_smc.h | 0 .../include/mach}/at91sam9g45.h | 0 .../include/mach}/at91sam9g45_matrix.h | 0 .../include/mach}/at91sam9rl.h | 0 .../include/mach}/at91sam9rl_matrix.h | 0 .../include/mach}/at91sam9x5.h | 0 .../include/mach}/at91sam9x5_matrix.h | 0 .../include/mach}/atmel_mpddrc.h | 0 .../include/mach}/atmel_serial.h | 0 .../include/mach}/atmel_usba_udc.h | 0 .../asm/arch-at91 => mach-at91/include/mach}/clk.h | 0 .../arch-at91 => mach-at91/include/mach}/gpio.h | 0 .../include/mach}/hardware.h | 0 .../arch-at91 => mach-at91/include/mach}/sama5d3.h | 0 .../include/mach}/sama5d3_smc.h | 0 .../arch-at91 => mach-at91/include/mach}/sama5d4.h | 0 arch/arm/{cpu/at91-common => mach-at91}/mpddrc.c | 0 arch/arm/{cpu/at91-common => mach-at91}/phy.c | 0 arch/arm/{cpu/at91-common => mach-at91}/sdram.c | 0 arch/arm/{cpu/at91-common => mach-at91}/spl.c | 0 arch/arm/{cpu/at91-common => mach-at91}/spl_at91.c | 0 .../arm/{cpu/at91-common => mach-at91}/spl_atmel.c | 0 .../{cpu/at91-common => mach-at91}/u-boot-spl.lds | 0 .../arm926ejs/davinci => mach-davinci}/Kconfig | 0 .../arm926ejs/davinci => mach-davinci}/Makefile | 0 .../arm926ejs/davinci => mach-davinci}/config.mk | 0 .../{cpu/arm926ejs/davinci => mach-davinci}/cpu.c | 0 .../davinci => mach-davinci}/da830_pinmux.c | 0 .../davinci => mach-davinci}/da850_lowlevel.c | 0 .../davinci => mach-davinci}/da850_pinmux.c | 0 .../arm926ejs/davinci => mach-davinci}/dm355.c | 0 .../arm926ejs/davinci => mach-davinci}/dm365.c | 0 .../davinci => mach-davinci}/dm365_lowlevel.c | 0 .../arm926ejs/davinci => mach-davinci}/dm644x.c | 0 .../arm926ejs/davinci => mach-davinci}/dm646x.c | 0 .../arm926ejs/davinci => mach-davinci}/dp83848.c | 2 +- .../arm926ejs/davinci => mach-davinci}/et1011c.c | 2 +- .../include/mach}/aintc_defs.h | 0 .../include/mach}/da850_lowlevel.h | 0 .../include/mach}/da8xx-usb.h | 0 .../include/mach}/davinci_misc.h | 0 .../include/mach}/ddr2_defs.h | 0 .../include/mach}/dm365_lowlevel.h | 0 .../include/mach}/emac_defs.h | 0 .../include/mach}/gpio.h | 0 .../include/mach}/hardware.h | 0 .../include/mach}/i2c_defs.h | 0 .../include/mach}/pinmux_defs.h | 0 .../include/mach}/pll_defs.h | 0 .../include/mach}/psc_defs.h | 0 .../include/mach}/sdmmc_defs.h | 0 .../include/mach}/syscfg_defs.h | 0 .../include/mach}/timer_defs.h | 0 .../arm926ejs/davinci => mach-davinci}/ksz8873.c | 2 +- .../davinci => mach-davinci}/lowlevel_init.S | 0 .../arm926ejs/davinci => mach-davinci}/lxt972.c | 2 +- .../{cpu/arm926ejs/davinci => mach-davinci}/misc.c | 0 .../arm926ejs/davinci => mach-davinci}/pinmux.c | 0 .../{cpu/arm926ejs/davinci => mach-davinci}/psc.c | 0 .../arm926ejs/davinci => mach-davinci}/reset.c | 0 .../{cpu/arm926ejs/davinci => mach-davinci}/spl.c | 0 .../arm926ejs/davinci => mach-davinci}/timer.c | 0 .../{cpu/armv7/highbank => mach-highbank}/Kconfig | 0 .../{cpu/armv7/highbank => mach-highbank}/Makefile | 0 .../{cpu/armv7/highbank => mach-highbank}/timer.c | 0 .../{cpu/armv7/keystone => mach-keystone}/Kconfig | 0 .../{cpu/armv7/keystone => mach-keystone}/Makefile | 0 .../armv7/keystone => mach-keystone}/clock-k2e.c | 0 .../armv7/keystone => mach-keystone}/clock-k2hk.c | 0 .../armv7/keystone => mach-keystone}/clock-k2l.c | 0 .../{cpu/armv7/keystone => mach-keystone}/clock.c | 0 .../armv7/keystone => mach-keystone}/cmd_clock.c | 0 .../armv7/keystone => mach-keystone}/cmd_ddr3.c | 0 .../armv7/keystone => mach-keystone}/cmd_mon.c | 0 .../{cpu/armv7/keystone => mach-keystone}/ddr3.c | 0 .../include/mach}/clock-k2e.h | 0 .../include/mach}/clock-k2hk.h | 0 .../include/mach}/clock-k2l.h | 0 .../include/mach}/clock.h | 0 .../include/mach}/clock_defs.h | 0 .../include/mach}/ddr3.h | 0 .../include/mach}/hardware-k2e.h | 0 .../include/mach}/hardware-k2hk.h | 0 .../include/mach}/hardware-k2l.h | 0 .../include/mach}/hardware.h | 0 .../include/mach}/i2c_defs.h | 0 .../include/mach}/mon.h | 0 .../include/mach}/msmc.h | 0 .../include/mach}/psc_defs.h | 0 .../include/mach}/xhci-keystone.h | 0 .../{cpu/armv7/keystone => mach-keystone}/init.c | 0 .../armv7/keystone => mach-keystone}/keystone.c | 0 .../{cpu/armv7/keystone => mach-keystone}/msmc.c | 0 .../{cpu/armv7/keystone => mach-keystone}/psc.c | 0 .../arm926ejs/kirkwood => mach-kirkwood}/Kconfig | 0 .../arm926ejs/kirkwood => mach-kirkwood}/Makefile | 0 .../arm926ejs/kirkwood => mach-kirkwood}/cache.c | 0 .../arm926ejs/kirkwood => mach-kirkwood}/cpu.c | 0 .../include/mach}/config.h | 0 .../include/mach}/cpu.h | 0 .../include/mach}/gpio.h | 0 .../include/mach}/kw88f6192.h | 0 .../include/mach}/kw88f6281.h | 0 .../include/mach}/mpp.h | 0 .../include/mach}/soc.h | 0 .../arm926ejs/kirkwood => mach-kirkwood}/mpp.c | 0 .../arm926ejs/nomadik => mach-nomadik}/Kconfig | 0 .../arm926ejs/nomadik => mach-nomadik}/Makefile | 0 .../{cpu/arm926ejs/nomadik => mach-nomadik}/gpio.c | 0 .../include/mach}/gpio.h | 0 .../include/mach}/mtu.h | 0 .../arm926ejs/nomadik => mach-nomadik}/reset.S | 0 .../arm926ejs/nomadik => mach-nomadik}/timer.c | 0 .../arm926ejs/orion5x => mach-orion5x}/Kconfig | 0 .../arm926ejs/orion5x => mach-orion5x}/Makefile | 0 .../{cpu/arm926ejs/orion5x => mach-orion5x}/cpu.c | 0 .../{cpu/arm926ejs/orion5x => mach-orion5x}/dram.c | 0 .../include/mach}/cpu.h | 0 .../include/mach}/mv88f5182.h | 0 .../include/mach}/orion5x.h | 0 .../orion5x => mach-orion5x}/lowlevel_init.S | 0 .../arm926ejs/orion5x => mach-orion5x}/timer.c | 0 .../{cpu/armv7/tegra-common => mach-tegra}/Kconfig | 8 +- arch/arm/{cpu/tegra-common => mach-tegra}/Makefile | 12 ++ arch/arm/{cpu/tegra-common => mach-tegra}/ap.c | 0 arch/arm/{cpu/tegra-common => mach-tegra}/board.c | 0 arch/arm/{cpu/tegra-common => mach-tegra}/cache.c | 0 arch/arm/{cpu/tegra-common => mach-tegra}/clock.c | 0 .../tegra-common => mach-tegra}/cmd_enterrcm.c | 0 .../{cpu/arm720t/tegra-common => mach-tegra}/cpu.c | 0 .../{cpu/arm720t/tegra-common => mach-tegra}/cpu.h | 0 .../tegra-common => mach-tegra}/lowlevel_init.S | 0 .../tegra-common => mach-tegra}/pinmux-common.c | 0 .../{cpu/tegra-common => mach-tegra}/powergate.c | 0 .../{cpu/arm720t/tegra-common => mach-tegra}/spl.c | 0 .../{cpu/tegra-common => mach-tegra}/sys_info.c | 0 .../arm/{cpu/armv7 => mach-tegra}/tegra114/Kconfig | 0 .../tegra114}/Makefile | 5 +- .../tegra114}/clock.c | 0 .../arm/{cpu/arm720t => mach-tegra}/tegra114/cpu.c | 2 +- .../tegra114}/funcmux.c | 0 .../tegra114}/pinmux.c | 0 .../arm/{cpu/armv7 => mach-tegra}/tegra124/Kconfig | 0 .../tegra124}/Makefile | 2 + .../tegra124}/clock.c | 0 .../arm/{cpu/arm720t => mach-tegra}/tegra124/cpu.c | 2 +- .../tegra124}/funcmux.c | 0 .../tegra124}/pinmux.c | 0 .../tegra124}/xusb-padctl.c | 0 arch/arm/{cpu/armv7 => mach-tegra}/tegra20/Kconfig | 0 .../tegra20-common => mach-tegra/tegra20}/Makefile | 10 +- .../tegra20-common => mach-tegra/tegra20}/clock.c | 0 arch/arm/{cpu/arm720t => mach-tegra}/tegra20/cpu.c | 2 +- .../tegra20-common => mach-tegra/tegra20}/crypto.c | 0 .../tegra20-common => mach-tegra/tegra20}/crypto.h | 0 .../{cpu/armv7 => mach-tegra}/tegra20/display.c | 0 .../tegra20-common => mach-tegra/tegra20}/emc.c | 0 .../tegra20}/funcmux.c | 0 .../tegra20-common => mach-tegra/tegra20}/pinmux.c | 0 .../tegra20-common => mach-tegra/tegra20}/pmu.c | 0 arch/arm/{cpu/armv7 => mach-tegra}/tegra20/pwm.c | 0 .../tegra20}/warmboot.c | 0 .../tegra20}/warmboot_avp.c | 0 .../tegra20}/warmboot_avp.h | 0 arch/arm/{cpu/armv7 => mach-tegra}/tegra30/Kconfig | 0 .../tegra30-common => mach-tegra/tegra30}/Makefile | 5 +- .../tegra30-common => mach-tegra/tegra30}/clock.c | 0 arch/arm/{cpu/arm720t => mach-tegra}/tegra30/cpu.c | 2 +- .../tegra30}/funcmux.c | 0 .../tegra30-common => mach-tegra/tegra30}/pinmux.c | 0 arch/arm/{cpu/tegra-common => mach-tegra}/vpr.c | 0 .../{cpu/tegra-common => mach-tegra}/xusb-padctl.c | 0 .../arm926ejs/versatile => mach-versatile}/Kconfig | 0 .../versatile => mach-versatile}/Makefile | 0 .../arm926ejs/versatile => mach-versatile}/reset.S | 0 .../arm926ejs/versatile => mach-versatile}/timer.c | 0 board/BuS/eb_cpux9k2/Kconfig | 3 - board/BuS/vl_ma2sc/Kconfig | 3 - board/afeb9260/Kconfig | 3 - board/atmel/at91rm9200ek/Kconfig | 3 - board/atmel/at91sam9260ek/Kconfig | 3 - board/atmel/at91sam9261ek/Kconfig | 3 - board/atmel/at91sam9263ek/Kconfig | 3 - board/atmel/at91sam9m10g45ek/Kconfig | 3 - board/atmel/at91sam9n12ek/Kconfig | 3 - board/atmel/at91sam9rlek/Kconfig | 3 - board/atmel/at91sam9x5ek/Kconfig | 3 - board/atmel/sama5d3_xplained/Kconfig | 3 - board/atmel/sama5d3xek/Kconfig | 3 - board/atmel/sama5d4_xplained/Kconfig | 3 - board/atmel/sama5d4ek/Kconfig | 3 - board/bluewater/snapper9260/Kconfig | 3 - board/calao/sbc35_a9g20/Kconfig | 3 - board/calao/tny_a9260/Kconfig | 3 - board/calao/usb_a9263/Kconfig | 3 - board/egnite/ethernut5/Kconfig | 3 - board/esd/meesc/Kconfig | 3 - board/esd/otc570/Kconfig | 3 - board/eukrea/cpu9260/Kconfig | 3 - board/eukrea/cpuat91/Kconfig | 3 - board/ronetix/pm9261/Kconfig | 3 - board/ronetix/pm9263/Kconfig | 3 - board/ronetix/pm9g45/Kconfig | 3 - board/siemens/corvus/Kconfig | 3 - board/siemens/taurus/Kconfig | 3 - board/taskit/stamp9g20/Kconfig | 3 - configs/afeb9260_defconfig | 1 + configs/at91rm9200ek_defconfig | 1 + configs/at91rm9200ek_ram_defconfig | 1 + configs/at91sam9260ek_dataflash_cs0_defconfig | 1 + configs/at91sam9260ek_dataflash_cs1_defconfig | 1 + configs/at91sam9260ek_nandflash_defconfig | 1 + configs/at91sam9261ek_dataflash_cs0_defconfig | 1 + configs/at91sam9261ek_dataflash_cs3_defconfig | 1 + configs/at91sam9261ek_nandflash_defconfig | 1 + configs/at91sam9263ek_dataflash_cs0_defconfig | 1 + configs/at91sam9263ek_dataflash_defconfig | 1 + configs/at91sam9263ek_nandflash_defconfig | 1 + configs/at91sam9263ek_norflash_boot_defconfig | 1 + configs/at91sam9263ek_norflash_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 + configs/at91sam9g10ek_nandflash_defconfig | 1 + configs/at91sam9g20ek_2mmc_defconfig | 1 + configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 + configs/at91sam9g20ek_nandflash_defconfig | 1 + configs/at91sam9m10g45ek_mmc_defconfig | 1 + configs/at91sam9m10g45ek_nandflash_defconfig | 1 + configs/at91sam9n12ek_mmc_defconfig | 1 + configs/at91sam9n12ek_nandflash_defconfig | 1 + configs/at91sam9n12ek_spiflash_defconfig | 1 + configs/at91sam9rlek_dataflash_defconfig | 1 + configs/at91sam9rlek_nandflash_defconfig | 1 + configs/at91sam9x5ek_dataflash_defconfig | 1 + configs/at91sam9x5ek_mmc_defconfig | 1 + configs/at91sam9x5ek_nandflash_defconfig | 1 + configs/at91sam9x5ek_spiflash_defconfig | 1 + configs/at91sam9xeek_dataflash_cs0_defconfig | 1 + configs/at91sam9xeek_dataflash_cs1_defconfig | 1 + configs/at91sam9xeek_nandflash_defconfig | 1 + configs/axm_defconfig | 1 + configs/corvus_defconfig | 1 + configs/cpu9260_128M_defconfig | 1 + configs/cpu9260_defconfig | 1 + configs/cpu9260_nand_128M_defconfig | 1 + configs/cpu9260_nand_defconfig | 1 + configs/cpu9G20_128M_defconfig | 1 + configs/cpu9G20_defconfig | 1 + configs/cpu9G20_nand_128M_defconfig | 1 + configs/cpu9G20_nand_defconfig | 1 + configs/cpuat91_defconfig | 1 + configs/cpuat91_ram_defconfig | 1 + configs/eb_cpux9k2_defconfig | 1 + configs/eb_cpux9k2_ram_defconfig | 1 + configs/ethernut5_defconfig | 1 + configs/meesc_dataflash_defconfig | 1 + configs/meesc_defconfig | 1 + configs/otc570_dataflash_defconfig | 1 + configs/otc570_defconfig | 1 + configs/pm9261_defconfig | 1 + configs/pm9263_defconfig | 1 + configs/pm9g45_defconfig | 1 + configs/portuxg20_defconfig | 1 + configs/sama5d3_xplained_mmc_defconfig | 1 + configs/sama5d3_xplained_nandflash_defconfig | 1 + configs/sama5d3xek_mmc_defconfig | 1 + configs/sama5d3xek_nandflash_defconfig | 1 + configs/sama5d3xek_spiflash_defconfig | 1 + configs/sama5d4_xplained_mmc_defconfig | 1 + configs/sama5d4_xplained_nandflash_defconfig | 1 + configs/sama5d4_xplained_spiflash_defconfig | 1 + configs/sama5d4ek_mmc_defconfig | 1 + configs/sama5d4ek_nandflash_defconfig | 1 + configs/sama5d4ek_spiflash_defconfig | 1 + configs/sbc35_a9g20_eeprom_defconfig | 1 + configs/sbc35_a9g20_nandflash_defconfig | 1 + configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/stamp9g20_defconfig | 1 + configs/taurus_defconfig | 1 + configs/tny_a9260_eeprom_defconfig | 1 + configs/tny_a9260_nandflash_defconfig | 1 + configs/tny_a9g20_eeprom_defconfig | 1 + configs/tny_a9g20_nandflash_defconfig | 1 + configs/usb_a9263_dataflash_defconfig | 1 + configs/vl_ma2sc_defconfig | 1 + configs/vl_ma2sc_ram_defconfig | 1 + include/configs/km/km_arm.h | 2 +- include/configs/sama5d3_xplained.h | 2 +- include/configs/sama5d3xek.h | 2 +- scripts/Makefile.autoconf | 19 ++- 368 files changed, 359 insertions(+), 424 deletions(-) delete mode 100644 arch/arm/cpu/arm720t/tegra-common/Makefile delete mode 100644 arch/arm/cpu/arm720t/tegra114/Makefile delete mode 100644 arch/arm/cpu/arm720t/tegra124/Makefile delete mode 100644 arch/arm/cpu/arm720t/tegra20/Makefile delete mode 100644 arch/arm/cpu/arm720t/tegra30/Makefile delete mode 100644 arch/arm/cpu/arm926ejs/at91/config.mk delete mode 100644 arch/arm/cpu/armv7/at91/config.mk delete mode 100644 arch/arm/cpu/armv7/tegra-common/Makefile delete mode 100644 arch/arm/cpu/armv7/tegra20/Makefile create mode 100644 arch/arm/mach-at91/Kconfig rename arch/arm/{cpu/at91-common => mach-at91}/Makefile (58%) rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/Makefile (100%) rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/at91rm9200_devices.c (100%) rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/clock.c (100%) rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/cpu.c (100%) rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/lowlevel_init.S (100%) rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/reset.c (100%) rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/timer.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/Makefile (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9260_devices.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9261_devices.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9263_devices.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9m10g45_devices.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9n12_devices.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9rl_devices.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9x5_devices.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/clock.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/cpu.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/eflash.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/led.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/lowlevel_init.S (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/reset.c (100%) rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/timer.c (100%) rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/Makefile (100%) rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/clock.c (100%) rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/cpu.c (100%) rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/reset.c (100%) rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/sama5d3_devices.c (100%) rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/sama5d4_devices.c (100%) rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/timer.c (100%) create mode 100644 arch/arm/mach-at91/config.mk rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_common.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_dbu.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_eefc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_emac.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_gpbr.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_mc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pdc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pio.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pit.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pmc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_rstc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_rtt.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_spi.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_st.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_tc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_wdt.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91rm9200.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9260.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9260_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9261.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9261_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9263.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9263_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_sdramc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_smc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9g45.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9g45_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9rl.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9rl_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9x5.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9x5_matrix.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/atmel_mpddrc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/atmel_serial.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/atmel_usba_udc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/clk.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/hardware.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d3.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d3_smc.h (100%) rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d4.h (100%) rename arch/arm/{cpu/at91-common => mach-at91}/mpddrc.c (100%) rename arch/arm/{cpu/at91-common => mach-at91}/phy.c (100%) rename arch/arm/{cpu/at91-common => mach-at91}/sdram.c (100%) rename arch/arm/{cpu/at91-common => mach-at91}/spl.c (100%) rename arch/arm/{cpu/at91-common => mach-at91}/spl_at91.c (100%) rename arch/arm/{cpu/at91-common => mach-at91}/spl_atmel.c (100%) rename arch/arm/{cpu/at91-common => mach-at91}/u-boot-spl.lds (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/Kconfig (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/Makefile (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/config.mk (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/cpu.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da830_pinmux.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da850_lowlevel.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da850_pinmux.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm355.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm365.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm365_lowlevel.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm644x.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm646x.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dp83848.c (98%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/et1011c.c (94%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/aintc_defs.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/da850_lowlevel.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/da8xx-usb.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/davinci_misc.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/ddr2_defs.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/dm365_lowlevel.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/emac_defs.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/hardware.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/i2c_defs.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/pinmux_defs.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/pll_defs.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/psc_defs.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/sdmmc_defs.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/syscfg_defs.h (100%) rename arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/timer_defs.h (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/ksz8873.c (95%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/lowlevel_init.S (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/lxt972.c (97%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/misc.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/pinmux.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/psc.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/reset.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/spl.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/timer.c (100%) rename arch/arm/{cpu/armv7/highbank => mach-highbank}/Kconfig (100%) rename arch/arm/{cpu/armv7/highbank => mach-highbank}/Makefile (100%) rename arch/arm/{cpu/armv7/highbank => mach-highbank}/timer.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/Kconfig (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/Makefile (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2e.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2hk.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2l.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/clock.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_clock.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_ddr3.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_mon.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/ddr3.c (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/clock-k2e.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/clock-k2hk.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/clock-k2l.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/clock.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/clock_defs.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/ddr3.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/hardware-k2e.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/hardware-k2hk.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/hardware-k2l.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/hardware.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/i2c_defs.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/mon.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/msmc.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/psc_defs.h (100%) rename arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/xhci-keystone.h (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/init.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/keystone.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/msmc.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/psc.c (100%) rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Kconfig (100%) rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Makefile (100%) rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cache.c (100%) rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cpu.c (100%) rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/config.h (100%) rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/cpu.h (100%) rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/kw88f6192.h (100%) rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/kw88f6281.h (100%) rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/mpp.h (100%) rename arch/arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/soc.h (100%) rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/mpp.c (100%) rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/Kconfig (100%) rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/Makefile (100%) rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/gpio.c (100%) rename arch/arm/{include/asm/arch-nomadik => mach-nomadik/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-nomadik => mach-nomadik/include/mach}/mtu.h (100%) rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/reset.S (100%) rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/timer.c (100%) rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/Kconfig (100%) rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/Makefile (100%) rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/cpu.c (100%) rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/dram.c (100%) rename arch/arm/{include/asm/arch-orion5x => mach-orion5x/include/mach}/cpu.h (100%) rename arch/arm/{include/asm/arch-orion5x => mach-orion5x/include/mach}/mv88f5182.h (100%) rename arch/arm/{include/asm/arch-orion5x => mach-orion5x/include/mach}/orion5x.h (100%) rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/lowlevel_init.S (100%) rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/timer.c (100%) rename arch/arm/{cpu/armv7/tegra-common => mach-tegra}/Kconfig (76%) rename arch/arm/{cpu/tegra-common => mach-tegra}/Makefile (61%) rename arch/arm/{cpu/tegra-common => mach-tegra}/ap.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/board.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/cache.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/clock.c (100%) rename arch/arm/{cpu/armv7/tegra-common => mach-tegra}/cmd_enterrcm.c (100%) rename arch/arm/{cpu/arm720t/tegra-common => mach-tegra}/cpu.c (100%) rename arch/arm/{cpu/arm720t/tegra-common => mach-tegra}/cpu.h (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/lowlevel_init.S (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/pinmux-common.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/powergate.c (100%) rename arch/arm/{cpu/arm720t/tegra-common => mach-tegra}/spl.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/sys_info.c (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra114/Kconfig (100%) rename arch/arm/{cpu/tegra114-common => mach-tegra/tegra114}/Makefile (89%) rename arch/arm/{cpu/tegra114-common => mach-tegra/tegra114}/clock.c (100%) rename arch/arm/{cpu/arm720t => mach-tegra}/tegra114/cpu.c (99%) rename arch/arm/{cpu/tegra114-common => mach-tegra/tegra114}/funcmux.c (100%) rename arch/arm/{cpu/tegra114-common => mach-tegra/tegra114}/pinmux.c (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra124/Kconfig (100%) rename arch/arm/{cpu/tegra124-common => mach-tegra/tegra124}/Makefile (84%) rename arch/arm/{cpu/tegra124-common => mach-tegra/tegra124}/clock.c (100%) rename arch/arm/{cpu/arm720t => mach-tegra}/tegra124/cpu.c (99%) rename arch/arm/{cpu/tegra124-common => mach-tegra/tegra124}/funcmux.c (100%) rename arch/arm/{cpu/tegra124-common => mach-tegra/tegra124}/pinmux.c (100%) rename arch/arm/{cpu/tegra124-common => mach-tegra/tegra124}/xusb-padctl.c (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra20/Kconfig (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/Makefile (77%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/clock.c (100%) rename arch/arm/{cpu/arm720t => mach-tegra}/tegra20/cpu.c (98%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/crypto.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/crypto.h (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra20/display.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/emc.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/funcmux.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/pinmux.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/pmu.c (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra20/pwm.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/warmboot.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/warmboot_avp.c (100%) rename arch/arm/{cpu/tegra20-common => mach-tegra/tegra20}/warmboot_avp.h (100%) rename arch/arm/{cpu/armv7 => mach-tegra}/tegra30/Kconfig (100%) rename arch/arm/{cpu/tegra30-common => mach-tegra/tegra30}/Makefile (89%) rename arch/arm/{cpu/tegra30-common => mach-tegra/tegra30}/clock.c (100%) rename arch/arm/{cpu/arm720t => mach-tegra}/tegra30/cpu.c (99%) rename arch/arm/{cpu/tegra30-common => mach-tegra/tegra30}/funcmux.c (100%) rename arch/arm/{cpu/tegra30-common => mach-tegra/tegra30}/pinmux.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/vpr.c (100%) rename arch/arm/{cpu/tegra-common => mach-tegra}/xusb-padctl.c (100%) rename arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/Kconfig (100%) rename arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/Makefile (100%) rename arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/reset.S (100%) rename arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/timer.c (100%)