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 } } '

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Acked-by: Andreas Bießmann andreas.devel@googlemail.co ---

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 41f3220..06c3468 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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" diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig new file mode 100644 index 0000000..30945c1 --- /dev/null +++ b/arch/arm/mach-at91/Kconfig @@ -0,0 +1,168 @@ +if ARCH_AT91 + +choice + prompt "Atmel AT91 board select" + +config TARGET_AT91RM9200EK + bool "Atmel AT91RM9200 evaluation kit" + select CPU_ARM920T + +config TARGET_EB_CPUX9K2 + bool "Support eb_cpux9k2" + select CPU_ARM920T + +config TARGET_CPUAT91 + bool "Support cpuat91" + select CPU_ARM920T + +config TARGET_AT91SAM9260EK + bool "Atmel at91sam9260 reference board" + select CPU_ARM926EJS + +config TARGET_ETHERNUT5 + bool "Ethernut5 board" + select CPU_ARM926EJS + +config TARGET_TNY_A9260 + bool "Caloa TNY A9260 board" + select CPU_ARM926EJS + +config TARGET_SNAPPER9260 + bool "Support snapper9260" + select CPU_ARM926EJS + +config TARGET_AFEB9260 + bool "Support afeb9260" + select CPU_ARM926EJS + +config TARGET_AT91SAM9261EK + bool "Atmel at91sam9261 reference board" + select CPU_ARM926EJS + +config TARGET_PM9261 + bool "Ronetix pm9261 board" + select CPU_ARM926EJS + +config TARGET_AT91SAM9263EK + bool "Atmel at91sam9263 reference board" + select CPU_ARM926EJS + +config TARGET_USB_A9263 + bool "Caloa USB A9260 board" + select CPU_ARM926EJS + +config TARGET_PM9263 + bool "Ronetix pm9263 board" + select CPU_ARM926EJS + +config TARGET_SBC35_A9G20 + bool "Support sbc35_a9g20" + select CPU_ARM926EJS + +config TARGET_STAMP9G20 + bool "Support stamp9g20" + select CPU_ARM926EJS + +config TARGET_AT91SAM9M10G45EK + bool "Atmel AT91SAM9M10G45-EK board" + select CPU_ARM926EJS + +config TARGET_PM9G45 + bool "Ronetix pm9g45 board" + select CPU_ARM926EJS + +config TARGET_AT91SAM9N12EK + bool "Atmel AT91SAM9N12-EK board" + select CPU_ARM926EJS + +config TARGET_AT91SAM9RLEK + bool "Atmel at91sam9rl reference board" + select CPU_ARM926EJS + +config TARGET_AT91SAM9X5EK + bool "Atmel AT91SAM9X5-EK board" + select CPU_ARM926EJS + +config TARGET_SAMA5D3_XPLAINED + bool "SAMA5D3 Xplained board" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_SAMA5D3XEK + bool "SAMA5D3X-EK board" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_SAMA5D4_XPLAINED + bool "SAMA5D4 Xplained board" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_SAMA5D4EK + bool "SAMA5D4 Evaluation Kit" + select CPU_V7 + select SUPPORT_SPL + +config TARGET_VL_MA2SC + bool "Support vl_ma2sc" + 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_CORVUS + bool "Support corvus" + select CPU_ARM926EJS + select SUPPORT_SPL + +config TARGET_TAURUS + bool "Support taurus" + select CPU_ARM926EJS + select SUPPORT_SPL + +endchoice + +config SYS_SOC + default "at91" + +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/BuS/eb_cpux9k2/Kconfig" +source "board/eukrea/cpuat91/Kconfig" +source "board/afeb9260/Kconfig" +source "board/bluewater/snapper9260/Kconfig" +source "board/BuS/vl_ma2sc/Kconfig" +source "board/calao/sbc35_a9g20/Kconfig" +source "board/calao/tny_a9260/Kconfig" +source "board/calao/usb_a9263/Kconfig" +source "board/egnite/ethernut5/Kconfig" +source "board/esd/meesc/Kconfig" +source "board/esd/otc570/Kconfig" +source "board/eukrea/cpu9260/Kconfig" +source "board/ronetix/pm9261/Kconfig" +source "board/ronetix/pm9263/Kconfig" +source "board/ronetix/pm9g45/Kconfig" +source "board/siemens/corvus/Kconfig" +source "board/siemens/taurus/Kconfig" +source "board/taskit/stamp9g20/Kconfig" + +endif diff --git a/board/BuS/eb_cpux9k2/Kconfig b/board/BuS/eb_cpux9k2/Kconfig index 230e64d..e2a787a 100644 --- a/board/BuS/eb_cpux9k2/Kconfig +++ b/board/BuS/eb_cpux9k2/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "BuS"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "eb_cpux9k2"

diff --git a/board/BuS/vl_ma2sc/Kconfig b/board/BuS/vl_ma2sc/Kconfig index 2f43519..848177f 100644 --- a/board/BuS/vl_ma2sc/Kconfig +++ b/board/BuS/vl_ma2sc/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "BuS"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "vl_ma2sc"

diff --git a/board/afeb9260/Kconfig b/board/afeb9260/Kconfig index 6a5a931..fb64c9c 100644 --- a/board/afeb9260/Kconfig +++ b/board/afeb9260/Kconfig @@ -3,9 +3,6 @@ if TARGET_AFEB9260 config SYS_BOARD default "afeb9260"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "afeb9260"

diff --git a/board/atmel/at91rm9200ek/Kconfig b/board/atmel/at91rm9200ek/Kconfig index bad4a37..952351d 100644 --- a/board/atmel/at91rm9200ek/Kconfig +++ b/board/atmel/at91rm9200ek/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91rm9200ek"

diff --git a/board/atmel/at91sam9260ek/Kconfig b/board/atmel/at91sam9260ek/Kconfig index fe00ed5..3844f08 100644 --- a/board/atmel/at91sam9260ek/Kconfig +++ b/board/atmel/at91sam9260ek/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9260ek"

diff --git a/board/atmel/at91sam9261ek/Kconfig b/board/atmel/at91sam9261ek/Kconfig index d839c1a..2971b3c 100644 --- a/board/atmel/at91sam9261ek/Kconfig +++ b/board/atmel/at91sam9261ek/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9261ek"

diff --git a/board/atmel/at91sam9263ek/Kconfig b/board/atmel/at91sam9263ek/Kconfig index 311c504..3f0873f 100644 --- a/board/atmel/at91sam9263ek/Kconfig +++ b/board/atmel/at91sam9263ek/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9263ek"

diff --git a/board/atmel/at91sam9m10g45ek/Kconfig b/board/atmel/at91sam9m10g45ek/Kconfig index 1bc086a..211c411 100644 --- a/board/atmel/at91sam9m10g45ek/Kconfig +++ b/board/atmel/at91sam9m10g45ek/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9m10g45ek"

diff --git a/board/atmel/at91sam9n12ek/Kconfig b/board/atmel/at91sam9n12ek/Kconfig index cf1d1a3..816003a 100644 --- a/board/atmel/at91sam9n12ek/Kconfig +++ b/board/atmel/at91sam9n12ek/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9n12ek"

diff --git a/board/atmel/at91sam9rlek/Kconfig b/board/atmel/at91sam9rlek/Kconfig index 438d300..81a839a 100644 --- a/board/atmel/at91sam9rlek/Kconfig +++ b/board/atmel/at91sam9rlek/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9rlek"

diff --git a/board/atmel/at91sam9x5ek/Kconfig b/board/atmel/at91sam9x5ek/Kconfig index 5c5ec61..3f92754 100644 --- a/board/atmel/at91sam9x5ek/Kconfig +++ b/board/atmel/at91sam9x5ek/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "at91sam9x5ek"

diff --git a/board/atmel/sama5d3_xplained/Kconfig b/board/atmel/sama5d3_xplained/Kconfig index 0ba8a7b..2df751a 100644 --- a/board/atmel/sama5d3_xplained/Kconfig +++ b/board/atmel/sama5d3_xplained/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "sama5d3_xplained"

diff --git a/board/atmel/sama5d3xek/Kconfig b/board/atmel/sama5d3xek/Kconfig index 2a9ed23..abd1ad8 100644 --- a/board/atmel/sama5d3xek/Kconfig +++ b/board/atmel/sama5d3xek/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "sama5d3xek"

diff --git a/board/atmel/sama5d4_xplained/Kconfig b/board/atmel/sama5d4_xplained/Kconfig index f320a68..2cb03cb 100644 --- a/board/atmel/sama5d4_xplained/Kconfig +++ b/board/atmel/sama5d4_xplained/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "sama5d4_xplained"

diff --git a/board/atmel/sama5d4ek/Kconfig b/board/atmel/sama5d4ek/Kconfig index 7dc569c..1a63403 100644 --- a/board/atmel/sama5d4ek/Kconfig +++ b/board/atmel/sama5d4ek/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "atmel"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "sama5d4ek"

diff --git a/board/bluewater/snapper9260/Kconfig b/board/bluewater/snapper9260/Kconfig index c896c46..b8e9cbc 100644 --- a/board/bluewater/snapper9260/Kconfig +++ b/board/bluewater/snapper9260/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "bluewater"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "snapper9260"

diff --git a/board/calao/sbc35_a9g20/Kconfig b/board/calao/sbc35_a9g20/Kconfig index fb5a1a3..37ecfb5 100644 --- a/board/calao/sbc35_a9g20/Kconfig +++ b/board/calao/sbc35_a9g20/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "calao"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "sbc35_a9g20"

diff --git a/board/calao/tny_a9260/Kconfig b/board/calao/tny_a9260/Kconfig index b1de8f8..2b66329 100644 --- a/board/calao/tny_a9260/Kconfig +++ b/board/calao/tny_a9260/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "calao"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "tny_a9260"

diff --git a/board/calao/usb_a9263/Kconfig b/board/calao/usb_a9263/Kconfig index 7a159dc..19e446d 100644 --- a/board/calao/usb_a9263/Kconfig +++ b/board/calao/usb_a9263/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "calao"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "usb_a9263"

diff --git a/board/egnite/ethernut5/Kconfig b/board/egnite/ethernut5/Kconfig index c42c734..5a6c1c5 100644 --- a/board/egnite/ethernut5/Kconfig +++ b/board/egnite/ethernut5/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "egnite"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "ethernut5"

diff --git a/board/esd/meesc/Kconfig b/board/esd/meesc/Kconfig index 5041041..150348a 100644 --- a/board/esd/meesc/Kconfig +++ b/board/esd/meesc/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "esd"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "meesc"

diff --git a/board/esd/otc570/Kconfig b/board/esd/otc570/Kconfig index 55a2f70..4966f5f 100644 --- a/board/esd/otc570/Kconfig +++ b/board/esd/otc570/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "esd"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "otc570"

diff --git a/board/eukrea/cpu9260/Kconfig b/board/eukrea/cpu9260/Kconfig index 9bd077b..90d2124 100644 --- a/board/eukrea/cpu9260/Kconfig +++ b/board/eukrea/cpu9260/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "eukrea"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "cpu9260"

diff --git a/board/eukrea/cpuat91/Kconfig b/board/eukrea/cpuat91/Kconfig index b69e4c3..27b005c 100644 --- a/board/eukrea/cpuat91/Kconfig +++ b/board/eukrea/cpuat91/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "eukrea"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "cpuat91"

diff --git a/board/ronetix/pm9261/Kconfig b/board/ronetix/pm9261/Kconfig index a4934c5..8c54198 100644 --- a/board/ronetix/pm9261/Kconfig +++ b/board/ronetix/pm9261/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "ronetix"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "pm9261"

diff --git a/board/ronetix/pm9263/Kconfig b/board/ronetix/pm9263/Kconfig index 339a6ea..5b47d34 100644 --- a/board/ronetix/pm9263/Kconfig +++ b/board/ronetix/pm9263/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "ronetix"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "pm9263"

diff --git a/board/ronetix/pm9g45/Kconfig b/board/ronetix/pm9g45/Kconfig index 65fc5c4..ad5309f 100644 --- a/board/ronetix/pm9g45/Kconfig +++ b/board/ronetix/pm9g45/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "ronetix"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "pm9g45"

diff --git a/board/siemens/corvus/Kconfig b/board/siemens/corvus/Kconfig index 7b505aa..69fe0f0 100644 --- a/board/siemens/corvus/Kconfig +++ b/board/siemens/corvus/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "siemens"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "corvus"

diff --git a/board/siemens/taurus/Kconfig b/board/siemens/taurus/Kconfig index c07d244..cf71e4c 100644 --- a/board/siemens/taurus/Kconfig +++ b/board/siemens/taurus/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "siemens"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "taurus"

diff --git a/board/taskit/stamp9g20/Kconfig b/board/taskit/stamp9g20/Kconfig index 3139f9a..1121dac 100644 --- a/board/taskit/stamp9g20/Kconfig +++ b/board/taskit/stamp9g20/Kconfig @@ -6,9 +6,6 @@ config SYS_BOARD config SYS_VENDOR default "taskit"

-config SYS_SOC - default "at91" - config SYS_CONFIG_NAME default "stamp9g20"

diff --git a/configs/afeb9260_defconfig b/configs/afeb9260_defconfig index 2616d2d..694d24d 100644 --- a/configs/afeb9260_defconfig +++ b/configs/afeb9260_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AFEB9260=y diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig index 95b5c27..e1fd2ec 100644 --- a/configs/at91rm9200ek_defconfig +++ b/configs/at91rm9200ek_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91RM9200EK=y diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig index 5039ebc..64f5e54 100644 --- a/configs/at91rm9200ek_ram_defconfig +++ b/configs/at91rm9200ek_ram_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91RM9200EK=y diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig index 7f929c8..46ce31b 100644 --- a/configs/at91sam9260ek_dataflash_cs0_defconfig +++ b/configs/at91sam9260ek_dataflash_cs0_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig index e2c32bf..9fd40df 100644 --- a/configs/at91sam9260ek_dataflash_cs1_defconfig +++ b/configs/at91sam9260ek_dataflash_cs1_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig index 1168cac..98adab2 100644 --- a/configs/at91sam9260ek_nandflash_defconfig +++ b/configs/at91sam9260ek_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig index 486eeb2..9c311a3 100644 --- a/configs/at91sam9261ek_dataflash_cs0_defconfig +++ b/configs/at91sam9261ek_dataflash_cs0_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig index 5f42a90..3711fe4 100644 --- a/configs/at91sam9261ek_dataflash_cs3_defconfig +++ b/configs/at91sam9261ek_dataflash_cs3_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig index 4d7aa90..503f760 100644 --- a/configs/at91sam9261ek_nandflash_defconfig +++ b/configs/at91sam9261ek_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig index 4dce54e..15925b6 100644 --- a/configs/at91sam9263ek_dataflash_cs0_defconfig +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9263EK=y diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig index 4dce54e..15925b6 100644 --- a/configs/at91sam9263ek_dataflash_defconfig +++ b/configs/at91sam9263ek_dataflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9263EK=y diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig index 6f60daa..457fb1a 100644 --- a/configs/at91sam9263ek_nandflash_defconfig +++ b/configs/at91sam9263ek_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9263EK=y diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig index 944c14d..e49b177 100644 --- a/configs/at91sam9263ek_norflash_boot_defconfig +++ b/configs/at91sam9263ek_norflash_boot_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9263EK=y diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig index b54ef7f..fcd1764 100644 --- a/configs/at91sam9263ek_norflash_defconfig +++ b/configs/at91sam9263ek_norflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9263EK=y diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig index 132102d..8334122 100644 --- a/configs/at91sam9g10ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig index 3dd3f9a..25626ce 100644 --- a/configs/at91sam9g10ek_dataflash_cs3_defconfig +++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig index a2bd6df..7ae0794 100644 --- a/configs/at91sam9g10ek_nandflash_defconfig +++ b/configs/at91sam9g10ek_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9261EK=y diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig index 4eef04f..e277557 100644 --- a/configs/at91sam9g20ek_2mmc_defconfig +++ b/configs/at91sam9g20ek_2mmc_defconfig @@ -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 diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig index 1a4c505..29219fb 100644 --- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig +++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig @@ -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 diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig index cf35782..4587f49 100644 --- a/configs/at91sam9g20ek_dataflash_cs0_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig index 1377ad9..c9fcc6e 100644 --- a/configs/at91sam9g20ek_dataflash_cs1_defconfig +++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig index cfe9127..1d60e0a 100644 --- a/configs/at91sam9g20ek_nandflash_defconfig +++ b/configs/at91sam9g20ek_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig index 1681bc8..6949d3a 100644 --- a/configs/at91sam9m10g45ek_mmc_defconfig +++ b/configs/at91sam9m10g45ek_mmc_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_MMC" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9M10G45EK=y diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig index 61ae56e..30967e3 100644 --- a/configs/at91sam9m10g45ek_nandflash_defconfig +++ b/configs/at91sam9m10g45ek_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9M10G45EK=y diff --git a/configs/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig index 71d1658..4fc417a 100644 --- a/configs/at91sam9n12ek_mmc_defconfig +++ b/configs/at91sam9n12ek_mmc_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_MMC" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9N12EK=y diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig index 6f677b1..f908246 100644 --- a/configs/at91sam9n12ek_nandflash_defconfig +++ b/configs/at91sam9n12ek_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9N12EK=y diff --git a/configs/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig index 7e898f0..d106b5a 100644 --- a/configs/at91sam9n12ek_spiflash_defconfig +++ b/configs/at91sam9n12ek_spiflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9N12,SYS_USE_SPIFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9N12EK=y diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index 90516e0..ee632d1 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9RLEK=y diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig index 0e2edfd..6465f57 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9RLEK=y diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig index d00eed5..15b5fa9 100644 --- a/configs/at91sam9x5ek_dataflash_defconfig +++ b/configs/at91sam9x5ek_dataflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9X5EK=y diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index 64f7af9..c8096c2 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_MMC" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9X5EK=y diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig index 47cd1e0..c2ebb00 100644 --- a/configs/at91sam9x5ek_nandflash_defconfig +++ b/configs/at91sam9x5ek_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9X5EK=y diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig index 1b7391e..76f68a6 100644 --- a/configs/at91sam9x5ek_spiflash_defconfig +++ b/configs/at91sam9x5ek_spiflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_SPIFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9X5EK=y diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig index ccbccd4..1449791 100644 --- a/configs/at91sam9xeek_dataflash_cs0_defconfig +++ b/configs/at91sam9xeek_dataflash_cs0_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig index e8f4cc3..b465064 100644 --- a/configs/at91sam9xeek_dataflash_cs1_defconfig +++ b/configs/at91sam9xeek_dataflash_cs1_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig index 49c5d78..7e73d48 100644 --- a/configs/at91sam9xeek_nandflash_defconfig +++ b/configs/at91sam9xeek_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_AT91SAM9260EK=y diff --git a/configs/axm_defconfig b/configs/axm_defconfig index 076ad0f..abb64b6 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -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 diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 5d60847..82be323 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -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 diff --git a/configs/cpu9260_128M_defconfig b/configs/cpu9260_128M_defconfig index 86fc6bd..6fe59dd 100644 --- a/configs/cpu9260_128M_defconfig +++ b/configs/cpu9260_128M_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y diff --git a/configs/cpu9260_defconfig b/configs/cpu9260_defconfig index 10299e3..63e7c73 100644 --- a/configs/cpu9260_defconfig +++ b/configs/cpu9260_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y diff --git a/configs/cpu9260_nand_128M_defconfig b/configs/cpu9260_nand_128M_defconfig index e582a15..11c5bce 100644 --- a/configs/cpu9260_nand_128M_defconfig +++ b/configs/cpu9260_nand_128M_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,CPU9260_128M,NANDBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y diff --git a/configs/cpu9260_nand_defconfig b/configs/cpu9260_nand_defconfig index 40988cd..d4d6ec9 100644 --- a/configs/cpu9260_nand_defconfig +++ b/configs/cpu9260_nand_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9260,NANDBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y diff --git a/configs/cpu9G20_128M_defconfig b/configs/cpu9G20_128M_defconfig index 4c28d25..8d33f08 100644 --- a/configs/cpu9G20_128M_defconfig +++ b/configs/cpu9G20_128M_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y diff --git a/configs/cpu9G20_defconfig b/configs/cpu9G20_defconfig index 468b2c8..fcfebb8 100644 --- a/configs/cpu9G20_defconfig +++ b/configs/cpu9G20_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y diff --git a/configs/cpu9G20_nand_128M_defconfig b/configs/cpu9G20_nand_128M_defconfig index a74df9d..315042d 100644 --- a/configs/cpu9G20_nand_128M_defconfig +++ b/configs/cpu9G20_nand_128M_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,CPU9G20_128M,NANDBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y diff --git a/configs/cpu9G20_nand_defconfig b/configs/cpu9G20_nand_defconfig index 11cc276..c405c50 100644 --- a/configs/cpu9G20_nand_defconfig +++ b/configs/cpu9G20_nand_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CPU9G20,NANDBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPU9260=y diff --git a/configs/cpuat91_defconfig b/configs/cpuat91_defconfig index d25bd3a..5a1ef3a 100644 --- a/configs/cpuat91_defconfig +++ b/configs/cpuat91_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPUAT91=y diff --git a/configs/cpuat91_ram_defconfig b/configs/cpuat91_ram_defconfig index f5b722d..2759192 100644 --- a/configs/cpuat91_ram_defconfig +++ b/configs/cpuat91_ram_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_CPUAT91=y diff --git a/configs/eb_cpux9k2_defconfig b/configs/eb_cpux9k2_defconfig index 5f0ab44..257fee5 100644 --- a/configs/eb_cpux9k2_defconfig +++ b/configs/eb_cpux9k2_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_EB_CPUX9K2=y diff --git a/configs/eb_cpux9k2_ram_defconfig b/configs/eb_cpux9k2_ram_defconfig index c6e8b71..4393ccc 100644 --- a/configs/eb_cpux9k2_ram_defconfig +++ b/configs/eb_cpux9k2_ram_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_EB_CPUX9K2=y diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index 5be495c..9a3d40a 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_ETHERNUT5=y diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig index fa737ef..0430d58 100644 --- a/configs/meesc_dataflash_defconfig +++ b/configs/meesc_dataflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_MEESC=y diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig index f58efbb..b8a48f8 100644 --- a/configs/meesc_defconfig +++ b/configs/meesc_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_MEESC=y diff --git a/configs/otc570_dataflash_defconfig b/configs/otc570_dataflash_defconfig index 992d6b6..7aac6d8 100644 --- a/configs/otc570_dataflash_defconfig +++ b/configs/otc570_dataflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_OTC570=y diff --git a/configs/otc570_defconfig b/configs/otc570_defconfig index 65295cb..5204245 100644 --- a/configs/otc570_defconfig +++ b/configs/otc570_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_OTC570=y diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig index b8a0248..0c7efc7 100644 --- a/configs/pm9261_defconfig +++ b/configs/pm9261_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_PM9261=y diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig index 3a5029a..6e88046 100644 --- a/configs/pm9263_defconfig +++ b/configs/pm9263_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_PM9263=y diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig index 89297e0..112ad5f 100644 --- a/configs/pm9g45_defconfig +++ b/configs/pm9g45_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_PM9G45=y diff --git a/configs/portuxg20_defconfig b/configs/portuxg20_defconfig index b1634e9..9f3a8e1 100644 --- a/configs/portuxg20_defconfig +++ b/configs/portuxg20_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,PORTUXG20" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_STAMP9G20=y diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index a7d791f..1d95487 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -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 diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index b972860..91dd104 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -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 diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index 3f8d997..c03106c 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -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 diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig index 7a92417..54bf79c 100644 --- a/configs/sama5d3xek_nandflash_defconfig +++ b/configs/sama5d3xek_nandflash_defconfig @@ -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 diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index c83a7ab..07bff18 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -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 diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index 73df28c..da5f811 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -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 diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index 046fe06..ea06200 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -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 diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index 755dd8b..0408fa4 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -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 diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index aafb4c2..1f66d37 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -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 diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig index d430fa7..c623d9b 100644 --- a/configs/sama5d4ek_nandflash_defconfig +++ b/configs/sama5d4ek_nandflash_defconfig @@ -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 diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index 796fa4b..3b4e124 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -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 diff --git a/configs/sbc35_a9g20_eeprom_defconfig b/configs/sbc35_a9g20_eeprom_defconfig index aa9cd3e..cd0909c 100644 --- a/configs/sbc35_a9g20_eeprom_defconfig +++ b/configs/sbc35_a9g20_eeprom_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_EEPROM" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_SBC35_A9G20=y diff --git a/configs/sbc35_a9g20_nandflash_defconfig b/configs/sbc35_a9g20_nandflash_defconfig index fba9f31..017346f 100644 --- a/configs/sbc35_a9g20_nandflash_defconfig +++ b/configs/sbc35_a9g20_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_SBC35_A9G20=y diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index 97c49f3..3a47505 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -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 diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index d5f1d9f..1f0244b 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -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 diff --git a/configs/stamp9g20_defconfig b/configs/stamp9g20_defconfig index 8c0f874..03bf492 100644 --- a/configs/stamp9g20_defconfig +++ b/configs/stamp9g20_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_STAMP9G20=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 438e25d..fac3316 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -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 diff --git a/configs/tny_a9260_eeprom_defconfig b/configs/tny_a9260_eeprom_defconfig index a662669..28a1d5e 100644 --- a/configs/tny_a9260_eeprom_defconfig +++ b/configs/tny_a9260_eeprom_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_EEPROM" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_TNY_A9260=y diff --git a/configs/tny_a9260_nandflash_defconfig b/configs/tny_a9260_nandflash_defconfig index 41fd9c1..14710c0 100644 --- a/configs/tny_a9260_nandflash_defconfig +++ b/configs/tny_a9260_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_TNY_A9260=y diff --git a/configs/tny_a9g20_eeprom_defconfig b/configs/tny_a9g20_eeprom_defconfig index a2eb60e..f4023cc 100644 --- a/configs/tny_a9g20_eeprom_defconfig +++ b/configs/tny_a9g20_eeprom_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_EEPROM" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_TNY_A9260=y diff --git a/configs/tny_a9g20_nandflash_defconfig b/configs/tny_a9g20_nandflash_defconfig index 60ebfa2..2452e1e 100644 --- a/configs/tny_a9g20_nandflash_defconfig +++ b/configs/tny_a9g20_nandflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_TNY_A9260=y diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig index 8c0ac11..ae2b9a1 100644 --- a/configs/usb_a9263_dataflash_defconfig +++ b/configs/usb_a9263_dataflash_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_USB_A9263=y diff --git a/configs/vl_ma2sc_defconfig b/configs/vl_ma2sc_defconfig index 39cd725..e6478a7 100644 --- a/configs/vl_ma2sc_defconfig +++ b/configs/vl_ma2sc_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_VL_MA2SC=y diff --git a/configs/vl_ma2sc_ram_defconfig b/configs/vl_ma2sc_ram_defconfig index 70a07ab..fdb262d 100644 --- a/configs/vl_ma2sc_ram_defconfig +++ b/configs/vl_ma2sc_ram_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="RAMLOAD" CONFIG_ARM=y +CONFIG_ARCH_AT91=y CONFIG_TARGET_VL_MA2SC=y

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-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

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---

Changes in v3: None

arch/arm/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ebb7dc3..5da2c23 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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

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 yamada.m@jp.panasonic.com Acked-by: Andreas Bießmann andreas.devel@googlemail.co ---

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%)

diff --git a/MAINTAINERS b/MAINTAINERS index 74a56ec..a558bd4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -76,8 +76,7 @@ ARM ATMEL AT91 M: Andreas Bießmann andreas.devel@googlemail.com 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 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5da2c23..f4e9af6 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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))

diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index 35d8d38..ba4f390 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -1,4 +1,3 @@ -obj-$(CONFIG_AT91FAMILY) += at91-common/ obj-$(CONFIG_TEGRA20) += tegra20-common/ obj-$(CONFIG_TEGRA30) += tegra30-common/ obj-$(CONFIG_TEGRA114) += tegra114-common/ diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile index a72e5de..a16838b 100644 --- a/arch/arm/cpu/arm920t/Makefile +++ b/arch/arm/cpu/arm920t/Makefile @@ -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/ diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index adcea9f..f41357a 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -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/ diff --git a/arch/arm/cpu/arm926ejs/at91/config.mk b/arch/arm/cpu/arm926ejs/at91/config.mk deleted file mode 100644 index 370630d..0000000 --- a/arch/arm/cpu/arm926ejs/at91/config.mk +++ /dev/null @@ -1,2 +0,0 @@ -PF_CPPFLAGS_TUNE := $(call cc-option,-mtune=arm926ejs,) -PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_TUNE) diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 409e6f5..6dbca26 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -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/ diff --git a/arch/arm/cpu/armv7/at91/config.mk b/arch/arm/cpu/armv7/at91/config.mk deleted file mode 100644 index db60308..0000000 --- a/arch/arm/cpu/armv7/at91/config.mk +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (C) 2014, Andreas Bießmann andreas.devel@googlemail.com -# -# SPDX-License-Identifier: GPL-2.0+ -# -ifndef CONFIG_SPL_BUILD -ALL-y += u-boot.img -endif diff --git a/arch/arm/cpu/at91-common/Makefile b/arch/arm/mach-at91/Makefile similarity index 58% rename from arch/arm/cpu/at91-common/Makefile rename to arch/arm/mach-at91/Makefile index 03614d4..e596ba6 100644 --- a/arch/arm/cpu/at91-common/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -1,13 +1,3 @@ -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# (C) Copyright 2013 Atmel Corporation -# Bo Shen voice.shen@atmel.com -# -# 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/ diff --git a/arch/arm/cpu/arm920t/at91/Makefile b/arch/arm/mach-at91/arm920t/Makefile similarity index 100% rename from arch/arm/cpu/arm920t/at91/Makefile rename to arch/arm/mach-at91/arm920t/Makefile diff --git a/arch/arm/cpu/arm920t/at91/at91rm9200_devices.c b/arch/arm/mach-at91/arm920t/at91rm9200_devices.c similarity index 100% rename from arch/arm/cpu/arm920t/at91/at91rm9200_devices.c rename to arch/arm/mach-at91/arm920t/at91rm9200_devices.c diff --git a/arch/arm/cpu/arm920t/at91/clock.c b/arch/arm/mach-at91/arm920t/clock.c similarity index 100% rename from arch/arm/cpu/arm920t/at91/clock.c rename to arch/arm/mach-at91/arm920t/clock.c diff --git a/arch/arm/cpu/arm920t/at91/cpu.c b/arch/arm/mach-at91/arm920t/cpu.c similarity index 100% rename from arch/arm/cpu/arm920t/at91/cpu.c rename to arch/arm/mach-at91/arm920t/cpu.c diff --git a/arch/arm/cpu/arm920t/at91/lowlevel_init.S b/arch/arm/mach-at91/arm920t/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/arm920t/at91/lowlevel_init.S rename to arch/arm/mach-at91/arm920t/lowlevel_init.S diff --git a/arch/arm/cpu/arm920t/at91/reset.c b/arch/arm/mach-at91/arm920t/reset.c similarity index 100% rename from arch/arm/cpu/arm920t/at91/reset.c rename to arch/arm/mach-at91/arm920t/reset.c diff --git a/arch/arm/cpu/arm920t/at91/timer.c b/arch/arm/mach-at91/arm920t/timer.c similarity index 100% rename from arch/arm/cpu/arm920t/at91/timer.c rename to arch/arm/mach-at91/arm920t/timer.c diff --git a/arch/arm/cpu/arm926ejs/at91/Makefile b/arch/arm/mach-at91/arm926ejs/Makefile similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/Makefile rename to arch/arm/mach-at91/arm926ejs/Makefile diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c rename to arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c rename to arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c rename to arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c rename to arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c rename to arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c rename to arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c rename to arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c diff --git a/arch/arm/cpu/arm926ejs/at91/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/clock.c rename to arch/arm/mach-at91/arm926ejs/clock.c diff --git a/arch/arm/cpu/arm926ejs/at91/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/cpu.c rename to arch/arm/mach-at91/arm926ejs/cpu.c diff --git a/arch/arm/cpu/arm926ejs/at91/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/eflash.c rename to arch/arm/mach-at91/arm926ejs/eflash.c diff --git a/arch/arm/cpu/arm926ejs/at91/led.c b/arch/arm/mach-at91/arm926ejs/led.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/led.c rename to arch/arm/mach-at91/arm926ejs/led.c diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/mach-at91/arm926ejs/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/lowlevel_init.S rename to arch/arm/mach-at91/arm926ejs/lowlevel_init.S diff --git a/arch/arm/cpu/arm926ejs/at91/reset.c b/arch/arm/mach-at91/arm926ejs/reset.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/reset.c rename to arch/arm/mach-at91/arm926ejs/reset.c diff --git a/arch/arm/cpu/arm926ejs/at91/timer.c b/arch/arm/mach-at91/arm926ejs/timer.c similarity index 100% rename from arch/arm/cpu/arm926ejs/at91/timer.c rename to arch/arm/mach-at91/arm926ejs/timer.c diff --git a/arch/arm/cpu/armv7/at91/Makefile b/arch/arm/mach-at91/armv7/Makefile similarity index 100% rename from arch/arm/cpu/armv7/at91/Makefile rename to arch/arm/mach-at91/armv7/Makefile diff --git a/arch/arm/cpu/armv7/at91/clock.c b/arch/arm/mach-at91/armv7/clock.c similarity index 100% rename from arch/arm/cpu/armv7/at91/clock.c rename to arch/arm/mach-at91/armv7/clock.c diff --git a/arch/arm/cpu/armv7/at91/cpu.c b/arch/arm/mach-at91/armv7/cpu.c similarity index 100% rename from arch/arm/cpu/armv7/at91/cpu.c rename to arch/arm/mach-at91/armv7/cpu.c diff --git a/arch/arm/cpu/armv7/at91/reset.c b/arch/arm/mach-at91/armv7/reset.c similarity index 100% rename from arch/arm/cpu/armv7/at91/reset.c rename to arch/arm/mach-at91/armv7/reset.c diff --git a/arch/arm/cpu/armv7/at91/sama5d3_devices.c b/arch/arm/mach-at91/armv7/sama5d3_devices.c similarity index 100% rename from arch/arm/cpu/armv7/at91/sama5d3_devices.c rename to arch/arm/mach-at91/armv7/sama5d3_devices.c diff --git a/arch/arm/cpu/armv7/at91/sama5d4_devices.c b/arch/arm/mach-at91/armv7/sama5d4_devices.c similarity index 100% rename from arch/arm/cpu/armv7/at91/sama5d4_devices.c rename to arch/arm/mach-at91/armv7/sama5d4_devices.c diff --git a/arch/arm/cpu/armv7/at91/timer.c b/arch/arm/mach-at91/armv7/timer.c similarity index 100% rename from arch/arm/cpu/armv7/at91/timer.c rename to arch/arm/mach-at91/armv7/timer.c diff --git a/arch/arm/mach-at91/config.mk b/arch/arm/mach-at91/config.mk new file mode 100644 index 0000000..7168abb --- /dev/null +++ b/arch/arm/mach-at91/config.mk @@ -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 diff --git a/arch/arm/cpu/at91-common/mpddrc.c b/arch/arm/mach-at91/mpddrc.c similarity index 100% rename from arch/arm/cpu/at91-common/mpddrc.c rename to arch/arm/mach-at91/mpddrc.c diff --git a/arch/arm/cpu/at91-common/phy.c b/arch/arm/mach-at91/phy.c similarity index 100% rename from arch/arm/cpu/at91-common/phy.c rename to arch/arm/mach-at91/phy.c diff --git a/arch/arm/cpu/at91-common/sdram.c b/arch/arm/mach-at91/sdram.c similarity index 100% rename from arch/arm/cpu/at91-common/sdram.c rename to arch/arm/mach-at91/sdram.c diff --git a/arch/arm/cpu/at91-common/spl.c b/arch/arm/mach-at91/spl.c similarity index 100% rename from arch/arm/cpu/at91-common/spl.c rename to arch/arm/mach-at91/spl.c diff --git a/arch/arm/cpu/at91-common/spl_at91.c b/arch/arm/mach-at91/spl_at91.c similarity index 100% rename from arch/arm/cpu/at91-common/spl_at91.c rename to arch/arm/mach-at91/spl_at91.c diff --git a/arch/arm/cpu/at91-common/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c similarity index 100% rename from arch/arm/cpu/at91-common/spl_atmel.c rename to arch/arm/mach-at91/spl_atmel.c diff --git a/arch/arm/cpu/at91-common/u-boot-spl.lds b/arch/arm/mach-at91/u-boot-spl.lds similarity index 100% rename from arch/arm/cpu/at91-common/u-boot-spl.lds rename to arch/arm/mach-at91/u-boot-spl.lds diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 5a0ab28..5dab61d 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -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 diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index cccc1ed..bd288be 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -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

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/*

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Tested-by: Simon Glass sjg@chromium.org [ on nyan-big ] Cc: Stephen Warren swarren@nvidia.com Cc: Tom Warren twarren@nvidia.com ---

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%)

diff --git a/MAINTAINERS b/MAINTAINERS index a558bd4..63085fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -146,9 +146,7 @@ ARM TEGRA M: Tom Warren twarren@nvidia.com 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 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 06c3468..adecafc 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f4e9af6..f1ae929 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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))

diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index ba4f390..6bea3d3 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -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 diff --git a/arch/arm/cpu/arm720t/Makefile b/arch/arm/cpu/arm720t/Makefile index 9f61ea2..243a123 100644 --- a/arch/arm/cpu/arm720t/Makefile +++ b/arch/arm/cpu/arm720t/Makefile @@ -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/ diff --git a/arch/arm/cpu/arm720t/tegra-common/Makefile b/arch/arm/cpu/arm720t/tegra-common/Makefile deleted file mode 100644 index a9c2b67..0000000 --- a/arch/arm/cpu/arm720t/tegra-common/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_SPL_BUILD) += spl.o -obj-y += cpu.o diff --git a/arch/arm/cpu/arm720t/tegra114/Makefile b/arch/arm/cpu/arm720t/tegra114/Makefile deleted file mode 100644 index ea3e55e..0000000 --- a/arch/arm/cpu/arm720t/tegra114/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@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 diff --git a/arch/arm/cpu/arm720t/tegra124/Makefile b/arch/arm/cpu/arm720t/tegra124/Makefile deleted file mode 100644 index 61abf45..0000000 --- a/arch/arm/cpu/arm720t/tegra124/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# (C) Copyright 2013-2014 -# NVIDIA Corporation <www.nvidia.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += cpu.o diff --git a/arch/arm/cpu/arm720t/tegra20/Makefile b/arch/arm/cpu/arm720t/tegra20/Makefile deleted file mode 100644 index 12243fa..0000000 --- a/arch/arm/cpu/arm720t/tegra20/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += cpu.o diff --git a/arch/arm/cpu/arm720t/tegra30/Makefile b/arch/arm/cpu/arm720t/tegra30/Makefile deleted file mode 100644 index 6ff4c55..0000000 --- a/arch/arm/cpu/arm720t/tegra30/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. -# -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@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 diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 6dbca26..91e6923 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -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/ diff --git a/arch/arm/cpu/armv7/tegra-common/Makefile b/arch/arm/cpu/armv7/tegra-common/Makefile deleted file mode 100644 index 463c260..0000000 --- a/arch/arm/cpu/armv7/tegra-common/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_CMD_ENTERRCM) += cmd_enterrcm.o diff --git a/arch/arm/cpu/armv7/tegra20/Makefile b/arch/arm/cpu/armv7/tegra20/Makefile deleted file mode 100644 index 9b4295c..0000000 --- a/arch/arm/cpu/armv7/tegra20/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# (C) Copyright 2010,2011 Nvidia Corporation. -# -# (C) Copyright 2000-2003 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-$(CONFIG_PWM_TEGRA) += pwm.o -obj-$(CONFIG_VIDEO_TEGRA) += display.o diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig b/arch/arm/mach-tegra/Kconfig similarity index 76% rename from arch/arm/cpu/armv7/tegra-common/Kconfig rename to arch/arm/mach-tegra/Kconfig index ee32469..3a8e2b1 100644 --- a/arch/arm/cpu/armv7/tegra-common/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -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 diff --git a/arch/arm/cpu/tegra-common/Makefile b/arch/arm/mach-tegra/Makefile similarity index 61% rename from arch/arm/cpu/tegra-common/Makefile rename to arch/arm/mach-tegra/Makefile index a78869e..04cef0a 100644 --- a/arch/arm/cpu/tegra-common/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -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/ diff --git a/arch/arm/cpu/tegra-common/ap.c b/arch/arm/mach-tegra/ap.c similarity index 100% rename from arch/arm/cpu/tegra-common/ap.c rename to arch/arm/mach-tegra/ap.c diff --git a/arch/arm/cpu/tegra-common/board.c b/arch/arm/mach-tegra/board.c similarity index 100% rename from arch/arm/cpu/tegra-common/board.c rename to arch/arm/mach-tegra/board.c diff --git a/arch/arm/cpu/tegra-common/cache.c b/arch/arm/mach-tegra/cache.c similarity index 100% rename from arch/arm/cpu/tegra-common/cache.c rename to arch/arm/mach-tegra/cache.c diff --git a/arch/arm/cpu/tegra-common/clock.c b/arch/arm/mach-tegra/clock.c similarity index 100% rename from arch/arm/cpu/tegra-common/clock.c rename to arch/arm/mach-tegra/clock.c diff --git a/arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c similarity index 100% rename from arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c rename to arch/arm/mach-tegra/cmd_enterrcm.c diff --git a/arch/arm/cpu/arm720t/tegra-common/cpu.c b/arch/arm/mach-tegra/cpu.c similarity index 100% rename from arch/arm/cpu/arm720t/tegra-common/cpu.c rename to arch/arm/mach-tegra/cpu.c diff --git a/arch/arm/cpu/arm720t/tegra-common/cpu.h b/arch/arm/mach-tegra/cpu.h similarity index 100% rename from arch/arm/cpu/arm720t/tegra-common/cpu.h rename to arch/arm/mach-tegra/cpu.h diff --git a/arch/arm/cpu/tegra-common/lowlevel_init.S b/arch/arm/mach-tegra/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/tegra-common/lowlevel_init.S rename to arch/arm/mach-tegra/lowlevel_init.S diff --git a/arch/arm/cpu/tegra-common/pinmux-common.c b/arch/arm/mach-tegra/pinmux-common.c similarity index 100% rename from arch/arm/cpu/tegra-common/pinmux-common.c rename to arch/arm/mach-tegra/pinmux-common.c diff --git a/arch/arm/cpu/tegra-common/powergate.c b/arch/arm/mach-tegra/powergate.c similarity index 100% rename from arch/arm/cpu/tegra-common/powergate.c rename to arch/arm/mach-tegra/powergate.c diff --git a/arch/arm/cpu/arm720t/tegra-common/spl.c b/arch/arm/mach-tegra/spl.c similarity index 100% rename from arch/arm/cpu/arm720t/tegra-common/spl.c rename to arch/arm/mach-tegra/spl.c diff --git a/arch/arm/cpu/tegra-common/sys_info.c b/arch/arm/mach-tegra/sys_info.c similarity index 100% rename from arch/arm/cpu/tegra-common/sys_info.c rename to arch/arm/mach-tegra/sys_info.c diff --git a/arch/arm/cpu/armv7/tegra114/Kconfig b/arch/arm/mach-tegra/tegra114/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/tegra114/Kconfig rename to arch/arm/mach-tegra/tegra114/Kconfig diff --git a/arch/arm/cpu/tegra114-common/Makefile b/arch/arm/mach-tegra/tegra114/Makefile similarity index 89% rename from arch/arm/cpu/tegra114-common/Makefile rename to arch/arm/mach-tegra/tegra114/Makefile index d959b57..7489f5f 100644 --- a/arch/arm/cpu/tegra114-common/Makefile +++ b/arch/arm/mach-tegra/tegra114/Makefile @@ -1,9 +1,6 @@ # # Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. # -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@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 diff --git a/arch/arm/cpu/tegra114-common/clock.c b/arch/arm/mach-tegra/tegra114/clock.c similarity index 100% rename from arch/arm/cpu/tegra114-common/clock.c rename to arch/arm/mach-tegra/tegra114/clock.c diff --git a/arch/arm/cpu/arm720t/tegra114/cpu.c b/arch/arm/mach-tegra/tegra114/cpu.c similarity index 99% rename from arch/arm/cpu/arm720t/tegra114/cpu.c rename to arch/arm/mach-tegra/tegra114/cpu.c index 5ed3bb9..18dc1af 100644 --- a/arch/arm/cpu/arm720t/tegra114/cpu.c +++ b/arch/arm/mach-tegra/tegra114/cpu.c @@ -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) diff --git a/arch/arm/cpu/tegra114-common/funcmux.c b/arch/arm/mach-tegra/tegra114/funcmux.c similarity index 100% rename from arch/arm/cpu/tegra114-common/funcmux.c rename to arch/arm/mach-tegra/tegra114/funcmux.c diff --git a/arch/arm/cpu/tegra114-common/pinmux.c b/arch/arm/mach-tegra/tegra114/pinmux.c similarity index 100% rename from arch/arm/cpu/tegra114-common/pinmux.c rename to arch/arm/mach-tegra/tegra114/pinmux.c diff --git a/arch/arm/cpu/armv7/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/tegra124/Kconfig rename to arch/arm/mach-tegra/tegra124/Kconfig diff --git a/arch/arm/cpu/tegra124-common/Makefile b/arch/arm/mach-tegra/tegra124/Makefile similarity index 84% rename from arch/arm/cpu/tegra124-common/Makefile rename to arch/arm/mach-tegra/tegra124/Makefile index 7b59fb1..ef2da29 100644 --- a/arch/arm/cpu/tegra124-common/Makefile +++ b/arch/arm/mach-tegra/tegra124/Makefile @@ -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 diff --git a/arch/arm/cpu/tegra124-common/clock.c b/arch/arm/mach-tegra/tegra124/clock.c similarity index 100% rename from arch/arm/cpu/tegra124-common/clock.c rename to arch/arm/mach-tegra/tegra124/clock.c diff --git a/arch/arm/cpu/arm720t/tegra124/cpu.c b/arch/arm/mach-tegra/tegra124/cpu.c similarity index 99% rename from arch/arm/cpu/arm720t/tegra124/cpu.c rename to arch/arm/mach-tegra/tegra124/cpu.c index 6ff6aeb..974f203 100644 --- a/arch/arm/cpu/arm720t/tegra124/cpu.c +++ b/arch/arm/mach-tegra/tegra124/cpu.c @@ -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 */

diff --git a/arch/arm/cpu/tegra124-common/funcmux.c b/arch/arm/mach-tegra/tegra124/funcmux.c similarity index 100% rename from arch/arm/cpu/tegra124-common/funcmux.c rename to arch/arm/mach-tegra/tegra124/funcmux.c diff --git a/arch/arm/cpu/tegra124-common/pinmux.c b/arch/arm/mach-tegra/tegra124/pinmux.c similarity index 100% rename from arch/arm/cpu/tegra124-common/pinmux.c rename to arch/arm/mach-tegra/tegra124/pinmux.c diff --git a/arch/arm/cpu/tegra124-common/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c similarity index 100% rename from arch/arm/cpu/tegra124-common/xusb-padctl.c rename to arch/arm/mach-tegra/tegra124/xusb-padctl.c diff --git a/arch/arm/cpu/armv7/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/tegra20/Kconfig rename to arch/arm/mach-tegra/tegra20/Kconfig diff --git a/arch/arm/cpu/tegra20-common/Makefile b/arch/arm/mach-tegra/tegra20/Makefile similarity index 77% rename from arch/arm/cpu/tegra20-common/Makefile rename to arch/arm/mach-tegra/tegra20/Makefile index 0e4b3fc..d48f9bb 100644 --- a/arch/arm/cpu/tegra20-common/Makefile +++ b/arch/arm/mach-tegra/tegra20/Makefile @@ -1,12 +1,16 @@ # # (C) Copyright 2010,2011 Nvidia Corporation. # -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@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 diff --git a/arch/arm/cpu/tegra20-common/clock.c b/arch/arm/mach-tegra/tegra20/clock.c similarity index 100% rename from arch/arm/cpu/tegra20-common/clock.c rename to arch/arm/mach-tegra/tegra20/clock.c diff --git a/arch/arm/cpu/arm720t/tegra20/cpu.c b/arch/arm/mach-tegra/tegra20/cpu.c similarity index 98% rename from arch/arm/cpu/arm720t/tegra20/cpu.c rename to arch/arm/mach-tegra/tegra20/cpu.c index 2533899..67f49d7 100644 --- a/arch/arm/cpu/arm720t/tegra20/cpu.c +++ b/arch/arm/mach-tegra/tegra20/cpu.c @@ -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) { diff --git a/arch/arm/cpu/tegra20-common/crypto.c b/arch/arm/mach-tegra/tegra20/crypto.c similarity index 100% rename from arch/arm/cpu/tegra20-common/crypto.c rename to arch/arm/mach-tegra/tegra20/crypto.c diff --git a/arch/arm/cpu/tegra20-common/crypto.h b/arch/arm/mach-tegra/tegra20/crypto.h similarity index 100% rename from arch/arm/cpu/tegra20-common/crypto.h rename to arch/arm/mach-tegra/tegra20/crypto.h diff --git a/arch/arm/cpu/armv7/tegra20/display.c b/arch/arm/mach-tegra/tegra20/display.c similarity index 100% rename from arch/arm/cpu/armv7/tegra20/display.c rename to arch/arm/mach-tegra/tegra20/display.c diff --git a/arch/arm/cpu/tegra20-common/emc.c b/arch/arm/mach-tegra/tegra20/emc.c similarity index 100% rename from arch/arm/cpu/tegra20-common/emc.c rename to arch/arm/mach-tegra/tegra20/emc.c diff --git a/arch/arm/cpu/tegra20-common/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c similarity index 100% rename from arch/arm/cpu/tegra20-common/funcmux.c rename to arch/arm/mach-tegra/tegra20/funcmux.c diff --git a/arch/arm/cpu/tegra20-common/pinmux.c b/arch/arm/mach-tegra/tegra20/pinmux.c similarity index 100% rename from arch/arm/cpu/tegra20-common/pinmux.c rename to arch/arm/mach-tegra/tegra20/pinmux.c diff --git a/arch/arm/cpu/tegra20-common/pmu.c b/arch/arm/mach-tegra/tegra20/pmu.c similarity index 100% rename from arch/arm/cpu/tegra20-common/pmu.c rename to arch/arm/mach-tegra/tegra20/pmu.c diff --git a/arch/arm/cpu/armv7/tegra20/pwm.c b/arch/arm/mach-tegra/tegra20/pwm.c similarity index 100% rename from arch/arm/cpu/armv7/tegra20/pwm.c rename to arch/arm/mach-tegra/tegra20/pwm.c diff --git a/arch/arm/cpu/tegra20-common/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c similarity index 100% rename from arch/arm/cpu/tegra20-common/warmboot.c rename to arch/arm/mach-tegra/tegra20/warmboot.c diff --git a/arch/arm/cpu/tegra20-common/warmboot_avp.c b/arch/arm/mach-tegra/tegra20/warmboot_avp.c similarity index 100% rename from arch/arm/cpu/tegra20-common/warmboot_avp.c rename to arch/arm/mach-tegra/tegra20/warmboot_avp.c diff --git a/arch/arm/cpu/tegra20-common/warmboot_avp.h b/arch/arm/mach-tegra/tegra20/warmboot_avp.h similarity index 100% rename from arch/arm/cpu/tegra20-common/warmboot_avp.h rename to arch/arm/mach-tegra/tegra20/warmboot_avp.h diff --git a/arch/arm/cpu/armv7/tegra30/Kconfig b/arch/arm/mach-tegra/tegra30/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/tegra30/Kconfig rename to arch/arm/mach-tegra/tegra30/Kconfig diff --git a/arch/arm/cpu/tegra30-common/Makefile b/arch/arm/mach-tegra/tegra30/Makefile similarity index 89% rename from arch/arm/cpu/tegra30-common/Makefile rename to arch/arm/mach-tegra/tegra30/Makefile index d2d616e..bc250de 100644 --- a/arch/arm/cpu/tegra30-common/Makefile +++ b/arch/arm/mach-tegra/tegra30/Makefile @@ -1,9 +1,6 @@ # # Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. # -# (C) Copyright 2000-2008 -# Wolfgang Denk, DENX Software Engineering, wd@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 diff --git a/arch/arm/cpu/tegra30-common/clock.c b/arch/arm/mach-tegra/tegra30/clock.c similarity index 100% rename from arch/arm/cpu/tegra30-common/clock.c rename to arch/arm/mach-tegra/tegra30/clock.c diff --git a/arch/arm/cpu/arm720t/tegra30/cpu.c b/arch/arm/mach-tegra/tegra30/cpu.c similarity index 99% rename from arch/arm/cpu/arm720t/tegra30/cpu.c rename to arch/arm/mach-tegra/tegra30/cpu.c index 9003902..c76e74c 100644 --- a/arch/arm/cpu/arm720t/tegra30/cpu.c +++ b/arch/arm/mach-tegra/tegra30/cpu.c @@ -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) diff --git a/arch/arm/cpu/tegra30-common/funcmux.c b/arch/arm/mach-tegra/tegra30/funcmux.c similarity index 100% rename from arch/arm/cpu/tegra30-common/funcmux.c rename to arch/arm/mach-tegra/tegra30/funcmux.c diff --git a/arch/arm/cpu/tegra30-common/pinmux.c b/arch/arm/mach-tegra/tegra30/pinmux.c similarity index 100% rename from arch/arm/cpu/tegra30-common/pinmux.c rename to arch/arm/mach-tegra/tegra30/pinmux.c diff --git a/arch/arm/cpu/tegra-common/vpr.c b/arch/arm/mach-tegra/vpr.c similarity index 100% rename from arch/arm/cpu/tegra-common/vpr.c rename to arch/arm/mach-tegra/vpr.c diff --git a/arch/arm/cpu/tegra-common/xusb-padctl.c b/arch/arm/mach-tegra/xusb-padctl.c similarity index 100% rename from arch/arm/cpu/tegra-common/xusb-padctl.c rename to arch/arm/mach-tegra/xusb-padctl.c

Move arch/arm/cpu/arm926ejs/davinci/* -> arch/arm/mach-davinci/*

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Tom Rini trini@ti.com ---

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%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index adecafc..887c0d5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f1ae929..e321057 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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

diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index f41357a..27b4353 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -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/ diff --git a/arch/arm/cpu/arm926ejs/davinci/Kconfig b/arch/arm/mach-davinci/Kconfig similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/Kconfig rename to arch/arm/mach-davinci/Kconfig diff --git a/arch/arm/cpu/arm926ejs/davinci/Makefile b/arch/arm/mach-davinci/Makefile similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/Makefile rename to arch/arm/mach-davinci/Makefile diff --git a/arch/arm/cpu/arm926ejs/davinci/config.mk b/arch/arm/mach-davinci/config.mk similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/config.mk rename to arch/arm/mach-davinci/config.mk diff --git a/arch/arm/cpu/arm926ejs/davinci/cpu.c b/arch/arm/mach-davinci/cpu.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/cpu.c rename to arch/arm/mach-davinci/cpu.c diff --git a/arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c b/arch/arm/mach-davinci/da830_pinmux.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c rename to arch/arm/mach-davinci/da830_pinmux.c diff --git a/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c rename to arch/arm/mach-davinci/da850_lowlevel.c diff --git a/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c b/arch/arm/mach-davinci/da850_pinmux.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c rename to arch/arm/mach-davinci/da850_pinmux.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dm355.c b/arch/arm/mach-davinci/dm355.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/dm355.c rename to arch/arm/mach-davinci/dm355.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dm365.c b/arch/arm/mach-davinci/dm365.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/dm365.c rename to arch/arm/mach-davinci/dm365.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c b/arch/arm/mach-davinci/dm365_lowlevel.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c rename to arch/arm/mach-davinci/dm365_lowlevel.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/dm644x.c rename to arch/arm/mach-davinci/dm644x.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/dm646x.c rename to arch/arm/mach-davinci/dm646x.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dp83848.c b/arch/arm/mach-davinci/dp83848.c similarity index 98% rename from arch/arm/cpu/arm926ejs/davinci/dp83848.c rename to arch/arm/mach-davinci/dp83848.c index 603d507..6387e95 100644 --- a/arch/arm/cpu/arm926ejs/davinci/dp83848.c +++ b/arch/arm/mach-davinci/dp83848.c @@ -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

diff --git a/arch/arm/cpu/arm926ejs/davinci/et1011c.c b/arch/arm/mach-davinci/et1011c.c similarity index 94% rename from arch/arm/cpu/arm926ejs/davinci/et1011c.c rename to arch/arm/mach-davinci/et1011c.c index 9d53875..151020d 100644 --- a/arch/arm/cpu/arm926ejs/davinci/et1011c.c +++ b/arch/arm/mach-davinci/et1011c.c @@ -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

diff --git a/arch/arm/cpu/arm926ejs/davinci/ksz8873.c b/arch/arm/mach-davinci/ksz8873.c similarity index 95% rename from arch/arm/cpu/arm926ejs/davinci/ksz8873.c rename to arch/arm/mach-davinci/ksz8873.c index 4af5dd2..75af135 100644 --- a/arch/arm/cpu/arm926ejs/davinci/ksz8873.c +++ b/arch/arm/mach-davinci/ksz8873.c @@ -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) { diff --git a/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S b/arch/arm/mach-davinci/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S rename to arch/arm/mach-davinci/lowlevel_init.S diff --git a/arch/arm/cpu/arm926ejs/davinci/lxt972.c b/arch/arm/mach-davinci/lxt972.c similarity index 97% rename from arch/arm/cpu/arm926ejs/davinci/lxt972.c rename to arch/arm/mach-davinci/lxt972.c index c482fd9..a7356f9 100644 --- a/arch/arm/cpu/arm926ejs/davinci/lxt972.c +++ b/arch/arm/mach-davinci/lxt972.c @@ -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

diff --git a/arch/arm/cpu/arm926ejs/davinci/misc.c b/arch/arm/mach-davinci/misc.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/misc.c rename to arch/arm/mach-davinci/misc.c diff --git a/arch/arm/cpu/arm926ejs/davinci/pinmux.c b/arch/arm/mach-davinci/pinmux.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/pinmux.c rename to arch/arm/mach-davinci/pinmux.c diff --git a/arch/arm/cpu/arm926ejs/davinci/psc.c b/arch/arm/mach-davinci/psc.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/psc.c rename to arch/arm/mach-davinci/psc.c diff --git a/arch/arm/cpu/arm926ejs/davinci/reset.c b/arch/arm/mach-davinci/reset.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/reset.c rename to arch/arm/mach-davinci/reset.c diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/mach-davinci/spl.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/spl.c rename to arch/arm/mach-davinci/spl.c diff --git a/arch/arm/cpu/arm926ejs/davinci/timer.c b/arch/arm/mach-davinci/timer.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/timer.c rename to arch/arm/mach-davinci/timer.c

Move arch/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?

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Acked-by: Stefan Roese sr@denx.de Cc: Prafulla Wadaskar prafulla@marvell.com Cc: Luka Perkov luka.perkov@sartura.hr ---

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%)

diff --git a/MAINTAINERS b/MAINTAINERS index 63085fc..e4edf45 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -99,7 +99,7 @@ M: Prafulla Wadaskar prafulla@marvell.com M: Luka Perkov luka.perkov@sartura.hr 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 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 887c0d5..dba6518 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e321057..e09de51 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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

diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 27b4353..0b43a90 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -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/ diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig similarity index 100% rename from arch/arm/cpu/arm926ejs/kirkwood/Kconfig rename to arch/arm/mach-kirkwood/Kconfig diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile similarity index 100% rename from arch/arm/cpu/arm926ejs/kirkwood/Makefile rename to arch/arm/mach-kirkwood/Makefile diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cache.c b/arch/arm/mach-kirkwood/cache.c similarity index 100% rename from arch/arm/cpu/arm926ejs/kirkwood/cache.c rename to arch/arm/mach-kirkwood/cache.c diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c similarity index 100% rename from arch/arm/cpu/arm926ejs/kirkwood/cpu.c rename to arch/arm/mach-kirkwood/cpu.c diff --git a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c similarity index 100% rename from arch/arm/cpu/arm926ejs/kirkwood/mpp.c rename to arch/arm/mach-kirkwood/mpp.c

Move arch/arm/cpu/arm926ejs/nomadik/* -> arch/arm/mach-nomadik/*

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Nomadik Linux Team STN_WMM_nomadik_linux@list.st.com Cc: Alessandro Rubini rubini@unipv.it ---

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%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dba6518..1bac511 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e09de51..32d039c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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)) diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 0b43a90..ed0cf0f 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -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/ diff --git a/arch/arm/cpu/arm926ejs/nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig similarity index 100% rename from arch/arm/cpu/arm926ejs/nomadik/Kconfig rename to arch/arm/mach-nomadik/Kconfig diff --git a/arch/arm/cpu/arm926ejs/nomadik/Makefile b/arch/arm/mach-nomadik/Makefile similarity index 100% rename from arch/arm/cpu/arm926ejs/nomadik/Makefile rename to arch/arm/mach-nomadik/Makefile diff --git a/arch/arm/cpu/arm926ejs/nomadik/gpio.c b/arch/arm/mach-nomadik/gpio.c similarity index 100% rename from arch/arm/cpu/arm926ejs/nomadik/gpio.c rename to arch/arm/mach-nomadik/gpio.c diff --git a/arch/arm/cpu/arm926ejs/nomadik/reset.S b/arch/arm/mach-nomadik/reset.S similarity index 100% rename from arch/arm/cpu/arm926ejs/nomadik/reset.S rename to arch/arm/mach-nomadik/reset.S diff --git a/arch/arm/cpu/arm926ejs/nomadik/timer.c b/arch/arm/mach-nomadik/timer.c similarity index 100% rename from arch/arm/cpu/arm926ejs/nomadik/timer.c rename to arch/arm/mach-nomadik/timer.c

Move arch/arm/cpu/armv7/highbank/* -> arch/arm/mach-highbank/*

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Rob Herring robh@kernel.org ---

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%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1bac511..f981541 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 32d039c..97858fa 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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 diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 91e6923..29ba6e2 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -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/ diff --git a/arch/arm/cpu/armv7/highbank/Kconfig b/arch/arm/mach-highbank/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/highbank/Kconfig rename to arch/arm/mach-highbank/Kconfig diff --git a/arch/arm/cpu/armv7/highbank/Makefile b/arch/arm/mach-highbank/Makefile similarity index 100% rename from arch/arm/cpu/armv7/highbank/Makefile rename to arch/arm/mach-highbank/Makefile diff --git a/arch/arm/cpu/armv7/highbank/timer.c b/arch/arm/mach-highbank/timer.c similarity index 100% rename from arch/arm/cpu/armv7/highbank/timer.c rename to arch/arm/mach-highbank/timer.c

Move arch/arm/cpu/arm926ejs/orion5x/* -> arch/arm/mach-orion5x/*

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Albert ARIBAUD albert.u.boot@aribaud.net ---

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%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f981541..038961c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 97858fa..6bcf8ec 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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)) diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index ed0cf0f..3cb741d 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -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/ diff --git a/arch/arm/cpu/arm926ejs/orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig similarity index 100% rename from arch/arm/cpu/arm926ejs/orion5x/Kconfig rename to arch/arm/mach-orion5x/Kconfig diff --git a/arch/arm/cpu/arm926ejs/orion5x/Makefile b/arch/arm/mach-orion5x/Makefile similarity index 100% rename from arch/arm/cpu/arm926ejs/orion5x/Makefile rename to arch/arm/mach-orion5x/Makefile diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c similarity index 100% rename from arch/arm/cpu/arm926ejs/orion5x/cpu.c rename to arch/arm/mach-orion5x/cpu.c diff --git a/arch/arm/cpu/arm926ejs/orion5x/dram.c b/arch/arm/mach-orion5x/dram.c similarity index 100% rename from arch/arm/cpu/arm926ejs/orion5x/dram.c rename to arch/arm/mach-orion5x/dram.c diff --git a/arch/arm/cpu/arm926ejs/orion5x/lowlevel_init.S b/arch/arm/mach-orion5x/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/arm926ejs/orion5x/lowlevel_init.S rename to arch/arm/mach-orion5x/lowlevel_init.S diff --git a/arch/arm/cpu/arm926ejs/orion5x/timer.c b/arch/arm/mach-orion5x/timer.c similarity index 100% rename from arch/arm/cpu/arm926ejs/orion5x/timer.c rename to arch/arm/mach-orion5x/timer.c

Move arch/arm/cpu/arm926ejs/versatile/* -> arch/arm/mach-versatile/*

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---

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%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 038961c..9302b2a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6bcf8ec..0699a4d 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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))

diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 3cb741d..f5944cc 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -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/ diff --git a/arch/arm/cpu/arm926ejs/versatile/Kconfig b/arch/arm/mach-versatile/Kconfig similarity index 100% rename from arch/arm/cpu/arm926ejs/versatile/Kconfig rename to arch/arm/mach-versatile/Kconfig diff --git a/arch/arm/cpu/arm926ejs/versatile/Makefile b/arch/arm/mach-versatile/Makefile similarity index 100% rename from arch/arm/cpu/arm926ejs/versatile/Makefile rename to arch/arm/mach-versatile/Makefile diff --git a/arch/arm/cpu/arm926ejs/versatile/reset.S b/arch/arm/mach-versatile/reset.S similarity index 100% rename from arch/arm/cpu/arm926ejs/versatile/reset.S rename to arch/arm/mach-versatile/reset.S diff --git a/arch/arm/cpu/arm926ejs/versatile/timer.c b/arch/arm/mach-versatile/timer.c similarity index 100% rename from arch/arm/cpu/arm926ejs/versatile/timer.c rename to arch/arm/mach-versatile/timer.c

Move arch/arm/cpu/armv7/keystone/* -> arch/arm/mach-keystone/*

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Cc: Tom Rini trini@ti.com ---

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%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9302b2a..083823e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 0699a4d..678ac13 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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 diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 29ba6e2..1a76982 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -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/ diff --git a/arch/arm/cpu/armv7/keystone/Kconfig b/arch/arm/mach-keystone/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/keystone/Kconfig rename to arch/arm/mach-keystone/Kconfig diff --git a/arch/arm/cpu/armv7/keystone/Makefile b/arch/arm/mach-keystone/Makefile similarity index 100% rename from arch/arm/cpu/armv7/keystone/Makefile rename to arch/arm/mach-keystone/Makefile diff --git a/arch/arm/cpu/armv7/keystone/clock-k2e.c b/arch/arm/mach-keystone/clock-k2e.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/clock-k2e.c rename to arch/arm/mach-keystone/clock-k2e.c diff --git a/arch/arm/cpu/armv7/keystone/clock-k2hk.c b/arch/arm/mach-keystone/clock-k2hk.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/clock-k2hk.c rename to arch/arm/mach-keystone/clock-k2hk.c diff --git a/arch/arm/cpu/armv7/keystone/clock-k2l.c b/arch/arm/mach-keystone/clock-k2l.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/clock-k2l.c rename to arch/arm/mach-keystone/clock-k2l.c diff --git a/arch/arm/cpu/armv7/keystone/clock.c b/arch/arm/mach-keystone/clock.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/clock.c rename to arch/arm/mach-keystone/clock.c diff --git a/arch/arm/cpu/armv7/keystone/cmd_clock.c b/arch/arm/mach-keystone/cmd_clock.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/cmd_clock.c rename to arch/arm/mach-keystone/cmd_clock.c diff --git a/arch/arm/cpu/armv7/keystone/cmd_ddr3.c b/arch/arm/mach-keystone/cmd_ddr3.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/cmd_ddr3.c rename to arch/arm/mach-keystone/cmd_ddr3.c diff --git a/arch/arm/cpu/armv7/keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/cmd_mon.c rename to arch/arm/mach-keystone/cmd_mon.c diff --git a/arch/arm/cpu/armv7/keystone/ddr3.c b/arch/arm/mach-keystone/ddr3.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/ddr3.c rename to arch/arm/mach-keystone/ddr3.c diff --git a/arch/arm/cpu/armv7/keystone/init.c b/arch/arm/mach-keystone/init.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/init.c rename to arch/arm/mach-keystone/init.c diff --git a/arch/arm/cpu/armv7/keystone/keystone.c b/arch/arm/mach-keystone/keystone.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/keystone.c rename to arch/arm/mach-keystone/keystone.c diff --git a/arch/arm/cpu/armv7/keystone/msmc.c b/arch/arm/mach-keystone/msmc.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/msmc.c rename to arch/arm/mach-keystone/msmc.c diff --git a/arch/arm/cpu/armv7/keystone/psc.c b/arch/arm/mach-keystone/psc.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/psc.c rename to arch/arm/mach-keystone/psc.c

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.

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 yamada.m@jp.panasonic.com ---

Changes in v3: None

scripts/Makefile.autoconf | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 8e9d71f..58e1642 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -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

Move arch/arm/include/asm/arch-at91/* -> arch/arm/mach-at91/include/mach/*

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Acked-by: Andreas Bießmann andreas.devel@googlemail.com ---

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%)

diff --git a/MAINTAINERS b/MAINTAINERS index e4edf45..7a3e963 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -77,7 +77,6 @@ M: Andreas Bießmann andreas.devel@googlemail.com 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 sbabic@denx.de diff --git a/arch/arm/include/asm/arch-at91/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_common.h rename to arch/arm/mach-at91/include/mach/at91_common.h diff --git a/arch/arm/include/asm/arch-at91/at91_dbu.h b/arch/arm/mach-at91/include/mach/at91_dbu.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_dbu.h rename to arch/arm/mach-at91/include/mach/at91_dbu.h diff --git a/arch/arm/include/asm/arch-at91/at91_eefc.h b/arch/arm/mach-at91/include/mach/at91_eefc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_eefc.h rename to arch/arm/mach-at91/include/mach/at91_eefc.h diff --git a/arch/arm/include/asm/arch-at91/at91_emac.h b/arch/arm/mach-at91/include/mach/at91_emac.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_emac.h rename to arch/arm/mach-at91/include/mach/at91_emac.h diff --git a/arch/arm/include/asm/arch-at91/at91_gpbr.h b/arch/arm/mach-at91/include/mach/at91_gpbr.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_gpbr.h rename to arch/arm/mach-at91/include/mach/at91_gpbr.h diff --git a/arch/arm/include/asm/arch-at91/at91_matrix.h b/arch/arm/mach-at91/include/mach/at91_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_matrix.h rename to arch/arm/mach-at91/include/mach/at91_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91_mc.h b/arch/arm/mach-at91/include/mach/at91_mc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_mc.h rename to arch/arm/mach-at91/include/mach/at91_mc.h diff --git a/arch/arm/include/asm/arch-at91/at91_pdc.h b/arch/arm/mach-at91/include/mach/at91_pdc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_pdc.h rename to arch/arm/mach-at91/include/mach/at91_pdc.h diff --git a/arch/arm/include/asm/arch-at91/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_pio.h rename to arch/arm/mach-at91/include/mach/at91_pio.h diff --git a/arch/arm/include/asm/arch-at91/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_pit.h rename to arch/arm/mach-at91/include/mach/at91_pit.h diff --git a/arch/arm/include/asm/arch-at91/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_pmc.h rename to arch/arm/mach-at91/include/mach/at91_pmc.h diff --git a/arch/arm/include/asm/arch-at91/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_rstc.h rename to arch/arm/mach-at91/include/mach/at91_rstc.h diff --git a/arch/arm/include/asm/arch-at91/at91_rtt.h b/arch/arm/mach-at91/include/mach/at91_rtt.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_rtt.h rename to arch/arm/mach-at91/include/mach/at91_rtt.h diff --git a/arch/arm/include/asm/arch-at91/at91_spi.h b/arch/arm/mach-at91/include/mach/at91_spi.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_spi.h rename to arch/arm/mach-at91/include/mach/at91_spi.h diff --git a/arch/arm/include/asm/arch-at91/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_st.h rename to arch/arm/mach-at91/include/mach/at91_st.h diff --git a/arch/arm/include/asm/arch-at91/at91_tc.h b/arch/arm/mach-at91/include/mach/at91_tc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_tc.h rename to arch/arm/mach-at91/include/mach/at91_tc.h diff --git a/arch/arm/include/asm/arch-at91/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91_wdt.h rename to arch/arm/mach-at91/include/mach/at91_wdt.h diff --git a/arch/arm/include/asm/arch-at91/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91rm9200.h rename to arch/arm/mach-at91/include/mach/at91rm9200.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9260.h rename to arch/arm/mach-at91/include/mach/at91sam9260.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9260_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9260_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9261.h rename to arch/arm/mach-at91/include/mach/at91sam9261.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9261_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9261_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9261_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9263.h rename to arch/arm/mach-at91/include/mach/at91sam9263.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9263_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9263_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9263_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9_sdramc.h rename to arch/arm/mach-at91/include/mach/at91sam9_sdramc.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9_smc.h rename to arch/arm/mach-at91/include/mach/at91sam9_smc.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9g45.h rename to arch/arm/mach-at91/include/mach/at91sam9g45.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9g45_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9rl.h rename to arch/arm/mach-at91/include/mach/at91sam9rl.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9rl_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9rl_matrix.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9x5.h b/arch/arm/mach-at91/include/mach/at91sam9x5.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9x5.h rename to arch/arm/mach-at91/include/mach/at91sam9x5.h diff --git a/arch/arm/include/asm/arch-at91/at91sam9x5_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/at91sam9x5_matrix.h rename to arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h diff --git a/arch/arm/include/asm/arch-at91/atmel_mpddrc.h b/arch/arm/mach-at91/include/mach/atmel_mpddrc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/atmel_mpddrc.h rename to arch/arm/mach-at91/include/mach/atmel_mpddrc.h diff --git a/arch/arm/include/asm/arch-at91/atmel_serial.h b/arch/arm/mach-at91/include/mach/atmel_serial.h similarity index 100% rename from arch/arm/include/asm/arch-at91/atmel_serial.h rename to arch/arm/mach-at91/include/mach/atmel_serial.h diff --git a/arch/arm/include/asm/arch-at91/atmel_usba_udc.h b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/atmel_usba_udc.h rename to arch/arm/mach-at91/include/mach/atmel_usba_udc.h diff --git a/arch/arm/include/asm/arch-at91/clk.h b/arch/arm/mach-at91/include/mach/clk.h similarity index 100% rename from arch/arm/include/asm/arch-at91/clk.h rename to arch/arm/mach-at91/include/mach/clk.h diff --git a/arch/arm/include/asm/arch-at91/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h similarity index 100% rename from arch/arm/include/asm/arch-at91/gpio.h rename to arch/arm/mach-at91/include/mach/gpio.h diff --git a/arch/arm/include/asm/arch-at91/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h similarity index 100% rename from arch/arm/include/asm/arch-at91/hardware.h rename to arch/arm/mach-at91/include/mach/hardware.h diff --git a/arch/arm/include/asm/arch-at91/sama5_matrix.h b/arch/arm/mach-at91/include/mach/sama5_matrix.h similarity index 100% rename from arch/arm/include/asm/arch-at91/sama5_matrix.h rename to arch/arm/mach-at91/include/mach/sama5_matrix.h diff --git a/arch/arm/include/asm/arch-at91/sama5_sfr.h b/arch/arm/mach-at91/include/mach/sama5_sfr.h similarity index 100% rename from arch/arm/include/asm/arch-at91/sama5_sfr.h rename to arch/arm/mach-at91/include/mach/sama5_sfr.h diff --git a/arch/arm/include/asm/arch-at91/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h similarity index 100% rename from arch/arm/include/asm/arch-at91/sama5d3.h rename to arch/arm/mach-at91/include/mach/sama5d3.h diff --git a/arch/arm/include/asm/arch-at91/sama5d3_smc.h b/arch/arm/mach-at91/include/mach/sama5d3_smc.h similarity index 100% rename from arch/arm/include/asm/arch-at91/sama5d3_smc.h rename to arch/arm/mach-at91/include/mach/sama5d3_smc.h diff --git a/arch/arm/include/asm/arch-at91/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h similarity index 100% rename from arch/arm/include/asm/arch-at91/sama5d4.h rename to arch/arm/mach-at91/include/mach/sama5d4.h

Move arch/arm/include/asm/arch-kirkwood/* -> arch/arm/mach-kirkwood/include/mach/*

Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com Acked-by: Stefan Roese sr@denx.de Cc: Prafulla Wadaskar prafulla@marvell.com Cc: Luka Perkov luka.perkov@sartura.hr ---

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%)

diff --git a/MAINTAINERS b/MAINTAINERS index 7a3e963..eef70d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -99,7 +99,6 @@ M: Luka Perkov luka.perkov@sartura.hr 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 marex@denx.de diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/mach-kirkwood/include/mach/config.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/config.h rename to arch/arm/mach-kirkwood/include/mach/config.h diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/cpu.h rename to arch/arm/mach-kirkwood/include/mach/cpu.h diff --git a/arch/arm/include/asm/arch-kirkwood/gpio.h b/arch/arm/mach-kirkwood/include/mach/gpio.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/gpio.h rename to arch/arm/mach-kirkwood/include/mach/gpio.h diff --git a/arch/arm/include/asm/arch-kirkwood/kw88f6192.h b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/kw88f6192.h rename to arch/arm/mach-kirkwood/include/mach/kw88f6192.h diff --git a/arch/arm/include/asm/arch-kirkwood/kw88f6281.h b/arch/arm/mach-kirkwood/include/mach/kw88f6281.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/kw88f6281.h rename to arch/arm/mach-kirkwood/include/mach/kw88f6281.h diff --git a/arch/arm/include/asm/arch-kirkwood/mpp.h b/arch/arm/mach-kirkwood/include/mach/mpp.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/mpp.h rename to arch/arm/mach-kirkwood/include/mach/mpp.h diff --git a/arch/arm/include/asm/arch-kirkwood/soc.h b/arch/arm/mach-kirkwood/include/mach/soc.h similarity index 100% rename from arch/arm/include/asm/arch-kirkwood/soc.h rename to arch/arm/mach-kirkwood/include/mach/soc.h diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index f780f8b..2ed0855 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -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);

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 yamada.m@jp.panasonic.com ---

Changes in v3: None

arch/arm/Makefile | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 678ac13..878ae26 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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