ARM: start to move SoC code into arch/arm/mach-*
Subsystems (13)
v3 cover ARM: start to move SoC code into arch/arm/mach-*
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
.../include/mach}/sama5_matrix.h | 0
.../include/mach}/sama5_sfr.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 ++-
370 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}/sama5_matrix.h (100%)
rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5_sfr.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%)Signature · 1 line
1.9.1
PATCH v3 1/19 ARM: at91: move board select menu and common settings
The board select menu in arch/arm/Kconfig is still big. To slim down it, this commit moves AT91 boards to arch/arm/mach-at91/Kconfig.
Also, consolidate "config SYS_SOC" in each board Kconfig.
The Kconfig files under board/ directory were modified with the following command:
find board -name Kconfig | xargs sed -i -e '
/config SYS_SOC/ {
N
/default "at91"/ {
N
d
}
}
'---
Changes in v3: None
arch/arm/Kconfig | 159 +---------------------- arch/arm/mach-at91/Kconfig | 168 +++++++++++++++++++++++++ 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 + 115 files changed, 255 insertions(+), 245 deletions(-) create mode 100644 arch/arm/mach-at91/Kconfig
arch/arm/Kconfig +4 -155
@@ -77,17 +77,8 @@ config TARGET_A320EVB bool "Support a320evb" select CPU_ARM920T -config TARGET_AT91RM9200EK - bool "Support at91rm9200ek" - select CPU_ARM920T - -config TARGET_EB_CPUX9K2 - bool "Support eb_cpux9k2" - select CPU_ARM920T - -config TARGET_CPUAT91 - bool "Support cpuat91" - select CPU_ARM920T +config ARCH_AT91 + bool "Atmel AT91" config TARGET_EDB93XX bool "Support edb93xx"
@@ -129,100 +120,6 @@ config TARGET_GPLUGD bool "Support gplugd" select CPU_ARM926EJS -config TARGET_AFEB9260 - bool "Support afeb9260" - select CPU_ARM926EJS - -config TARGET_AT91SAM9260EK - bool "Support at91sam9260ek" - select CPU_ARM926EJS - -config TARGET_AT91SAM9261EK - bool "Support at91sam9261ek" - select CPU_ARM926EJS - -config TARGET_AT91SAM9263EK - bool "Support at91sam9263ek" - select CPU_ARM926EJS - -config TARGET_AT91SAM9M10G45EK - bool "Support at91sam9m10g45ek" - select CPU_ARM926EJS - -config TARGET_AT91SAM9N12EK - bool "Support at91sam9n12ek" - select CPU_ARM926EJS - -config TARGET_AT91SAM9RLEK - bool "Support at91sam9rlek" - select CPU_ARM926EJS - -config TARGET_AT91SAM9X5EK - bool "Support at91sam9x5ek" - select CPU_ARM926EJS - -config TARGET_SNAPPER9260 - bool "Support snapper9260" - select CPU_ARM926EJS - -config TARGET_VL_MA2SC - bool "Support vl_ma2sc" - select CPU_ARM926EJS - -config TARGET_SBC35_A9G20 - bool "Support sbc35_a9g20" - select CPU_ARM926EJS - -config TARGET_TNY_A9260 - bool "Support tny_a9260" - select CPU_ARM926EJS - -config TARGET_USB_A9263 - bool "Support usb_a9263" - select CPU_ARM926EJS - -config TARGET_ETHERNUT5 - bool "Support ethernut5" - select CPU_ARM926EJS - -config TARGET_MEESC - bool "Support meesc" - select CPU_ARM926EJS - -config TARGET_OTC570 - bool "Support otc570" - select CPU_ARM926EJS - -config TARGET_CPU9260 - bool "Support cpu9260" - select CPU_ARM926EJS - -config TARGET_PM9261 - bool "Support pm9261" - select CPU_ARM926EJS - -config TARGET_PM9263 - bool "Support pm9263" - select CPU_ARM926EJS - -config TARGET_PM9G45 - bool "Support pm9g45" - select CPU_ARM926EJS - -config TARGET_CORVUS - select SUPPORT_SPL - bool "Support corvus" - select CPU_ARM926EJS - -config TARGET_TAURUS - select SUPPORT_SPL - bool "Support taurus" - select CPU_ARM926EJS - -config TARGET_STAMP9G20 - bool "Support stamp9g20" - select CPU_ARM926EJS - config ARCH_DAVINCI bool "TI DaVinci" select CPU_ARM926EJS
@@ -514,26 +411,6 @@ config TARGET_TI816X_EVM select CPU_V7 select SUPPORT_SPL -config TARGET_SAMA5D3_XPLAINED - bool "Support sama5d3_xplained" - select CPU_V7 - select SUPPORT_SPL - -config TARGET_SAMA5D3XEK - bool "Support sama5d3xek" - select CPU_V7 - select SUPPORT_SPL - -config TARGET_SAMA5D4_XPLAINED - bool "Support sama5d4_xplained" - select CPU_V7 - select SUPPORT_SPL - -config TARGET_SAMA5D4EK - bool "Support sama5d4ek" - select CPU_V7 - select SUPPORT_SPL - config TARGET_BCM28155_AP bool "Support bcm28155_ap" select CPU_V7
@@ -837,6 +714,8 @@ config ARCH_UNIPHIER endchoice +source "arch/arm/mach-at91/Kconfig" + source "arch/arm/cpu/arm926ejs/davinci/Kconfig" source "arch/arm/cpu/arm1176/bcm2835/Kconfig"
@@ -876,44 +755,25 @@ source "arch/arm/cpu/armv7/Kconfig" source "board/aristainetos/Kconfig" source "board/BuR/kwb/Kconfig" source "board/BuR/tseries/Kconfig" -source "board/BuS/eb_cpux9k2/Kconfig" -source "board/BuS/vl_ma2sc/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" source "board/Marvell/db-mv784mp-gp/Kconfig" source "board/Marvell/dkb/Kconfig" source "board/Marvell/gplugd/Kconfig" -source "board/afeb9260/Kconfig" source "board/altera/socfpga/Kconfig" source "board/armadeus/apf27/Kconfig" source "board/armltd/integrator/Kconfig" source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress64/Kconfig" -source "board/atmel/at91rm9200ek/Kconfig" -source "board/atmel/at91sam9260ek/Kconfig" -source "board/atmel/at91sam9261ek/Kconfig" -source "board/atmel/at91sam9263ek/Kconfig" -source "board/atmel/at91sam9m10g45ek/Kconfig" -source "board/atmel/at91sam9n12ek/Kconfig" -source "board/atmel/at91sam9rlek/Kconfig" -source "board/atmel/at91sam9x5ek/Kconfig" -source "board/atmel/sama5d3_xplained/Kconfig" -source "board/atmel/sama5d3xek/Kconfig" -source "board/atmel/sama5d4_xplained/Kconfig" -source "board/atmel/sama5d4ek/Kconfig" source "board/bachmann/ot1200/Kconfig" source "board/balloon3/Kconfig" source "board/barco/platinum/Kconfig" source "board/barco/titanium/Kconfig" source "board/bluegiga/apx4devkit/Kconfig" -source "board/bluewater/snapper9260/Kconfig" source "board/boundary/nitrogen6x/Kconfig" source "board/broadcom/bcm28155_ap/Kconfig" source "board/broadcom/bcmcygnus/Kconfig" source "board/broadcom/bcmnsp/Kconfig" -source "board/calao/sbc35_a9g20/Kconfig" -source "board/calao/tny_a9260/Kconfig" -source "board/calao/usb_a9263/Kconfig" source "board/cirrus/edb93xx/Kconfig" source "board/cm4008/Kconfig" source "board/cm41xx/Kconfig"
@@ -924,13 +784,8 @@ source "board/creative/xfi3/Kconfig" source "board/davedenx/qong/Kconfig" source "board/denx/m28evk/Kconfig" source "board/denx/m53evk/Kconfig" -source "board/egnite/ethernut5/Kconfig" source "board/embest/mx6boards/Kconfig" -source "board/esd/meesc/Kconfig" -source "board/esd/otc570/Kconfig" source "board/esg/ima3-mx53/Kconfig" -source "board/eukrea/cpu9260/Kconfig" -source "board/eukrea/cpuat91/Kconfig" source "board/faraday/a320evb/Kconfig" source "board/freescale/ls2085a/Kconfig" source "board/freescale/ls1021aqds/Kconfig"
@@ -975,18 +830,13 @@ source "board/phytec/pcm051/Kconfig" source "board/ppcag/bg0900/Kconfig" source "board/pxa255_idp/Kconfig" source "board/raspberrypi/rpi/Kconfig" -source "board/ronetix/pm9261/Kconfig" -source "board/ronetix/pm9263/Kconfig" -source "board/ronetix/pm9g45/Kconfig" source "board/samsung/smdk2410/Kconfig" source "board/sandisk/sansa_fuze_plus/Kconfig" source "board/scb9328/Kconfig" source "board/schulercontrol/sc_sps_1/Kconfig" -source "board/siemens/corvus/Kconfig" source "board/siemens/draco/Kconfig" source "board/siemens/pxm2/Kconfig" source "board/siemens/rut/Kconfig" -source "board/siemens/taurus/Kconfig" source "board/silica/pengwyn/Kconfig" source "board/solidrun/hummingboard/Kconfig" source "board/spear/spear300/Kconfig"
@@ -1000,7 +850,6 @@ source "board/st/stv0991/Kconfig" source "board/sunxi/Kconfig" source "board/syteco/jadecpu/Kconfig" source "board/syteco/zmx25/Kconfig" -source "board/taskit/stamp9g20/Kconfig" source "board/tbs/tbs2910/Kconfig" source "board/ti/am335x/Kconfig" source "board/ti/am43xx/Kconfig"
arch/arm/mach-at91/Kconfig new file +168 -0
168 lines not on this page · raw message
board/BuS/eb_cpux9k2/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "BuS" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "eb_cpux9k2"
board/BuS/vl_ma2sc/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "BuS" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "vl_ma2sc"
board/afeb9260/Kconfig +0 -3
@@ -3,9 +3,6 @@ if TARGET_AFEB9260 config SYS_BOARD default "afeb9260" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "afeb9260"
board/atmel/at91rm9200ek/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91rm9200ek"
board/atmel/at91sam9260ek/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9260ek"
board/atmel/at91sam9261ek/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9261ek"
board/atmel/at91sam9263ek/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9263ek"
board/atmel/at91sam9m10g45ek/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9m10g45ek"
board/atmel/at91sam9n12ek/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9n12ek"
board/atmel/at91sam9rlek/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9rlek"
board/atmel/at91sam9x5ek/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9x5ek"
board/atmel/sama5d3_xplained/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "sama5d3_xplained"
board/atmel/sama5d3xek/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "sama5d3xek"
board/atmel/sama5d4_xplained/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "sama5d4_xplained"
board/atmel/sama5d4ek/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "sama5d4ek"
board/bluewater/snapper9260/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "bluewater" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "snapper9260"
board/calao/sbc35_a9g20/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "calao" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "sbc35_a9g20"
board/calao/tny_a9260/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "calao" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "tny_a9260"
board/calao/usb_a9263/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "calao" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "usb_a9263"
board/egnite/ethernut5/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "egnite" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "ethernut5"
board/esd/meesc/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "esd" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "meesc"
board/esd/otc570/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "esd" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "otc570"
board/eukrea/cpu9260/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "eukrea" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "cpu9260"
board/eukrea/cpuat91/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "eukrea" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "cpuat91"
board/ronetix/pm9261/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "ronetix" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "pm9261"
board/ronetix/pm9263/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "ronetix" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "pm9263"
board/ronetix/pm9g45/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "ronetix" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "pm9g45"
board/siemens/corvus/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "siemens" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "corvus"
board/siemens/taurus/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "siemens" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "taurus"
board/taskit/stamp9g20/Kconfig +0 -3
@@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "taskit" -config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "stamp9g20"
configs/afeb9260_defconfig +1 -0
@@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AFEB9260=y
configs/at91rm9200ek_defconfig +1 -0
@@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91RM9200EK=y
configs/at91rm9200ek_ram_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91RM9200EK=y
configs/at91sam9260ek_dataflash_cs0_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9260ek_dataflash_cs1_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9260ek_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9261ek_dataflash_cs0_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y
configs/at91sam9261ek_dataflash_cs3_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y
configs/at91sam9261ek_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y
configs/at91sam9263ek_dataflash_cs0_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9263EK=y
configs/at91sam9263ek_dataflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9263EK=y
configs/at91sam9263ek_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9263EK=y
configs/at91sam9263ek_norflash_boot_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9263EK=y
configs/at91sam9263ek_norflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9263EK=y
configs/at91sam9g10ek_dataflash_cs0_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y
configs/at91sam9g10ek_dataflash_cs3_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y
configs/at91sam9g10ek_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y
configs/at91sam9g20ek_2mmc_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9g20ek_2mmc_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9g20ek_dataflash_cs0_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9g20ek_dataflash_cs1_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9g20ek_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9m10g45ek_mmc_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9M10G45EK=y
configs/at91sam9m10g45ek_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9M10G45EK=y
configs/at91sam9n12ek_mmc_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9N12EK=y
configs/at91sam9n12ek_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9N12EK=y
configs/at91sam9n12ek_spiflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9N12EK=y
configs/at91sam9rlek_dataflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9RLEK=y
configs/at91sam9rlek_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9RLEK=y
configs/at91sam9x5ek_dataflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9X5EK=y
configs/at91sam9x5ek_mmc_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9X5EK=y
configs/at91sam9x5ek_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9X5EK=y
configs/at91sam9x5ek_spiflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9X5EK=y
configs/at91sam9xeek_dataflash_cs0_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9xeek_dataflash_cs1_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/at91sam9xeek_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y
configs/axm_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068,BOARD_AXM" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_TAURUS=y
configs/corvus_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_CORVUS=y
configs/cpu9260_128M_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y
configs/cpu9260_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y
configs/cpu9260_nand_128M_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M,NANDBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y
configs/cpu9260_nand_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,NANDBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y
configs/cpu9G20_128M_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y
configs/cpu9G20_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y
configs/cpu9G20_nand_128M_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M,NANDBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y
configs/cpu9G20_nand_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,NANDBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y
configs/cpuat91_defconfig +1 -0
@@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPUAT91=y
configs/cpuat91_ram_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPUAT91=y
configs/eb_cpux9k2_defconfig +1 -0
@@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_EB_CPUX9K2=y
configs/eb_cpux9k2_ram_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_EB_CPUX9K2=y
configs/ethernut5_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_ETHERNUT5=y
configs/meesc_dataflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_MEESC=y
configs/meesc_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_MEESC=y
configs/otc570_dataflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_OTC570=y
configs/otc570_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_OTC570=y
configs/pm9261_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_PM9261=y
configs/pm9263_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_PM9263=y
configs/pm9g45_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_PM9G45=y
configs/portuxg20_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,PORTUXG20" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_STAMP9G20=y
configs/sama5d3_xplained_mmc_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D3_XPLAINED=y
configs/sama5d3_xplained_nandflash_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D3_XPLAINED=y
configs/sama5d3xek_mmc_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_MMC" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D3XEK=y
configs/sama5d3xek_nandflash_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_NANDFLASH" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D3XEK=y
configs/sama5d3xek_spiflash_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D3,SYS_USE_SERIALFLASH" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D3XEK=y
configs/sama5d4_xplained_mmc_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D4_XPLAINED=y
configs/sama5d4_xplained_nandflash_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D4_XPLAINED=y
configs/sama5d4_xplained_spiflash_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D4_XPLAINED=y
configs/sama5d4ek_mmc_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_MMC" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D4EK=y
configs/sama5d4ek_nandflash_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_NANDFLASH" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D4EK=y
configs/sama5d4ek_spiflash_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_SAMA5D4EK=y
configs/sbc35_a9g20_eeprom_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_EEPROM" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_SBC35_A9G20=y
configs/sbc35_a9g20_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_SBC35_A9G20=y
configs/snapper9260_defconfig +1 -0
@@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_SNAPPER9260=y CONFIG_DM=y CONFIG_DM_GPIO=y
configs/snapper9g20_defconfig +1 -0
@@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_SNAPPER9260=y CONFIG_DM=y CONFIG_DM_GPIO=y
configs/stamp9g20_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_STAMP9G20=y
configs/taurus_defconfig +1 -0
@@ -1,4 +1,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067,BOARD_TAURUS" +S:CONFIG_ARM=y ++S:CONFIG_ARCH_AT91=y +S:CONFIG_TARGET_TAURUS=y
configs/tny_a9260_eeprom_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_EEPROM" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_TNY_A9260=y
configs/tny_a9260_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_TNY_A9260=y
configs/tny_a9g20_eeprom_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_EEPROM" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_TNY_A9260=y
configs/tny_a9g20_nandflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_TNY_A9260=y
configs/usb_a9263_dataflash_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_USB_A9263=y
configs/vl_ma2sc_defconfig +1 -0
@@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_VL_MA2SC=y
configs/vl_ma2sc_ram_defconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMLOAD" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_VL_MA2SC=y
Signature · 1 line
1.9.1
PATCH v3 1/19 ARM: at91: move board select menu and common settings
Quoted 18 lines · Masahiro Yamada
The board select menu in
arch/arm/Kconfigis still big. To slim down it, this commit moves AT91 boards toarch/arm/mach-at91/Kconfig.
Also, consolidate "configSYS_SOC" in each boardKconfig.The
Kconfigfiles under board/ directory were modified with the following command:find board -name Kconfig | xargs sed -i -e ' /config SYS_SOC/ { N /default "at91"/ { N d } } '
Quoted 2 lines
Signed-off-by Masahiro Yamada <[email protected]>Acked-by Andreas Bie?mann <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 2/19 ARM: prepare for moving SoC sources into mach-*
In reply to Masahiro YamadaIn U-boot, the directory structure, arch/$(ARCH)/cpu/$(CPU)/$(SOC)/ has been adopted except that $(CPU) is missing from some architectures and $(SOC) is missing from some CPUs.
This structure did not fit very well in some cases.
[1] AT91
AT91 SoC family have been developed across some ARM processor generations. Generally speaking, some IPs are often re-used in the same SoC family (same SoC vendor) even when the main processor is updated. As a result, a SoC-common directory is needed in the upper level. Currently, AT91 source files are placed as follows:
arch/arm/cpu/arm920t/at91/*
arch/arm/cpu/arm926ejs/at91/*
arch/arm/cpu/armv7/at91/*
arch/arm/cpu/at91-common/*
Once directories are split, the motivation for refactorings across CPU directories is lost. Some files in arm920t/at91/ and arm926ejs/at91/ are so similar that they could be merged.
[2] Tegra
Tegra is a little bit special case where different CPUs are used for SPL and the main U-boot. To obey the arch/$(ARCH)/cpu/$(CPU)/$(SOC) structure, the source files must be placed across the CPUs, again SoC-common directory is necessary in the upper level.
Moreover, there are several families in Tegra: Tegra20, Tegra30, Tegra114, Tegra124. Here again, the tegra-common directory is needed to contain commonly-used files.
Tegra directories have been sprinkled in the directory structure.
arch/arm/cpu/arm720t/tegra20
arch/arm/cpu/arm720t/tegra30
arch/arm/cpu/arm720t/tegra114
arch/arm/cpu/arm720t/tegra124
arch/arm/cpu/arm720t/tegra-common
arch/arm/cpu/armv7/tegra20
arch/arm/cpu/armv7/tegra30
arch/arm/cpu/armv7/tegra114
arch/arm/cpu/armv7/tegra124
arch/arm/cpu/armv7/tegra-common
arch/arm/cpu/tegra20-common
arch/arm/cpu/tegra30-common
arch/arm/cpu/tegra114-common
arch/arm/cpu/tegra124-common
arch/arm/cpu/tegra-common
As you see, splitting SoC code by the CPU is not going well, especially for ARM.
Why don't we collect SoC-specific files into a single place?
A good example we can follow is Linux's arch/arm/mach-* structure.
This item was discussed in the following thread:
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/188548/
Looks like I got some positive responses and we are almost ready to start this movement.
This commit prepares arch/arm/Makefile for describing machdirs in it.
After this commit, we can move SoC directory to arch/arm/mach-$(SOC) in simple steps although some cases such as AT91 and Tegra need more fixes.
What we generally have to do is:
[1] Move files arch/arm/cpu/$(CPU)/$(SOC)/* to arch/arm/mach-$(SOC)/*
[2] Add machine entry into arch/arm/Makefile
[3] Remove "obj-y += $(SOC)" from arch/arm/cpu/$(CPU)/Makefile
[4] Fix the Kconfig file path in arch/arm/Kconfig
[5] Modify MAINTAINERS if necessary
---
Changes in v3: None
arch/arm/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/Makefile +10 -0
@@ -2,6 +2,13 @@ # SPDX-License-Identifier: GPL-2.0+ # +# Machine directory name. This list is sorted alphanumerically +# by CONFIG_* macro name. + +machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) + +libs-y += $(machdirs) + head-y := arch/arm/cpu/$(CPU)/start.o ifeq ($(CONFIG_SPL_BUILD),y)
@@ -27,3 +34,6 @@ endif ifneq (,$(filter $(SOC), armada-xp kirkwood)) libs-y += arch/arm/mvebu-common/ endif + +# deprecated +-include $(machdirs)/config.mk
Signature · 1 line
1.9.1
PATCH v3 2/19 ARM: prepare for moving SoC sources into mach-*
Quoted 72 lines · Masahiro Yamada
In U-boot, the directory structure, arch/$(ARCH)/cpu/$(CPU)/$(SOC)/ has been adopted except that $(CPU) is missing from some architectures and $(SOC) is missing from some CPUs.
This structure did not fit very well in some cases.
[1] AT91
AT91 SoC family have been developed across some ARM processor generations. Generally speaking, some IPs are often re-used in the same SoC family (same SoC vendor) even when the main processor is updated. As a result, a SoC-common directory is needed in the upper level. Currently, AT91 source files are placed as follows:
arch/arm/cpu/arm920t/at91/*
arch/arm/cpu/arm926ejs/at91/*
arch/arm/cpu/armv7/at91/*
arch/arm/cpu/at91-common/*Once directories are split, the motivation for refactorings across CPU directories is lost. Some files in arm920t/at91/ and arm926ejs/at91/ are so similar that they could be merged.
[2] Tegra
Tegra is a little bit special case where different CPUs are used for SPL and the main U-boot. To obey the arch/$(ARCH)/cpu/$(CPU)/$(SOC) structure, the source files must be placed across the CPUs, again SoC-common directory is necessary in the upper level.
Moreover, there are several families in Tegra: Tegra20, Tegra30, Tegra114, Tegra124. Here again, the tegra-common directory is needed to contain commonly-used files.
Tegra directories have been sprinkled in the directory structure.
arch/arm/cpu/arm720t/tegra20
arch/arm/cpu/arm720t/tegra30
arch/arm/cpu/arm720t/tegra114
arch/arm/cpu/arm720t/tegra124
arch/arm/cpu/arm720t/tegra-common
arch/arm/cpu/armv7/tegra20
arch/arm/cpu/armv7/tegra30
arch/arm/cpu/armv7/tegra114
arch/arm/cpu/armv7/tegra124
arch/arm/cpu/armv7/tegra-common
arch/arm/cpu/tegra20-common
arch/arm/cpu/tegra30-common
arch/arm/cpu/tegra114-common
arch/arm/cpu/tegra124-common
arch/arm/cpu/tegra-commonAs you see, splitting SoC code by the CPU is not going well, especially for ARM.
Why don't we collect SoC-specific files into a single place?A good example we can follow is Linux's
arch/arm/mach-*structure.This item was discussed in the following thread:
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/188548/Looks like I got some positive responses and we are almost ready to start this movement.
This commit prepares
arch/arm/Makefilefor describing machdirs in it.After this commit, we can move SoC directory to arch/arm/mach-$(SOC) in simple steps although some cases such as AT91 and Tegra need more fixes.
What we generally have to do is:
Quoted 7 lines
[1] Move files arch/arm/cpu/$(CPU)/$(SOC)/* to arch/arm/mach-$(SOC)/*
[2] Add machine entry intoarch/arm/Makefile
[3] Remove "obj-y += $(SOC)" from arch/arm/cpu/$(CPU)/Makefile
[4] Fix theKconfigfile path inarch/arm/Kconfig
[5] ModifyMAINTAINERSif necessarySigned-off-by Masahiro Yamada <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 3/19 ARM: at91: collect SoC sources into mach-at91
In reply to Masahiro YamadaThis commit moves source files as follows:
arch/arm/cpu/arm920t/at91/* -> arch/arm/mach-at91/arm920t/*
arch/arm/cpu/arm926ejs/at91/* -> arch/arm/mach-at91/arm926ejs/*
arch/arm/cpu/armv7/at91/* -> arch/arm/mach-at91/armv7/*
arch/arm/cpu/at91-common/* -> arch/arm/mach-at91/*
---
Changes in v3: None
MAINTAINERS | 3 +--
arch/arm/Makefile | 1 +
arch/arm/cpu/Makefile | 1 -
arch/arm/cpu/arm920t/Makefile | 1 -
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/cpu/arm926ejs/at91/config.mk | 2 --
arch/arm/cpu/armv7/Makefile | 1 -
arch/arm/cpu/armv7/at91/config.mk | 8 --------
arch/arm/{cpu/at91-common => mach-at91}/Makefile | 14 ++++----------
arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/Makefile | 0
.../at91 => mach-at91/arm920t}/at91rm9200_devices.c | 0
arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/clock.c | 0
arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/cpu.c | 0
.../arm920t/at91 => mach-at91/arm920t}/lowlevel_init.S | 0
arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/reset.c | 0
arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/timer.c | 0
.../{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/Makefile | 0
.../at91 => mach-at91/arm926ejs}/at91sam9260_devices.c | 0
.../at91 => mach-at91/arm926ejs}/at91sam9261_devices.c | 0
.../at91 => mach-at91/arm926ejs}/at91sam9263_devices.c | 0
.../at91 => mach-at91/arm926ejs}/at91sam9m10g45_devices.c | 0
.../at91 => mach-at91/arm926ejs}/at91sam9n12_devices.c | 0
.../at91 => mach-at91/arm926ejs}/at91sam9rl_devices.c | 0
.../at91 => mach-at91/arm926ejs}/at91sam9x5_devices.c | 0
.../{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/clock.c | 0
arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/cpu.c | 0
.../{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/eflash.c | 0
arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/led.c | 0
.../arm926ejs/at91 => mach-at91/arm926ejs}/lowlevel_init.S | 0
.../{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/reset.c | 0
.../{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/timer.c | 0
arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/Makefile | 0
arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/clock.c | 0
arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/cpu.c | 0
arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/reset.c | 0
.../{cpu/armv7/at91 => mach-at91/armv7}/sama5d3_devices.c | 0
.../{cpu/armv7/at91 => mach-at91/armv7}/sama5d4_devices.c | 0
arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/timer.c | 0
arch/arm/mach-at91/config.mk | 9 +++++++++
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
arch/arm/{cpu/at91-common => mach-at91}/spl_atmel.c | 0
arch/arm/{cpu/at91-common => mach-at91}/u-boot-spl.lds | 0
include/configs/sama5d3_xplained.h | 2 +-
include/configs/sama5d3xek.h | 2 +-
48 files changed, 17 insertions(+), 28 deletions(-)
delete mode 100644 arch/arm/cpu/arm926ejs/at91/config.mk
delete mode 100644 arch/arm/cpu/armv7/at91/config.mk
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/{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%)MAINTAINERS +1 -2
@@ -76,8 +76,7 @@ ARM ATMEL AT91 M: Andreas Bie?mann <[email protected]> S: Maintained T: git git://git.denx.de/u-boot-atmel.git -F: arch/arm/cpu/armv7/at91/ -F: arch/arm/cpu/at91-common/ +F: arch/arm/mach-at91/ F: arch/arm/include/asm/arch-at91/ ARM FREESCALE IMX
arch/arm/Makefile +1 -0
@@ -4,6 +4,7 @@ # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. +machine-$(CONFIG_ARCH_AT91) += at91 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
arch/arm/cpu/Makefile +0 -1
@@ -1,4 +1,3 @@ -obj-$(CONFIG_AT91FAMILY) += at91-common/ obj-$(CONFIG_TEGRA20) += tegra20-common/ obj-$(CONFIG_TEGRA30) += tegra30-common/ obj-$(CONFIG_TEGRA114) += tegra114-common/
arch/arm/cpu/arm920t/Makefile +0 -1
@@ -11,7 +11,6 @@ obj-y += cpu.o obj-$(CONFIG_USE_IRQ) += interrupts.o obj-$(if $(filter a320,$(SOC)),y) += a320/ -obj-$(CONFIG_AT91FAMILY) += at91/ obj-$(CONFIG_EP93XX) += ep93xx/ obj-$(CONFIG_IMX) += imx/ obj-$(CONFIG_KS8695) += ks8695/
arch/arm/cpu/arm926ejs/Makefile +0 -1
@@ -15,7 +15,6 @@ endif endif obj-$(CONFIG_ARMADA100) += armada100/ -obj-$(CONFIG_AT91FAMILY) += at91/ obj-$(CONFIG_ARCH_DAVINCI) += davinci/ obj-$(CONFIG_KIRKWOOD) += kirkwood/ obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
arch/arm/cpu/arm926ejs/at91/config.mk deleted +0 -2
@@ -1,2 +0,0 @@ -PF_CPPFLAGS_TUNE := $(call cc-option,-mtune=arm926ejs,) -PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_TUNE)
arch/arm/cpu/armv7/Makefile +0 -1
@@ -40,7 +40,6 @@ endif obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/ obj-$(if $(filter armada-xp,$(SOC)),y) += armada-xp/ -obj-$(CONFIG_AT91FAMILY) += at91/ obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/ obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/ obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
arch/arm/cpu/armv7/at91/config.mk deleted +0 -8
@@ -1,8 +0,0 @@ -# -# Copyright (C) 2014, Andreas Bie?mann <[email protected]> -# -# SPDX-License-Identifier: GPL-2.0+ -# -ifndef CONFIG_SPL_BUILD -ALL-y += u-boot.img -endif
arch/arm/mach-at91/Makefile renamed from arch/arm/cpu/at91-common/Makefile +4 -10
@@ -1,13 +1,3 @@ -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# (C) Copyright 2013 Atmel Corporation -# Bo Shen <[email protected]> -# -# SPDX-License-Identifier: GPL-2.0+ -# - obj-$(CONFIG_AT91_WANTS_COMMON_PHY) += phy.o ifneq ($(CONFIG_SPL_BUILD),) obj-$(CONFIG_AT91SAM9G20) += sdram.o spl_at91.o
@@ -16,3 +6,7 @@ obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o obj-y += spl.o endif + +obj-$(CONFIG_CPU_ARM920T) += arm920t/ +obj-$(CONFIG_CPU_ARM926EJS) += arm926ejs/ +obj-$(CONFIG_CPU_V7) += armv7/
arch/arm/mach-at91/arm920t/Makefile renamed from arch/arm/cpu/arm920t/at91/Makefile +0 -0
arch/arm/mach-at91/arm920t/at91rm9200_devices.c renamed from arch/arm/cpu/arm920t/at91/at91rm9200_devices.c +0 -0
arch/arm/mach-at91/arm920t/clock.c renamed from arch/arm/cpu/arm920t/at91/clock.c +0 -0
arch/arm/mach-at91/arm920t/cpu.c renamed from arch/arm/cpu/arm920t/at91/cpu.c +0 -0
arch/arm/mach-at91/arm920t/lowlevel_init.S renamed from arch/arm/cpu/arm920t/at91/lowlevel_init.S +0 -0
arch/arm/mach-at91/arm920t/reset.c renamed from arch/arm/cpu/arm920t/at91/reset.c +0 -0
arch/arm/mach-at91/arm920t/timer.c renamed from arch/arm/cpu/arm920t/at91/timer.c +0 -0
arch/arm/mach-at91/arm926ejs/Makefile renamed from arch/arm/cpu/arm926ejs/at91/Makefile +0 -0
arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c renamed from arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c +0 -0
arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c renamed from arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c +0 -0
arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c renamed from arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c +0 -0
arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c renamed from arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c +0 -0
arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c renamed from arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c +0 -0
arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c renamed from arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c +0 -0
arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c renamed from arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c +0 -0
arch/arm/mach-at91/arm926ejs/clock.c renamed from arch/arm/cpu/arm926ejs/at91/clock.c +0 -0
arch/arm/mach-at91/arm926ejs/cpu.c renamed from arch/arm/cpu/arm926ejs/at91/cpu.c +0 -0
arch/arm/mach-at91/arm926ejs/eflash.c renamed from arch/arm/cpu/arm926ejs/at91/eflash.c +0 -0
arch/arm/mach-at91/arm926ejs/led.c renamed from arch/arm/cpu/arm926ejs/at91/led.c +0 -0
arch/arm/mach-at91/arm926ejs/lowlevel_init.S renamed from arch/arm/cpu/arm926ejs/at91/lowlevel_init.S +0 -0
arch/arm/mach-at91/arm926ejs/reset.c renamed from arch/arm/cpu/arm926ejs/at91/reset.c +0 -0
arch/arm/mach-at91/arm926ejs/timer.c renamed from arch/arm/cpu/arm926ejs/at91/timer.c +0 -0
arch/arm/mach-at91/armv7/Makefile renamed from arch/arm/cpu/armv7/at91/Makefile +0 -0
arch/arm/mach-at91/armv7/clock.c renamed from arch/arm/cpu/armv7/at91/clock.c +0 -0
arch/arm/mach-at91/armv7/cpu.c renamed from arch/arm/cpu/armv7/at91/cpu.c +0 -0
arch/arm/mach-at91/armv7/reset.c renamed from arch/arm/cpu/armv7/at91/reset.c +0 -0
arch/arm/mach-at91/armv7/sama5d3_devices.c renamed from arch/arm/cpu/armv7/at91/sama5d3_devices.c +0 -0
arch/arm/mach-at91/armv7/sama5d4_devices.c renamed from arch/arm/cpu/armv7/at91/sama5d4_devices.c +0 -0
arch/arm/mach-at91/armv7/timer.c renamed from arch/arm/cpu/armv7/at91/timer.c +0 -0
arch/arm/mach-at91/config.mk new file +9 -0
@@ -0,0 +1,9 @@ +ifeq ($(CONFIG_CPU_ARM926EJS),y) +PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,) +endif + +ifeq ($(CONFIG_CPU_V7),y) +ifndef CONFIG_SPL_BUILD +ALL-y += u-boot.img +endif +endif
arch/arm/mach-at91/mpddrc.c renamed from arch/arm/cpu/at91-common/mpddrc.c +0 -0
arch/arm/mach-at91/phy.c renamed from arch/arm/cpu/at91-common/phy.c +0 -0
arch/arm/mach-at91/sdram.c renamed from arch/arm/cpu/at91-common/sdram.c +0 -0
arch/arm/mach-at91/spl.c renamed from arch/arm/cpu/at91-common/spl.c +0 -0
arch/arm/mach-at91/spl_at91.c renamed from arch/arm/cpu/at91-common/spl_at91.c +0 -0
arch/arm/mach-at91/spl_atmel.c renamed from arch/arm/cpu/at91-common/spl_atmel.c +0 -0
arch/arm/mach-at91/u-boot-spl.lds renamed from arch/arm/cpu/at91-common/u-boot-spl.lds +0 -0
include/configs/sama5d3_xplained.h +1 -1
@@ -227,7 +227,7 @@#define CONFIG_SYS_MONITOR_LEN (512 << 10)#ifdef CONFIG_SYS_USE_MMC -#define CONFIG_SPL_LDSCRIPT arch/arm/cpu/at91-common/u-boot-spl.lds +#define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/u-boot-spl.lds#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200
include/configs/sama5d3xek.h +1 -1
@@ -274,7 +274,7 @@#define CONFIG_SYS_MONITOR_LEN (512 << 10)#ifdef CONFIG_SYS_USE_MMC -#define CONFIG_SPL_LDSCRIPT arch/arm/cpu/at91-common/u-boot-spl.lds +#define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/u-boot-spl.lds#define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200
Signature · 1 line
1.9.1
PATCH v3 3/19 ARM: at91: collect SoC sources into mach-at91
Quoted 9 lines · Masahiro Yamada
This commit moves source files as follows:
arch/arm/cpu/arm920t/at91/*->arch/arm/mach-at91/arm920t/*
arch/arm/cpu/arm926ejs/at91/*->arch/arm/mach-at91/arm926ejs/*
arch/arm/cpu/armv7/at91/*->arch/arm/mach-at91/armv7/*
arch/arm/cpu/at91-common/*->arch/arm/mach-at91/*Signed-off-by Masahiro Yamada <[email protected]>Acked-by Andreas Bie?mann <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 4/19 ARM: tegra: collect SoC sources into mach-tegra
In reply to Masahiro YamadaThis commit moves files as follows:
arch/arm/cpu/arm720t/tegra20/* -> arch/arm/mach-tegra/tegra20/* arch/arm/cpu/arm720t/tegra30/* -> arch/arm/mach-tegra/tegra30/* arch/arm/cpu/arm720t/tegra114/* -> arch/arm/mach-tegra/tegra114/* arch/arm/cpu/arm720t/tegra124* -> arch/arm/mach-tegra/tegra124/* arch/arm/cpu/arm720t/tegra-common/* -> arch/arm/mach-tegra/* arch/arm/cpu/armv7/tegra20/* -> arch/arm/mach-tegra/tegra20/* arch/arm/cpu/armv7/tegra30/* -> arch/arm/mach-tegra/tegra30/* arch/arm/cpu/armv7/tegra114/* -> arch/arm/mach-tegra/tegra114/* arch/arm/cpu/armv7/tegra124/* -> arch/arm/mach-tegra/tegra124/* arch/arm/cpu/armv7/tegra-common/* -> arch/arm/mach-tegra/* arch/arm/cpu/tegra20-common/* -> arch/arm/mach-tegra/tegra20/* arch/arm/cpu/tegra30-common/* -> arch/arm/mach-tegra/tegra30/* arch/arm/cpu/tegra114-common/* -> arch/arm/mach-tegra/tegra114/* arch/arm/cpu/tegra124-common/* -> arch/arm/mach-tegra/tegra124/* arch/arm/cpu/tegra-common/* -> arch/arm/mach-tegra/*
---
Changes in v3: None
MAINTAINERS | 4 +---
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 2 ++
arch/arm/cpu/Makefile | 6 +-----
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/armv7/Makefile | 2 --
arch/arm/cpu/armv7/tegra-common/Makefile | 10 ----------
arch/arm/cpu/armv7/tegra20/Makefile | 11 -----------
.../{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
.../arm/{cpu/tegra-common => mach-tegra}/sys_info.c | 0
arch/arm/{cpu/armv7 => mach-tegra}/tegra114/Kconfig | 0
.../tegra114}/Makefile | 5 ++---
.../tegra114-common => mach-tegra/tegra114}/clock.c | 0
arch/arm/{cpu/arm720t => mach-tegra}/tegra114/cpu.c | 2 +-
.../tegra114}/funcmux.c | 0
.../tegra114}/pinmux.c | 0
arch/arm/{cpu/armv7 => mach-tegra}/tegra124/Kconfig | 0
.../tegra124}/Makefile | 2 ++
.../tegra124-common => mach-tegra/tegra124}/clock.c | 0
arch/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
.../arm/{cpu/armv7 => mach-tegra}/tegra20/display.c | 0
.../tegra20-common => mach-tegra/tegra20}/emc.c | 0
.../tegra20-common => mach-tegra/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-common => mach-tegra/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
63 files changed, 38 insertions(+), 125 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/armv7/tegra-common/Makefile
delete mode 100644 arch/arm/cpu/armv7/tegra20/Makefile
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%)MAINTAINERS +1 -3
@@ -146,9 +146,7 @@ ARM TEGRA M: Tom Warren <[email protected]> S: Maintained T: git git://git.denx.de/u-boot-tegra.git -F: arch/arm/cpu/arm720t/tegra*/ -F: arch/arm/cpu/armv7/tegra*/ -F: arch/arm/cpu/tegra*/ +F: arch/arm/mach-tegra/ F: arch/arm/include/asm/arch-tegra*/ ARM TI
arch/arm/Kconfig +1 -1
@@ -742,7 +742,7 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig" source "arch/arm/cpu/armv7/s5pc1xx/Kconfig" -source "arch/arm/cpu/armv7/tegra-common/Kconfig" +source "arch/arm/mach-tegra/Kconfig" source "arch/arm/cpu/armv7/uniphier/Kconfig"
arch/arm/Makefile +2 -0
@@ -5,6 +5,8 @@ # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 +# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA +machine-$(CONFIG_TEGRA) += tegra machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
arch/arm/cpu/Makefile +1 -5
@@ -1,5 +1 @@ -obj-$(CONFIG_TEGRA20) += tegra20-common/ -obj-$(CONFIG_TEGRA30) += tegra30-common/ -obj-$(CONFIG_TEGRA114) += tegra114-common/ -obj-$(CONFIG_TEGRA124) += tegra124-common/ -obj-$(CONFIG_TEGRA) += tegra-common/ +obj- += dummy.o
arch/arm/cpu/arm720t/Makefile +0 -6
@@ -7,9 +7,3 @@ extra-y = start.o obj-y = interrupts.o cpu.o - -obj-$(CONFIG_TEGRA) += tegra-common/ -obj-$(CONFIG_TEGRA20) += tegra20/ -obj-$(CONFIG_TEGRA30) += tegra30/ -obj-$(CONFIG_TEGRA114) += tegra114/ -obj-$(CONFIG_TEGRA124) += tegra124/
arch/arm/cpu/arm720t/tegra-common/Makefile deleted +0 -11
@@ -1,11 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_SPL_BUILD) += spl.o -obj-y += cpu.o
arch/arm/cpu/arm720t/tegra114/Makefile deleted +0 -21
@@ -1,21 +0,0 @@ -# -# Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -#obj-y += cpu.o t11x.o -obj-y += cpu.o
arch/arm/cpu/arm720t/tegra124/Makefile deleted +0 -8
@@ -1,8 +0,0 @@ -# -# (C) Copyright 2013-2014 -# NVIDIA Corporation <www.nvidia.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += cpu.o
arch/arm/cpu/arm720t/tegra20/Makefile deleted +0 -10
@@ -1,10 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += cpu.o
arch/arm/cpu/arm720t/tegra30/Makefile deleted +0 -20
@@ -1,20 +0,0 @@ -# -# Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -obj-y += cpu.o
arch/arm/cpu/armv7/Makefile +0 -2
@@ -32,7 +32,6 @@ obj-$(CONFIG_IPROC) += iproc-common/ obj-$(CONFIG_KONA) += kona-common/ obj-$(CONFIG_OMAP_COMMON) += omap-common/ obj-$(CONFIG_SYS_ARCH_TIMER) += arch_timer.o -obj-$(CONFIG_TEGRA) += tegra-common/ ifneq (,$(filter s5pc1xx exynos,$(SOC))) obj-y += s5p-common/
@@ -57,7 +56,6 @@ obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/ obj-$(CONFIG_SOCFPGA) += socfpga/ obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ -obj-$(CONFIG_TEGRA20) += tegra20/ obj-$(CONFIG_U8500) += u8500/ obj-$(CONFIG_ARCH_UNIPHIER) += uniphier/ obj-$(CONFIG_VF610) += vf610/
arch/arm/cpu/armv7/tegra-common/Makefile deleted +0 -10
@@ -1,10 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o
arch/arm/cpu/armv7/tegra20/Makefile deleted +0 -11
@@ -1,11 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_PWM_TEGRA) += pwm.o -obj-$(CONFIG_VIDEO_TEGRA) += display.o
arch/arm/mach-tegra/Kconfig renamed from arch/arm/cpu/armv7/tegra-common/Kconfig +4 -4
@@ -44,9 +44,9 @@ config DM_I2C config DM_GPIO default y if !SPL_BUILD -source "arch/arm/cpu/armv7/tegra20/Kconfig" -source "arch/arm/cpu/armv7/tegra30/Kconfig" -source "arch/arm/cpu/armv7/tegra114/Kconfig" -source "arch/arm/cpu/armv7/tegra124/Kconfig" +source "arch/arm/mach-tegra/tegra20/Kconfig" +source "arch/arm/mach-tegra/tegra30/Kconfig" +source "arch/arm/mach-tegra/tegra114/Kconfig" +source "arch/arm/mach-tegra/tegra124/Kconfig" endif
arch/arm/mach-tegra/Makefile renamed from arch/arm/cpu/tegra-common/Makefile +12 -0
@@ -7,6 +7,13 @@ # SPDX-License-Identifier: GPL-2.0+ # +ifdef CONFIG_SPL_BUILD +obj-y += spl.o +obj-y += cpu.o +else +obj-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o +endif + obj-y += ap.o obj-y += board.o obj-y += cache.o
@@ -17,3 +24,8 @@ obj-y += powergate.o obj-y += xusb-padctl.o obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o obj-$(CONFIG_TEGRA124) += vpr.o + +obj-$(CONFIG_TEGRA20) += tegra20/ +obj-$(CONFIG_TEGRA30) += tegra30/ +obj-$(CONFIG_TEGRA114) += tegra114/ +obj-$(CONFIG_TEGRA124) += tegra124/
arch/arm/mach-tegra/ap.c renamed from arch/arm/cpu/tegra-common/ap.c +0 -0
arch/arm/mach-tegra/board.c renamed from arch/arm/cpu/tegra-common/board.c +0 -0
arch/arm/mach-tegra/cache.c renamed from arch/arm/cpu/tegra-common/cache.c +0 -0
arch/arm/mach-tegra/clock.c renamed from arch/arm/cpu/tegra-common/clock.c +0 -0
arch/arm/mach-tegra/cmd_enterrcm.c renamed from arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c +0 -0
arch/arm/mach-tegra/cpu.c renamed from arch/arm/cpu/arm720t/tegra-common/cpu.c +0 -0
arch/arm/mach-tegra/cpu.h renamed from arch/arm/cpu/arm720t/tegra-common/cpu.h +0 -0
arch/arm/mach-tegra/lowlevel_init.S renamed from arch/arm/cpu/tegra-common/lowlevel_init.S +0 -0
arch/arm/mach-tegra/pinmux-common.c renamed from arch/arm/cpu/tegra-common/pinmux-common.c +0 -0
arch/arm/mach-tegra/powergate.c renamed from arch/arm/cpu/tegra-common/powergate.c +0 -0
arch/arm/mach-tegra/spl.c renamed from arch/arm/cpu/arm720t/tegra-common/spl.c +0 -0
arch/arm/mach-tegra/sys_info.c renamed from arch/arm/cpu/tegra-common/sys_info.c +0 -0
arch/arm/mach-tegra/tegra114/Kconfig renamed from arch/arm/cpu/armv7/tegra114/Kconfig +0 -0
arch/arm/mach-tegra/tegra114/Makefile renamed from arch/arm/cpu/tegra114-common/Makefile +2 -3
@@ -1,9 +1,6 @@ # # Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. # -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# # This program is free software; you can redistribute it and/or modify it # under the terms and conditions of the GNU General Public License, # version 2, as published by the Free Software Foundation.
@@ -17,4 +14,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +obj-$(CONFIG_SPL_BUILD) += cpu.o + obj-y += clock.o funcmux.o pinmux.o
arch/arm/mach-tegra/tegra114/clock.c renamed from arch/arm/cpu/tegra114-common/clock.c +0 -0
arch/arm/mach-tegra/tegra114/cpu.c renamed from arch/arm/cpu/arm720t/tegra114/cpu.c +1 -1
@@ -22,7 +22,7 @@#include <asm/arch/tegra.h> #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> -#include "../tegra-common/cpu.h" +#include "../cpu.h" /* Tegra114-specific CPU init code */ static void enable_cpu_power_rail (void )
arch/arm/mach-tegra/tegra114/funcmux.c renamed from arch/arm/cpu/tegra114-common/funcmux.c +0 -0
arch/arm/mach-tegra/tegra114/pinmux.c renamed from arch/arm/cpu/tegra114-common/pinmux.c +0 -0
arch/arm/mach-tegra/tegra124/Kconfig renamed from arch/arm/cpu/armv7/tegra124/Kconfig +0 -0
arch/arm/mach-tegra/tegra124/Makefile renamed from arch/arm/cpu/tegra124-common/Makefile +2 -0
@@ -5,6 +5,8 @@ # SPDX-License-Identifier: GPL-2.0+ # +obj-$(CONFIG_SPL_BUILD) += cpu.o + obj-y += clock.o obj-y += funcmux.o obj-y += pinmux.o
arch/arm/mach-tegra/tegra124/clock.c renamed from arch/arm/cpu/tegra124-common/clock.c +0 -0
arch/arm/mach-tegra/tegra124/cpu.c renamed from arch/arm/cpu/arm720t/tegra124/cpu.c +1 -1
@@ -15,7 +15,7 @@#include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/ap.h> -#include "../tegra-common/cpu.h" +#include "../cpu.h" /* Tegra124-specific CPU init code */
arch/arm/mach-tegra/tegra124/funcmux.c renamed from arch/arm/cpu/tegra124-common/funcmux.c +0 -0
arch/arm/mach-tegra/tegra124/pinmux.c renamed from arch/arm/cpu/tegra124-common/pinmux.c +0 -0
arch/arm/mach-tegra/tegra124/xusb-padctl.c renamed from arch/arm/cpu/tegra124-common/xusb-padctl.c +0 -0
arch/arm/mach-tegra/tegra20/Kconfig renamed from arch/arm/cpu/armv7/tegra20/Kconfig +0 -0
arch/arm/mach-tegra/tegra20/Makefile renamed from arch/arm/cpu/tegra20-common/Makefile +7 -3
@@ -1,12 +1,16 @@ # # (C) Copyright 2010,2011 Nvidia Corporation. # -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# # SPDX-License-Identifier: GPL-2.0+ # +ifdef CONFIG_SPL_BUILD +obj-y += cpu.o +else +obj-$(CONFIG_PWM_TEGRA) += pwm.o +obj-$(CONFIG_VIDEO_TEGRA) += display.o +endif + # The AVP is ARMv4T architecture so we must use special compiler # flags for any startup files it might use. CFLAGS_warmboot_avp.o += -march=armv4t
arch/arm/mach-tegra/tegra20/clock.c renamed from arch/arm/cpu/tegra20-common/clock.c +0 -0
arch/arm/mach-tegra/tegra20/cpu.c renamed from arch/arm/cpu/arm720t/tegra20/cpu.c +1 -1
@@ -18,7 +18,7 @@#include <asm/io.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/pmc.h> -#include "../tegra-common/cpu.h" +#include "../cpu.h" static void enable_cpu_power_rail (void ) {
arch/arm/mach-tegra/tegra20/crypto.c renamed from arch/arm/cpu/tegra20-common/crypto.c +0 -0
arch/arm/mach-tegra/tegra20/crypto.h renamed from arch/arm/cpu/tegra20-common/crypto.h +0 -0
arch/arm/mach-tegra/tegra20/display.c renamed from arch/arm/cpu/armv7/tegra20/display.c +0 -0
arch/arm/mach-tegra/tegra20/emc.c renamed from arch/arm/cpu/tegra20-common/emc.c +0 -0
arch/arm/mach-tegra/tegra20/funcmux.c renamed from arch/arm/cpu/tegra20-common/funcmux.c +0 -0
arch/arm/mach-tegra/tegra20/pinmux.c renamed from arch/arm/cpu/tegra20-common/pinmux.c +0 -0
arch/arm/mach-tegra/tegra20/pmu.c renamed from arch/arm/cpu/tegra20-common/pmu.c +0 -0
arch/arm/mach-tegra/tegra20/pwm.c renamed from arch/arm/cpu/armv7/tegra20/pwm.c +0 -0
arch/arm/mach-tegra/tegra20/warmboot.c renamed from arch/arm/cpu/tegra20-common/warmboot.c +0 -0
arch/arm/mach-tegra/tegra20/warmboot_avp.c renamed from arch/arm/cpu/tegra20-common/warmboot_avp.c +0 -0
arch/arm/mach-tegra/tegra20/warmboot_avp.h renamed from arch/arm/cpu/tegra20-common/warmboot_avp.h +0 -0
arch/arm/mach-tegra/tegra30/Kconfig renamed from arch/arm/cpu/armv7/tegra30/Kconfig +0 -0
arch/arm/mach-tegra/tegra30/Makefile renamed from arch/arm/cpu/tegra30-common/Makefile +2 -3
@@ -1,9 +1,6 @@ # # Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. # -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# # This program is free software; you can redistribute it and/or modify it # under the terms and conditions of the GNU General Public License, # version 2, as published by the Free Software Foundation.
@@ -17,4 +14,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +obj-$(CONFIG_SPL_BUILD) += cpu.o + obj-y += clock.o funcmux.o pinmux.o
arch/arm/mach-tegra/tegra30/clock.c renamed from arch/arm/cpu/tegra30-common/clock.c +0 -0
arch/arm/mach-tegra/tegra30/cpu.c renamed from arch/arm/cpu/arm720t/tegra30/cpu.c +1 -1
@@ -22,7 +22,7 @@#include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/tegra_i2c.h> -#include "../tegra-common/cpu.h" +#include "../cpu.h" /* Tegra30-specific CPU init code */ void tegra_i2c_ll_write_addr (uint addr,uint config)
arch/arm/mach-tegra/tegra30/funcmux.c renamed from arch/arm/cpu/tegra30-common/funcmux.c +0 -0
arch/arm/mach-tegra/tegra30/pinmux.c renamed from arch/arm/cpu/tegra30-common/pinmux.c +0 -0
arch/arm/mach-tegra/vpr.c renamed from arch/arm/cpu/tegra-common/vpr.c +0 -0
arch/arm/mach-tegra/xusb-padctl.c renamed from arch/arm/cpu/tegra-common/xusb-padctl.c +0 -0
Signature · 1 line
1.9.1
PATCH v3 4/19 ARM: tegra: collect SoC sources into mach-tegra
Quoted 18 lines · Masahiro Yamada
This commit moves files as follows:
arch/arm/cpu/arm720t/tegra20/* -> arch/arm/mach-tegra/tegra20/* arch/arm/cpu/arm720t/tegra30/* -> arch/arm/mach-tegra/tegra30/* arch/arm/cpu/arm720t/tegra114/* -> arch/arm/mach-tegra/tegra114/* arch/arm/cpu/arm720t/tegra124* -> arch/arm/mach-tegra/tegra124/* arch/arm/cpu/arm720t/tegra-common/* -> arch/arm/mach-tegra/* arch/arm/cpu/armv7/tegra20/* -> arch/arm/mach-tegra/tegra20/* arch/arm/cpu/armv7/tegra30/* -> arch/arm/mach-tegra/tegra30/* arch/arm/cpu/armv7/tegra114/* -> arch/arm/mach-tegra/tegra114/* arch/arm/cpu/armv7/tegra124/* -> arch/arm/mach-tegra/tegra124/* arch/arm/cpu/armv7/tegra-common/* -> arch/arm/mach-tegra/* arch/arm/cpu/tegra20-common/* -> arch/arm/mach-tegra/tegra20/* arch/arm/cpu/tegra30-common/* -> arch/arm/mach-tegra/tegra30/* arch/arm/cpu/tegra114-common/* -> arch/arm/mach-tegra/tegra114/* arch/arm/cpu/tegra124-common/* -> arch/arm/mach-tegra/tegra124/* arch/arm/cpu/tegra-common/* -> arch/arm/mach-tegra/*
Quoted 4 lines
Signed-off-by Masahiro Yamada <[email protected]>Cc Stephen Warren <[email protected]>Cc Tom Warren <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 5/19 ARM: davinci: move SoC sources to mach-davinci
In reply to Masahiro YamadaMovearch/arm/cpu/arm926ejs/davinci/* -> arch/arm/mach-davinci/*
---
Changes in v3: None
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 1 +
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/Kconfig | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/Makefile | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/config.mk | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/cpu.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da830_pinmux.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da850_lowlevel.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da850_pinmux.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm355.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm365.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm365_lowlevel.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm644x.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm646x.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dp83848.c | 2 +-
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/et1011c.c | 2 +-
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/ksz8873.c | 2 +-
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/lowlevel_init.S | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/lxt972.c | 2 +-
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/misc.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/pinmux.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/psc.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/reset.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/spl.c | 0
arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/timer.c | 0
26 files changed, 6 insertions(+), 6 deletions(-)
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/{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%)arch/arm/Kconfig +1 -1
@@ -716,7 +716,7 @@ endchoice source "arch/arm/mach-at91/Kconfig" -source "arch/arm/cpu/arm926ejs/davinci/Kconfig" +source "arch/arm/mach-davinci/Kconfig" source "arch/arm/cpu/arm1176/bcm2835/Kconfig"
arch/arm/Makefile +1 -0
@@ -5,6 +5,7 @@ # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 +machine-$(CONFIG_ARCH_DAVINCI) += davinci # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA machine-$(CONFIG_TEGRA) += tegra
arch/arm/cpu/arm926ejs/Makefile +0 -1
@@ -15,7 +15,6 @@ endif endif obj-$(CONFIG_ARMADA100) += armada100/ -obj-$(CONFIG_ARCH_DAVINCI) += davinci/ obj-$(CONFIG_KIRKWOOD) += kirkwood/ obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/ obj-$(CONFIG_MB86R0x) += mb86r0x/
arch/arm/mach-davinci/Kconfig renamed from arch/arm/cpu/arm926ejs/davinci/Kconfig +0 -0
arch/arm/mach-davinci/Makefile renamed from arch/arm/cpu/arm926ejs/davinci/Makefile +0 -0
arch/arm/mach-davinci/config.mk renamed from arch/arm/cpu/arm926ejs/davinci/config.mk +0 -0
arch/arm/mach-davinci/cpu.c renamed from arch/arm/cpu/arm926ejs/davinci/cpu.c +0 -0
arch/arm/mach-davinci/da830_pinmux.c renamed from arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c +0 -0
arch/arm/mach-davinci/da850_lowlevel.c renamed from arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c +0 -0
arch/arm/mach-davinci/da850_pinmux.c renamed from arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c +0 -0
arch/arm/mach-davinci/dm355.c renamed from arch/arm/cpu/arm926ejs/davinci/dm355.c +0 -0
arch/arm/mach-davinci/dm365.c renamed from arch/arm/cpu/arm926ejs/davinci/dm365.c +0 -0
arch/arm/mach-davinci/dm365_lowlevel.c renamed from arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c +0 -0
arch/arm/mach-davinci/dm644x.c renamed from arch/arm/cpu/arm926ejs/davinci/dm644x.c +0 -0
arch/arm/mach-davinci/dm646x.c renamed from arch/arm/cpu/arm926ejs/davinci/dm646x.c +0 -0
arch/arm/mach-davinci/dp83848.c renamed from arch/arm/cpu/arm926ejs/davinci/dp83848.c +1 -1
@@ -13,7 +13,7 @@#include <net.h> #include <dp83848.h> #include <asm/arch/emac_defs.h> -#include "../../../../../drivers/net/davinci_emac.h" +#include "../../../drivers/net/davinci_emac.h" #ifdef CONFIG_DRIVER_TI_EMAC
arch/arm/mach-davinci/et1011c.c renamed from arch/arm/cpu/arm926ejs/davinci/et1011c.c +1 -1
@@ -10,7 +10,7 @@#include <net.h> #include <miiphy.h> #include <asm/arch/emac_defs.h> -#include "../../../../../drivers/net/davinci_emac.h" +#include "../../../drivers/net/davinci_emac.h" #ifdef CONFIG_DRIVER_TI_EMAC
arch/arm/mach-davinci/ksz8873.c renamed from arch/arm/cpu/arm926ejs/davinci/ksz8873.c +1 -1
@@ -20,7 +20,7 @@#include <net.h> #include <asm/arch/emac_defs.h> #include <asm/io.h> -#include "../../../../../drivers/net/davinci_emac.h" +#include "../../../drivers/net/davinci_emac.h" int ksz8873_is_phy_connected (int phy_addr) {
arch/arm/mach-davinci/lowlevel_init.S renamed from arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S +0 -0
arch/arm/mach-davinci/lxt972.c renamed from arch/arm/cpu/arm926ejs/davinci/lxt972.c +1 -1
@@ -14,7 +14,7 @@#include <miiphy.h> #include <lxt971a.h> #include <asm/arch/emac_defs.h> -#include "../../../../../drivers/net/davinci_emac.h" +#include "../../../drivers/net/davinci_emac.h" #ifdef CONFIG_DRIVER_TI_EMAC
arch/arm/mach-davinci/misc.c renamed from arch/arm/cpu/arm926ejs/davinci/misc.c +0 -0
arch/arm/mach-davinci/pinmux.c renamed from arch/arm/cpu/arm926ejs/davinci/pinmux.c +0 -0
arch/arm/mach-davinci/psc.c renamed from arch/arm/cpu/arm926ejs/davinci/psc.c +0 -0
arch/arm/mach-davinci/reset.c renamed from arch/arm/cpu/arm926ejs/davinci/reset.c +0 -0
arch/arm/mach-davinci/spl.c renamed from arch/arm/cpu/arm926ejs/davinci/spl.c +0 -0
arch/arm/mach-davinci/timer.c renamed from arch/arm/cpu/arm926ejs/davinci/timer.c +0 -0
Signature · 1 line
1.9.1
PATCH v3 5/19 ARM: davinci: move SoC sources to mach-davinci
Quoted 5 lines · Masahiro Yamada
Move
arch/arm/cpu/arm926ejs/davinci/*->arch/arm/mach-davinci/*Signed-off-by Masahiro Yamada <[email protected]>Cc Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 6/19 ARM: kirkwood: move SOC sources to mach-kirkwood
In reply to Masahiro YamadaMovearch/arm/cpu/arm926ejs/kirkwood/* -> arch/arm/mach-kirkwood/*
Note:
Perhaps, can we merge arch/arm/mach-kirkwood and arch/arm/mvebu-common into arch/arm/mach-mvebu, like Linux?
---
Changes in v3: None
MAINTAINERS | 2 +-
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 2 ++
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Kconfig | 0
arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Makefile | 0
arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cache.c | 0
arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cpu.c | 0
arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/mpp.c | 0
9 files changed, 4 insertions(+), 3 deletions(-)
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/{cpu/arm926ejs/kirkwood => mach-kirkwood}/mpp.c (100%)MAINTAINERS +1 -1
@@ -99,7 +99,7 @@ M: Prafulla Wadaskar <[email protected]> M: Luka Perkov <[email protected]> S: Maintained T: git git://git.denx.de/u-boot-marvell.git -F: arch/arm/cpu/arm926ejs/kirkwood/ +F: arch/arm/mach-kirkwood/ F: arch/arm/include/asm/arch-kirkwood/ ARM MARVELL PXA
arch/arm/Kconfig +1 -1
@@ -726,7 +726,7 @@ source "arch/arm/cpu/armv7/highbank/Kconfig" source "arch/arm/cpu/armv7/keystone/Kconfig" -source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig" +source "arch/arm/mach-kirkwood/Kconfig" source "arch/arm/cpu/arm926ejs/nomadik/Kconfig"
arch/arm/Makefile +2 -0
@@ -6,6 +6,8 @@ # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_DAVINCI) += davinci +# TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD +machine-$(CONFIG_KIRKWOOD) += kirkwood # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA machine-$(CONFIG_TEGRA) += tegra
arch/arm/cpu/arm926ejs/Makefile +0 -1
@@ -15,7 +15,6 @@ endif endif obj-$(CONFIG_ARMADA100) += armada100/ -obj-$(CONFIG_KIRKWOOD) += kirkwood/ obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/ obj-$(CONFIG_MB86R0x) += mb86r0x/ obj-$(CONFIG_MX25) += mx25/
arch/arm/mach-kirkwood/Kconfig renamed from arch/arm/cpu/arm926ejs/kirkwood/Kconfig +0 -0
arch/arm/mach-kirkwood/Makefile renamed from arch/arm/cpu/arm926ejs/kirkwood/Makefile +0 -0
arch/arm/mach-kirkwood/cache.c renamed from arch/arm/cpu/arm926ejs/kirkwood/cache.c +0 -0
arch/arm/mach-kirkwood/cpu.c renamed from arch/arm/cpu/arm926ejs/kirkwood/cpu.c +0 -0
arch/arm/mach-kirkwood/mpp.c renamed from arch/arm/cpu/arm926ejs/kirkwood/mpp.c +0 -0
Signature · 1 line
1.9.1
PATCH v3 6/19 ARM: kirkwood: move SOC sources to mach-kirkwood
Quoted 11 lines · Masahiro Yamada
Move
arch/arm/cpu/arm926ejs/kirkwood/*->arch/arm/mach-kirkwood/*Note:
Perhaps, can we mergearch/arm/mach-kirkwoodandarch/arm/mvebu-commonintoarch/arm/mach-mvebu, like Linux?Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stefan Roese <[email protected]>Cc Prafulla Wadaskar <[email protected]>Cc Luka Perkov <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 7/19 ARM: nomadik: move SoC sources to mach-nomadik
In reply to Masahiro YamadaMovearch/arm/cpu/arm926ejs/nomadik/* -> arch/arm/mach-nomadik/*
---
Changes in v3: None
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 1 +
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/Kconfig | 0
arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/Makefile | 0
arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/gpio.c | 0
arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/reset.S | 0
arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/timer.c | 0
8 files changed, 2 insertions(+), 2 deletions(-)
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/{cpu/arm926ejs/nomadik => mach-nomadik}/reset.S (100%)
rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/timer.c (100%)arch/arm/Kconfig +1 -1
@@ -728,7 +728,7 @@ source "arch/arm/cpu/armv7/keystone/Kconfig" source "arch/arm/mach-kirkwood/Kconfig" -source "arch/arm/cpu/arm926ejs/nomadik/Kconfig" +source "arch/arm/mach-nomadik/Kconfig" source "arch/arm/cpu/armv7/omap3/Kconfig"
arch/arm/Makefile +1 -0
@@ -9,6 +9,7 @@ machine-$(CONFIG_ARCH_DAVINCI) += davinci # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD machine-$(CONFIG_KIRKWOOD) += kirkwood # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA +machine-$(CONFIG_ARCH_NOMADIK) += nomadik machine-$(CONFIG_TEGRA) += tegra machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
arch/arm/cpu/arm926ejs/Makefile +0 -1
@@ -20,7 +20,6 @@ obj-$(CONFIG_MB86R0x) += mb86r0x/ obj-$(CONFIG_MX25) += mx25/ obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ -obj-$(CONFIG_ARCH_NOMADIK) += nomadik/ obj-$(CONFIG_ORION5X) += orion5x/ obj-$(CONFIG_PANTHEON) += pantheon/ obj-$(if $(filter spear,$(SOC)),y) += spear/
arch/arm/mach-nomadik/Kconfig renamed from arch/arm/cpu/arm926ejs/nomadik/Kconfig +0 -0
arch/arm/mach-nomadik/Makefile renamed from arch/arm/cpu/arm926ejs/nomadik/Makefile +0 -0
arch/arm/mach-nomadik/gpio.c renamed from arch/arm/cpu/arm926ejs/nomadik/gpio.c +0 -0
arch/arm/mach-nomadik/reset.S renamed from arch/arm/cpu/arm926ejs/nomadik/reset.S +0 -0
arch/arm/mach-nomadik/timer.c renamed from arch/arm/cpu/arm926ejs/nomadik/timer.c +0 -0
Signature · 1 line
1.9.1
PATCH v3 7/19 ARM: nomadik: move SoC sources to mach-nomadik
Quoted 6 lines · Masahiro Yamada
Move
arch/arm/cpu/arm926ejs/nomadik/*->arch/arm/mach-nomadik/*Signed-off-by Masahiro Yamada <[email protected]>Cc Nomadik Linux Team <[email protected]>Cc Alessandro Rubini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 8/19 ARM: highbank: move SoC sources to mach-highbank
In reply to Masahiro YamadaMovearch/arm/cpu/armv7/highbank/* -> arch/arm/mach-highbank/*
---
Changes in v3: None
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 1 +
arch/arm/cpu/armv7/Makefile | 1 -
arch/arm/{cpu/armv7/highbank => mach-highbank}/Kconfig | 0
arch/arm/{cpu/armv7/highbank => mach-highbank}/Makefile | 0
arch/arm/{cpu/armv7/highbank => mach-highbank}/timer.c | 0
6 files changed, 2 insertions(+), 2 deletions(-)
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%)arch/arm/Kconfig +1 -1
@@ -722,7 +722,7 @@ source "arch/arm/cpu/arm1176/bcm2835/Kconfig" source "arch/arm/cpu/armv7/exynos/Kconfig" -source "arch/arm/cpu/armv7/highbank/Kconfig" +source "arch/arm/mach-highbank/Kconfig" source "arch/arm/cpu/armv7/keystone/Kconfig"
arch/arm/Makefile +1 -0
@@ -6,6 +6,7 @@ # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_DAVINCI) += davinci +machine-$(CONFIG_ARCH_HIGHBANK) += highbank # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD machine-$(CONFIG_KIRKWOOD) += kirkwood # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
arch/arm/cpu/armv7/Makefile +0 -1
@@ -43,7 +43,6 @@ obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/ obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/ obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/ obj-$(CONFIG_ARCH_EXYNOS) += exynos/ -obj-$(CONFIG_ARCH_HIGHBANK) += highbank/ obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/ obj-$(if $(filter mx5,$(SOC)),y) += mx5/
arch/arm/mach-highbank/Kconfig renamed from arch/arm/cpu/armv7/highbank/Kconfig +0 -0
arch/arm/mach-highbank/Makefile renamed from arch/arm/cpu/armv7/highbank/Makefile +0 -0
arch/arm/mach-highbank/timer.c renamed from arch/arm/cpu/armv7/highbank/timer.c +0 -0
Signature · 1 line
1.9.1
PATCH v3 8/19 ARM: highbank: move SoC sources to mach-highbank
Quoted 5 lines · Masahiro Yamada
Move
arch/arm/cpu/armv7/highbank/*->arch/arm/mach-highbank/*Signed-off-by Masahiro Yamada <[email protected]>Cc Rob Herring <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 9/19 ARM: orion5x: move SoC sources to mach-orion5x
In reply to Masahiro YamadaMovearch/arm/cpu/arm926ejs/orion5x/* -> arch/arm/mach-orion5x/*
---
Changes in v3: None
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 2 ++
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/Kconfig | 0
arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/Makefile | 0
arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/cpu.c | 0
arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/dram.c | 0
arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/lowlevel_init.S | 0
arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/timer.c | 0
9 files changed, 3 insertions(+), 2 deletions(-)
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/{cpu/arm926ejs/orion5x => mach-orion5x}/lowlevel_init.S (100%)
rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/timer.c (100%)arch/arm/Kconfig +1 -1
@@ -736,7 +736,7 @@ source "arch/arm/cpu/armv7/omap4/Kconfig" source "arch/arm/cpu/armv7/omap5/Kconfig" -source "arch/arm/cpu/arm926ejs/orion5x/Kconfig" +source "arch/arm/mach-orion5x/Kconfig" source "arch/arm/cpu/armv7/rmobile/Kconfig"
arch/arm/Makefile +2 -0
@@ -11,6 +11,8 @@ machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_KIRKWOOD) += kirkwood # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA machine-$(CONFIG_ARCH_NOMADIK) += nomadik +# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X +machine-$(CONFIG_ORION5X) += orion5x machine-$(CONFIG_TEGRA) += tegra machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
arch/arm/cpu/arm926ejs/Makefile +0 -1
@@ -20,7 +20,6 @@ obj-$(CONFIG_MB86R0x) += mb86r0x/ obj-$(CONFIG_MX25) += mx25/ obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ -obj-$(CONFIG_ORION5X) += orion5x/ obj-$(CONFIG_PANTHEON) += pantheon/ obj-$(if $(filter spear,$(SOC)),y) += spear/ obj-$(CONFIG_ARCH_VERSATILE) += versatile/
arch/arm/mach-orion5x/Kconfig renamed from arch/arm/cpu/arm926ejs/orion5x/Kconfig +0 -0
arch/arm/mach-orion5x/Makefile renamed from arch/arm/cpu/arm926ejs/orion5x/Makefile +0 -0
arch/arm/mach-orion5x/cpu.c renamed from arch/arm/cpu/arm926ejs/orion5x/cpu.c +0 -0
arch/arm/mach-orion5x/dram.c renamed from arch/arm/cpu/arm926ejs/orion5x/dram.c +0 -0
arch/arm/mach-orion5x/lowlevel_init.S renamed from arch/arm/cpu/arm926ejs/orion5x/lowlevel_init.S +0 -0
arch/arm/mach-orion5x/timer.c renamed from arch/arm/cpu/arm926ejs/orion5x/timer.c +0 -0
Signature · 1 line
1.9.1
PATCH v3 9/19 ARM: orion5x: move SoC sources to mach-orion5x
Quoted 5 lines · Masahiro Yamada
Move
arch/arm/cpu/arm926ejs/orion5x/*->arch/arm/mach-orion5x/*Signed-off-by Masahiro Yamada <[email protected]>Cc Albert ARIBAUD <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 10/19 ARM: versatile: move SoC sources to mach-versatile
In reply to Masahiro YamadaMovearch/arm/cpu/arm926ejs/versatile/* -> arch/arm/mach-versatile/*
---
Changes in v3: None
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 1 +
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/Kconfig | 0
arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/Makefile | 0
arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/reset.S | 0
arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/timer.c | 0
7 files changed, 2 insertions(+), 2 deletions(-)
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%)arch/arm/Kconfig +1 -1
@@ -746,7 +746,7 @@ source "arch/arm/mach-tegra/Kconfig" source "arch/arm/cpu/armv7/uniphier/Kconfig" -source "arch/arm/cpu/arm926ejs/versatile/Kconfig" +source "arch/arm/mach-versatile/Kconfig" source "arch/arm/cpu/armv7/zynq/Kconfig"
arch/arm/Makefile +1 -0
@@ -14,6 +14,7 @@ machine-$(CONFIG_ARCH_NOMADIK) += nomadik # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ORION5X) += orion5x machine-$(CONFIG_TEGRA) += tegra +machine-$(CONFIG_ARCH_VERSATILE) += versatile machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
arch/arm/cpu/arm926ejs/Makefile +0 -1
@@ -22,4 +22,3 @@ obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ obj-$(CONFIG_PANTHEON) += pantheon/ obj-$(if $(filter spear,$(SOC)),y) += spear/ -obj-$(CONFIG_ARCH_VERSATILE) += versatile/
arch/arm/mach-versatile/Kconfig renamed from arch/arm/cpu/arm926ejs/versatile/Kconfig +0 -0
arch/arm/mach-versatile/Makefile renamed from arch/arm/cpu/arm926ejs/versatile/Makefile +0 -0
arch/arm/mach-versatile/reset.S renamed from arch/arm/cpu/arm926ejs/versatile/reset.S +0 -0
arch/arm/mach-versatile/timer.c renamed from arch/arm/cpu/arm926ejs/versatile/timer.c +0 -0
Signature · 1 line
1.9.1
PATCH v3 10/19 ARM: versatile: move SoC sources to mach-versatile
Quoted 4 lines · Masahiro Yamada
Move
arch/arm/cpu/arm926ejs/versatile/*->arch/arm/mach-versatile/*Signed-off-by Masahiro Yamada <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 11/19 ARM: keystone: move SoC sources to mach-keystone
In reply to Masahiro YamadaMovearch/arm/cpu/armv7/keystone/* -> arch/arm/mach-keystone/*
---
Changes in v3: None
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 1 +
arch/arm/cpu/armv7/Makefile | 1 -
arch/arm/{cpu/armv7/keystone => mach-keystone}/Kconfig | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/Makefile | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2e.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2hk.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2l.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/clock.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_clock.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_ddr3.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_mon.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/ddr3.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/init.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/keystone.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/msmc.c | 0
arch/arm/{cpu/armv7/keystone => mach-keystone}/psc.c | 0
17 files changed, 2 insertions(+), 2 deletions(-)
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/{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%)arch/arm/Kconfig +1 -1
@@ -724,7 +724,7 @@ source "arch/arm/cpu/armv7/exynos/Kconfig" source "arch/arm/mach-highbank/Kconfig" -source "arch/arm/cpu/armv7/keystone/Kconfig" +source "arch/arm/mach-keystone/Kconfig" source "arch/arm/mach-kirkwood/Kconfig"
arch/arm/Makefile +1 -0
@@ -7,6 +7,7 @@ machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_HIGHBANK) += highbank +machine-$(CONFIG_ARCH_KEYSTONE) += keystone # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD machine-$(CONFIG_KIRKWOOD) += kirkwood # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
arch/arm/cpu/armv7/Makefile +0 -1
@@ -43,7 +43,6 @@ obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/ obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/ obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/ obj-$(CONFIG_ARCH_EXYNOS) += exynos/ -obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/ obj-$(if $(filter mx5,$(SOC)),y) += mx5/ obj-$(CONFIG_MX6) += mx6/
arch/arm/mach-keystone/Kconfig renamed from arch/arm/cpu/armv7/keystone/Kconfig +0 -0
arch/arm/mach-keystone/Makefile renamed from arch/arm/cpu/armv7/keystone/Makefile +0 -0
arch/arm/mach-keystone/clock-k2e.c renamed from arch/arm/cpu/armv7/keystone/clock-k2e.c +0 -0
arch/arm/mach-keystone/clock-k2hk.c renamed from arch/arm/cpu/armv7/keystone/clock-k2hk.c +0 -0
arch/arm/mach-keystone/clock-k2l.c renamed from arch/arm/cpu/armv7/keystone/clock-k2l.c +0 -0
arch/arm/mach-keystone/clock.c renamed from arch/arm/cpu/armv7/keystone/clock.c +0 -0
arch/arm/mach-keystone/cmd_clock.c renamed from arch/arm/cpu/armv7/keystone/cmd_clock.c +0 -0
arch/arm/mach-keystone/cmd_ddr3.c renamed from arch/arm/cpu/armv7/keystone/cmd_ddr3.c +0 -0
arch/arm/mach-keystone/cmd_mon.c renamed from arch/arm/cpu/armv7/keystone/cmd_mon.c +0 -0
arch/arm/mach-keystone/ddr3.c renamed from arch/arm/cpu/armv7/keystone/ddr3.c +0 -0
arch/arm/mach-keystone/init.c renamed from arch/arm/cpu/armv7/keystone/init.c +0 -0
arch/arm/mach-keystone/keystone.c renamed from arch/arm/cpu/armv7/keystone/keystone.c +0 -0
arch/arm/mach-keystone/msmc.c renamed from arch/arm/cpu/armv7/keystone/msmc.c +0 -0
arch/arm/mach-keystone/psc.c renamed from arch/arm/cpu/armv7/keystone/psc.c +0 -0
Signature · 1 line
1.9.1
PATCH v3 11/19 ARM: keystone: move SoC sources to mach-keystone
Quoted 5 lines · Masahiro Yamada
Move
arch/arm/cpu/armv7/keystone/*->arch/arm/mach-keystone/*Signed-off-by Masahiro Yamada <[email protected]>Cc Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 12/19 kbuild: prepare for moving headers into mach-*/include/mach
In reply to Masahiro YamadaIn U-Boot, SoC-specific headers are placed in arch/$(ARCH)/include/asm/arch-$(SOC) and a symbolic link to that directory is created at the early stage of the build process.
Creating and removing a symbolic link during the build is not preferred. In fact, Linux Kernel did away with include/asm-$(ARCH) directories a long time time ago.
As for ARM, now it is possible to collect SoC sources into arch/arm/mach-$(SOC). It is also reasonable to move SoC headers into arch/arm/mach-$(SOC)/include/mach.
This commit prepares for that.
If the directory arch/$(ARCH)/mach-$(SOC)/include/mach exists, a symbolic to that directory is created. Otherwise, a symbolic link to arch/$(ARCH)/include/asm/arch-$(SOC) or arch-$(CPU) is created.
---
Changes in v3: None
scripts/Makefile.autoconf | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
scripts/Makefile.autoconf +15 -4
@@ -85,15 +85,26 @@ include/config.h: scripts/Makefile.autoconf create_symlink FORCE $(call filechk,config_h) # symbolic links +# If arch/$(ARCH)/mach-$(SOC)/include/mach exists, +# make a symbolic link to that directory. +# Otherwise, create a symbolic link to arch/$(ARCH)/include/asm/arch-$(SOC). PHONY += create_symlink create_symlink: ifneq ($(KBUILD_SRC),) $(Q)mkdir -p include/asm - $(Q)ln -fsn $(KBUILD_SRC)/arch/$(ARCH)/include/asm/arch-$(if $(SOC),$(SOC),$(CPU)) \ - include/asm/arch + $(Q)if [ -d $(KBUILD_SRC)/arch/$(ARCH)/mach-$(SOC)/include/mach ]; then \ + dest=arch/$(ARCH)/mach-$(SOC)/include/mach; \ + else \ + dest=arch/$(ARCH)/include/asm/arch-$(if $(SOC),$(SOC),$(CPU)); \ + fi; \ + ln -fsn $(KBUILD_SRC)/$$dest include/asm/arch else - $(Q)ln -fsn arch-$(if $(SOC),$(SOC),$(CPU)) \ - arch/$(ARCH)/include/asm/arch + $(Q)if [ -d arch/$(ARCH)/mach-$(SOC)/include/mach ]; then \ + dest=../../mach-$(SOC)/include/mach; \ + else \ + dest=arch-$(if $(SOC),$(SOC),$(CPU)); \ + fi; \ + ln -fsn $$dest arch/$(ARCH)/include/asm/arch endif PHONY += FORCE
Signature · 1 line
1.9.1
PATCH v3 12/19 kbuild: prepare for moving headers into mach-*/include/mach
Quoted 12 lines · Masahiro Yamada
In U-Boot, SoC-specific headers are placed in arch/$(ARCH)/include/asm/arch-$(SOC) and a symbolic link to that directory is created at the early stage of the build process.
Creating and removing a symbolic link during the build is not preferred. In fact, Linux Kernel did away with include/asm-$(ARCH) directories a long time time ago.
As for ARM, now it is possible to collect SoC sources into arch/arm/mach-$(SOC). It is also reasonable to move SoC headers into arch/arm/mach-$(SOC)/include/mach.
Quoted 6 lines
This commit prepares for that.
If the directory arch/$(ARCH)/mach-$(SOC)/include/mach exists, a symbolic to that directory is created. Otherwise, a symbolic link to arch/$(ARCH)/include/asm/arch-$(SOC) or arch-$(CPU) is created.Signed-off-by Masahiro Yamada <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 13/19 ARM: at91: move SoC headers to mach-at91/include/mach
In reply to Masahiro YamadaMove arch/arm/include/asm/arch-at91/*
-> arch/arm/mach-at91/include/mach/*
---
Changes in v3:
- Move two more headers. They were added after I sent the RFC.
MAINTAINERS | 1 -
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_common.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_dbu.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_eefc.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_emac.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_gpbr.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_matrix.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_mc.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pdc.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pio.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pit.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_pmc.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_rstc.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_rtt.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_spi.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_st.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_tc.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91_wdt.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91rm9200.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9260.h | 0
.../asm/arch-at91 => mach-at91/include/mach}/at91sam9260_matrix.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9261.h | 0
.../asm/arch-at91 => mach-at91/include/mach}/at91sam9261_matrix.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9263.h | 0
.../asm/arch-at91 => mach-at91/include/mach}/at91sam9263_matrix.h | 0
.../{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_matrix.h | 0
.../{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_sdramc.h | 0
.../arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9_smc.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9g45.h | 0
.../asm/arch-at91 => mach-at91/include/mach}/at91sam9g45_matrix.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9rl.h | 0
.../asm/arch-at91 => mach-at91/include/mach}/at91sam9rl_matrix.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/at91sam9x5.h | 0
.../asm/arch-at91 => mach-at91/include/mach}/at91sam9x5_matrix.h | 0
.../arm/{include/asm/arch-at91 => mach-at91/include/mach}/atmel_mpddrc.h | 0
.../arm/{include/asm/arch-at91 => mach-at91/include/mach}/atmel_serial.h | 0
.../{include/asm/arch-at91 => mach-at91/include/mach}/atmel_usba_udc.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/clk.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/gpio.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/hardware.h | 0
.../arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5_matrix.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5_sfr.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d3.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d3_smc.h | 0
arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5d4.h | 0
45 files changed, 1 deletion(-)
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}/sama5_matrix.h (100%)
rename arch/arm/{include/asm/arch-at91 => mach-at91/include/mach}/sama5_sfr.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%)MAINTAINERS +0 -1
@@ -77,7 +77,6 @@ M: Andreas Bie?mann <[email protected]> S: Maintained T: git git://git.denx.de/u-boot-atmel.git F: arch/arm/mach-at91/ -F: arch/arm/include/asm/arch-at91/ ARM FREESCALE IMX M: Stefano Babic <[email protected]>
arch/arm/mach-at91/include/mach/at91_common.h renamed from arch/arm/include/asm/arch-at91/at91_common.h +0 -0
arch/arm/mach-at91/include/mach/at91_dbu.h renamed from arch/arm/include/asm/arch-at91/at91_dbu.h +0 -0
arch/arm/mach-at91/include/mach/at91_eefc.h renamed from arch/arm/include/asm/arch-at91/at91_eefc.h +0 -0
arch/arm/mach-at91/include/mach/at91_emac.h renamed from arch/arm/include/asm/arch-at91/at91_emac.h +0 -0
arch/arm/mach-at91/include/mach/at91_gpbr.h renamed from arch/arm/include/asm/arch-at91/at91_gpbr.h +0 -0
arch/arm/mach-at91/include/mach/at91_matrix.h renamed from arch/arm/include/asm/arch-at91/at91_matrix.h +0 -0
arch/arm/mach-at91/include/mach/at91_mc.h renamed from arch/arm/include/asm/arch-at91/at91_mc.h +0 -0
arch/arm/mach-at91/include/mach/at91_pdc.h renamed from arch/arm/include/asm/arch-at91/at91_pdc.h +0 -0
arch/arm/mach-at91/include/mach/at91_pio.h renamed from arch/arm/include/asm/arch-at91/at91_pio.h +0 -0
arch/arm/mach-at91/include/mach/at91_pit.h renamed from arch/arm/include/asm/arch-at91/at91_pit.h +0 -0
arch/arm/mach-at91/include/mach/at91_pmc.h renamed from arch/arm/include/asm/arch-at91/at91_pmc.h +0 -0
arch/arm/mach-at91/include/mach/at91_rstc.h renamed from arch/arm/include/asm/arch-at91/at91_rstc.h +0 -0
arch/arm/mach-at91/include/mach/at91_rtt.h renamed from arch/arm/include/asm/arch-at91/at91_rtt.h +0 -0
arch/arm/mach-at91/include/mach/at91_spi.h renamed from arch/arm/include/asm/arch-at91/at91_spi.h +0 -0
arch/arm/mach-at91/include/mach/at91_st.h renamed from arch/arm/include/asm/arch-at91/at91_st.h +0 -0
arch/arm/mach-at91/include/mach/at91_tc.h renamed from arch/arm/include/asm/arch-at91/at91_tc.h +0 -0
arch/arm/mach-at91/include/mach/at91_wdt.h renamed from arch/arm/include/asm/arch-at91/at91_wdt.h +0 -0
arch/arm/mach-at91/include/mach/at91rm9200.h renamed from arch/arm/include/asm/arch-at91/at91rm9200.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9260.h renamed from arch/arm/include/asm/arch-at91/at91sam9260.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9260_matrix.h renamed from arch/arm/include/asm/arch-at91/at91sam9260_matrix.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9261.h renamed from arch/arm/include/asm/arch-at91/at91sam9261.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9261_matrix.h renamed from arch/arm/include/asm/arch-at91/at91sam9261_matrix.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9263.h renamed from arch/arm/include/asm/arch-at91/at91sam9263.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9263_matrix.h renamed from arch/arm/include/asm/arch-at91/at91sam9263_matrix.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9_matrix.h renamed from arch/arm/include/asm/arch-at91/at91sam9_matrix.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9_sdramc.h renamed from arch/arm/include/asm/arch-at91/at91sam9_sdramc.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9_smc.h renamed from arch/arm/include/asm/arch-at91/at91sam9_smc.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9g45.h renamed from arch/arm/include/asm/arch-at91/at91sam9g45.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h renamed from arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9rl.h renamed from arch/arm/include/asm/arch-at91/at91sam9rl.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h renamed from arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9x5.h renamed from arch/arm/include/asm/arch-at91/at91sam9x5.h +0 -0
arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h renamed from arch/arm/include/asm/arch-at91/at91sam9x5_matrix.h +0 -0
arch/arm/mach-at91/include/mach/atmel_mpddrc.h renamed from arch/arm/include/asm/arch-at91/atmel_mpddrc.h +0 -0
arch/arm/mach-at91/include/mach/atmel_serial.h renamed from arch/arm/include/asm/arch-at91/atmel_serial.h +0 -0
arch/arm/mach-at91/include/mach/atmel_usba_udc.h renamed from arch/arm/include/asm/arch-at91/atmel_usba_udc.h +0 -0
arch/arm/mach-at91/include/mach/clk.h renamed from arch/arm/include/asm/arch-at91/clk.h +0 -0
arch/arm/mach-at91/include/mach/gpio.h renamed from arch/arm/include/asm/arch-at91/gpio.h +0 -0
arch/arm/mach-at91/include/mach/hardware.h renamed from arch/arm/include/asm/arch-at91/hardware.h +0 -0
arch/arm/mach-at91/include/mach/sama5_matrix.h renamed from arch/arm/include/asm/arch-at91/sama5_matrix.h +0 -0
arch/arm/mach-at91/include/mach/sama5_sfr.h renamed from arch/arm/include/asm/arch-at91/sama5_sfr.h +0 -0
arch/arm/mach-at91/include/mach/sama5d3.h renamed from arch/arm/include/asm/arch-at91/sama5d3.h +0 -0
arch/arm/mach-at91/include/mach/sama5d3_smc.h renamed from arch/arm/include/asm/arch-at91/sama5d3_smc.h +0 -0
arch/arm/mach-at91/include/mach/sama5d4.h renamed from arch/arm/include/asm/arch-at91/sama5d4.h +0 -0
Signature · 1 line
1.9.1
PATCH v3 13/19 ARM: at91: move SoC headers to mach-at91/include/mach
Quoted 5 lines · Masahiro Yamada
Move
arch/arm/include/asm/arch-at91/*
->arch/arm/mach-at91/include/mach/*Signed-off-by Masahiro Yamada <[email protected]>Acked-by Andreas Bie?mann <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 14/19 ARM: davinci: move SoC headers to mach-davinci/include/mach
In reply to Masahiro YamadaMove arch/arm/include/asm/arch-davinci/*
-> arch/arm/mach-davinci/include/mach/*
---
Changes in v3: None
.../{include/asm/arch-davinci => mach-davinci/include/mach}/aintc_defs.h | 0
.../asm/arch-davinci => mach-davinci/include/mach}/da850_lowlevel.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/da8xx-usb.h | 0
.../asm/arch-davinci => mach-davinci/include/mach}/davinci_misc.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/ddr2_defs.h | 0
.../asm/arch-davinci => mach-davinci/include/mach}/dm365_lowlevel.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/emac_defs.h | 0
arch/arm/{include/asm/arch-davinci => mach-davinci/include/mach}/gpio.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/hardware.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/i2c_defs.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/pinmux_defs.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/pll_defs.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/psc_defs.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/sdmmc_defs.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/syscfg_defs.h | 0
.../{include/asm/arch-davinci => mach-davinci/include/mach}/timer_defs.h | 0
16 files changed, 0 insertions(+), 0 deletions(-)
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%)arch/arm/mach-davinci/include/mach/aintc_defs.h renamed from arch/arm/include/asm/arch-davinci/aintc_defs.h +0 -0
arch/arm/mach-davinci/include/mach/da850_lowlevel.h renamed from arch/arm/include/asm/arch-davinci/da850_lowlevel.h +0 -0
arch/arm/mach-davinci/include/mach/da8xx-usb.h renamed from arch/arm/include/asm/arch-davinci/da8xx-usb.h +0 -0
arch/arm/mach-davinci/include/mach/davinci_misc.h renamed from arch/arm/include/asm/arch-davinci/davinci_misc.h +0 -0
arch/arm/mach-davinci/include/mach/ddr2_defs.h renamed from arch/arm/include/asm/arch-davinci/ddr2_defs.h +0 -0
arch/arm/mach-davinci/include/mach/dm365_lowlevel.h renamed from arch/arm/include/asm/arch-davinci/dm365_lowlevel.h +0 -0
arch/arm/mach-davinci/include/mach/emac_defs.h renamed from arch/arm/include/asm/arch-davinci/emac_defs.h +0 -0
arch/arm/mach-davinci/include/mach/gpio.h renamed from arch/arm/include/asm/arch-davinci/gpio.h +0 -0
arch/arm/mach-davinci/include/mach/hardware.h renamed from arch/arm/include/asm/arch-davinci/hardware.h +0 -0
arch/arm/mach-davinci/include/mach/i2c_defs.h renamed from arch/arm/include/asm/arch-davinci/i2c_defs.h +0 -0
arch/arm/mach-davinci/include/mach/pinmux_defs.h renamed from arch/arm/include/asm/arch-davinci/pinmux_defs.h +0 -0
arch/arm/mach-davinci/include/mach/pll_defs.h renamed from arch/arm/include/asm/arch-davinci/pll_defs.h +0 -0
arch/arm/mach-davinci/include/mach/psc_defs.h renamed from arch/arm/include/asm/arch-davinci/psc_defs.h +0 -0
arch/arm/mach-davinci/include/mach/sdmmc_defs.h renamed from arch/arm/include/asm/arch-davinci/sdmmc_defs.h +0 -0
arch/arm/mach-davinci/include/mach/syscfg_defs.h renamed from arch/arm/include/asm/arch-davinci/syscfg_defs.h +0 -0
arch/arm/mach-davinci/include/mach/timer_defs.h renamed from arch/arm/include/asm/arch-davinci/timer_defs.h +0 -0
Signature · 1 line
1.9.1
PATCH v3 14/19 ARM: davinci: move SoC headers to mach-davinci/include/mach
Quoted 5 lines · Masahiro Yamada
Move
arch/arm/include/asm/arch-davinci/*
->arch/arm/mach-davinci/include/mach/*Signed-off-by Masahiro Yamada <[email protected]>Cc Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 15/19 ARM: kirkwood: move SoC headers to mach-kirkwood/include/mach
In reply to Masahiro YamadaMove arch/arm/include/asm/arch-kirkwood/*
-> arch/arm/mach-kirkwood/include/mach/*
---
Changes in v3: None
MAINTAINERS | 1 -
.../{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/config.h | 0
.../arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/cpu.h | 0
.../{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/gpio.h | 0
.../asm/arch-kirkwood => mach-kirkwood/include/mach}/kw88f6192.h | 0
.../asm/arch-kirkwood => mach-kirkwood/include/mach}/kw88f6281.h | 0
.../arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/mpp.h | 0
.../arm/{include/asm/arch-kirkwood => mach-kirkwood/include/mach}/soc.h | 0
include/configs/km/km_arm.h | 2 +-
9 files changed, 1 insertion(+), 2 deletions(-)
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%)MAINTAINERS +0 -1
@@ -99,7 +99,6 @@ M: Luka Perkov <[email protected]> S: Maintained T: git git://git.denx.de/u-boot-marvell.git F: arch/arm/mach-kirkwood/ -F: arch/arm/include/asm/arch-kirkwood/ ARM MARVELL PXA M: Marek Vasut <[email protected]>
arch/arm/mach-kirkwood/include/mach/config.h renamed from arch/arm/include/asm/arch-kirkwood/config.h +0 -0
arch/arm/mach-kirkwood/include/mach/cpu.h renamed from arch/arm/include/asm/arch-kirkwood/cpu.h +0 -0
arch/arm/mach-kirkwood/include/mach/gpio.h renamed from arch/arm/include/asm/arch-kirkwood/gpio.h +0 -0
arch/arm/mach-kirkwood/include/mach/kw88f6192.h renamed from arch/arm/include/asm/arch-kirkwood/kw88f6192.h +0 -0
arch/arm/mach-kirkwood/include/mach/kw88f6281.h renamed from arch/arm/include/asm/arch-kirkwood/kw88f6281.h +0 -0
arch/arm/mach-kirkwood/include/mach/mpp.h renamed from arch/arm/include/asm/arch-kirkwood/mpp.h +0 -0
arch/arm/mach-kirkwood/include/mach/soc.h renamed from arch/arm/include/asm/arch-kirkwood/soc.h +0 -0
include/configs/km/km_arm.h +1 -1
@@ -195,7 +195,7 @@ }#ifndef __ASSEMBLY__ -#include <asm/arch-kirkwood/gpio.h> +#include <asm/arch/gpio.h> extern void __set_direction (unsigned pin,int high);void set_sda (int state);void set_scl (int state);
Signature · 1 line
1.9.1
PATCH v3 15/19 ARM: kirkwood: move SoC headers to mach-kirkwood/include/mach
Quoted 7 lines · Masahiro Yamada
Move
arch/arm/include/asm/arch-kirkwood/*
->arch/arm/mach-kirkwood/include/mach/*Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stefan Roese <[email protected]>Cc Prafulla Wadaskar <[email protected]>Cc Luka Perkov <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 16/19 ARM: nomadik: move SoC headers to mach-nomadik/include/mach
In reply to Masahiro YamadaMove arch/arm/include/asm/arch-nomadik/*
-> arch/arm/mach-nomadik/include/mach/*
---
Changes in v3: None
arch/arm/{include/asm/arch-nomadik => mach-nomadik/include/mach}/gpio.h | 0
arch/arm/{include/asm/arch-nomadik => mach-nomadik/include/mach}/mtu.h | 0
2 files changed, 0 insertions(+), 0 deletions(-)
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%)arch/arm/mach-nomadik/include/mach/gpio.h renamed from arch/arm/include/asm/arch-nomadik/gpio.h +0 -0
arch/arm/mach-nomadik/include/mach/mtu.h renamed from arch/arm/include/asm/arch-nomadik/mtu.h +0 -0
Signature · 1 line
1.9.1
PATCH v3 16/19 ARM: nomadik: move SoC headers to mach-nomadik/include/mach
Quoted 6 lines · Masahiro Yamada
Move
arch/arm/include/asm/arch-nomadik/*
->arch/arm/mach-nomadik/include/mach/*Signed-off-by Masahiro Yamada <[email protected]>Cc Nomadik Linux Team <[email protected]>Cc Alessandro Rubini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 17/19 ARM: orion5x: move SoC headers to mach-orion5x/include/mach
In reply to Masahiro YamadaMove arch/arm/include/asm/arch-orion5x/*
-> arch/arm/mach-orion5x/include/mach/*
---
Changes in v3: None
arch/arm/{include/asm/arch-orion5x => mach-orion5x/include/mach}/cpu.h | 0
.../{include/asm/arch-orion5x => mach-orion5x/include/mach}/mv88f5182.h | 0
.../arm/{include/asm/arch-orion5x => mach-orion5x/include/mach}/orion5x.h | 0
3 files changed, 0 insertions(+), 0 deletions(-)
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%)arch/arm/mach-orion5x/include/mach/cpu.h renamed from arch/arm/include/asm/arch-orion5x/cpu.h +0 -0
arch/arm/mach-orion5x/include/mach/mv88f5182.h renamed from arch/arm/include/asm/arch-orion5x/mv88f5182.h +0 -0
arch/arm/mach-orion5x/include/mach/orion5x.h renamed from arch/arm/include/asm/arch-orion5x/orion5x.h +0 -0
Signature · 1 line
1.9.1
PATCH v3 17/19 ARM: orion5x: move SoC headers to mach-orion5x/include/mach
Quoted 5 lines · Masahiro Yamada
Move
arch/arm/include/asm/arch-orion5x/*
->arch/arm/mach-orion5x/include/mach/*Signed-off-by Masahiro Yamada <[email protected]>Cc Albert ARIBAUD <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 18/19 ARM: keystone: move SoC headers to mach-keystone/include/mach
In reply to Masahiro YamadaMove arch/arm/include/asm/arch-keystone/*
-> arch/arm/mach-keystone/include/mach/*
---
Changes in v3: None
.../{include/asm/arch-keystone => mach-keystone/include/mach}/clock-k2e.h | 0
.../asm/arch-keystone => mach-keystone/include/mach}/clock-k2hk.h | 0
.../{include/asm/arch-keystone => mach-keystone/include/mach}/clock-k2l.h | 0
.../arm/{include/asm/arch-keystone => mach-keystone/include/mach}/clock.h | 0
.../asm/arch-keystone => mach-keystone/include/mach}/clock_defs.h | 0
arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/ddr3.h | 0
.../asm/arch-keystone => mach-keystone/include/mach}/hardware-k2e.h | 0
.../asm/arch-keystone => mach-keystone/include/mach}/hardware-k2hk.h | 0
.../asm/arch-keystone => mach-keystone/include/mach}/hardware-k2l.h | 0
.../{include/asm/arch-keystone => mach-keystone/include/mach}/hardware.h | 0
.../{include/asm/arch-keystone => mach-keystone/include/mach}/i2c_defs.h | 0
arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/mon.h | 0
arch/arm/{include/asm/arch-keystone => mach-keystone/include/mach}/msmc.h | 0
.../{include/asm/arch-keystone => mach-keystone/include/mach}/psc_defs.h | 0
.../asm/arch-keystone => mach-keystone/include/mach}/xhci-keystone.h | 0
15 files changed, 0 insertions(+), 0 deletions(-)
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%)arch/arm/mach-keystone/include/mach/clock-k2e.h renamed from arch/arm/include/asm/arch-keystone/clock-k2e.h +0 -0
arch/arm/mach-keystone/include/mach/clock-k2hk.h renamed from arch/arm/include/asm/arch-keystone/clock-k2hk.h +0 -0
arch/arm/mach-keystone/include/mach/clock-k2l.h renamed from arch/arm/include/asm/arch-keystone/clock-k2l.h +0 -0
arch/arm/mach-keystone/include/mach/clock.h renamed from arch/arm/include/asm/arch-keystone/clock.h +0 -0
arch/arm/mach-keystone/include/mach/clock_defs.h renamed from arch/arm/include/asm/arch-keystone/clock_defs.h +0 -0
arch/arm/mach-keystone/include/mach/ddr3.h renamed from arch/arm/include/asm/arch-keystone/ddr3.h +0 -0
arch/arm/mach-keystone/include/mach/hardware-k2e.h renamed from arch/arm/include/asm/arch-keystone/hardware-k2e.h +0 -0
arch/arm/mach-keystone/include/mach/hardware-k2hk.h renamed from arch/arm/include/asm/arch-keystone/hardware-k2hk.h +0 -0
arch/arm/mach-keystone/include/mach/hardware-k2l.h renamed from arch/arm/include/asm/arch-keystone/hardware-k2l.h +0 -0
arch/arm/mach-keystone/include/mach/hardware.h renamed from arch/arm/include/asm/arch-keystone/hardware.h +0 -0
arch/arm/mach-keystone/include/mach/i2c_defs.h renamed from arch/arm/include/asm/arch-keystone/i2c_defs.h +0 -0
arch/arm/mach-keystone/include/mach/mon.h renamed from arch/arm/include/asm/arch-keystone/mon.h +0 -0
arch/arm/mach-keystone/include/mach/msmc.h renamed from arch/arm/include/asm/arch-keystone/msmc.h +0 -0
arch/arm/mach-keystone/include/mach/psc_defs.h renamed from arch/arm/include/asm/arch-keystone/psc_defs.h +0 -0
arch/arm/mach-keystone/include/mach/xhci-keystone.h renamed from arch/arm/include/asm/arch-keystone/xhci-keystone.h +0 -0
Signature · 1 line
1.9.1
PATCH v3 18/19 ARM: keystone: move SoC headers to mach-keystone/include/mach
Quoted 5 lines · Masahiro Yamada
Move
arch/arm/include/asm/arch-keystone/*
->arch/arm/mach-keystone/include/mach/*Signed-off-by Masahiro Yamada <[email protected]>Cc Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 19/19 ARM: prepare for including <mach/*.h>
In reply to Masahiro YamadaThis commit adds $(srctree)/arch/arm/$(machdirs)/include/mach to the headers search path.
It allows us to replace "#include <asm/arch/foo.h>" with "#include <mach/foo.h>". As "#include <asm/arch/foo.h>" is still supported, we can modify each file one by one.
---
Changes in v3: None
arch/arm/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/Makefile +2 -0
@@ -19,6 +19,8 @@ machine-$(CONFIG_ARCH_VERSATILE) += versatile machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) +PLATFORM_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) + libs-y += $(machdirs) head-y := arch/arm/cpu/$(CPU)/start.o
Signature · 1 line
1.9.1
PATCH v3 19/19 ARM: prepare for including <mach/*.h>
Quoted 8 lines · Masahiro Yamada
This commit adds $(srctree)/arch/arm/$(machdirs)/include/mach to the headers search path.
It allows us to replace "#include <
asm/arch/foo.h>" with "#include <mach/foo.h>". As "#include <asm/arch/foo.h>" is still supported, we can modify each file one by one.Signed-off-by Masahiro Yamada <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom