imx: mx6 move TARGET_xx Kconfig option to mx6 specific Kconfig file

Move TARGET_xx Kconfig option based on mx6 to arch/arm/cpu/armv7/mx6/Kconfig.
Add enable "CONFIG_ARCH_MX6" for boards based on mx6.
Then we can choose target boards using "make ARCH=arm menuconfig"
with ARCH_MX6 defined.

If using original way, we have no chance to enable ARCH_MX6 when
"make menuconfig". Even define CONFIG_ARCH_MX6=y in xx_defconfig,
kconfig will complains "arch/../configs/platinum_titanium_defconfig:3:
warning: override: TARGET_PLATINUM_TITANIUM changes choice state"

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Tim Harvey <tharvey@gateworks.com>
Cc: Eric Bénard <eric@eukrea.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Eric Nelson <eric.nelson@boundarydevices.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Soeren Moch <smoch@web.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Stefano Babic <sbabic@denx.de>
Acked-by: Soeren Moch <smoch@web.de>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Christian Gmeiner <christian.gmeiner@gmail.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 52ac9cce76462fe804f12d8b916b4284b84bc910..6d05eac4f9705c59167940dff2c2a1604669d84f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -511,113 +511,6 @@ config TARGET_VISION2
        bool "Support vision2"
        select CPU_V7
 
-config TARGET_UDOO
-       bool "Support udoo"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_WANDBOARD
-       bool "Support wandboard"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_WARP
-       bool "Support WaRP"
-       select CPU_V7
-
-config TARGET_TITANIUM
-       bool "Support titanium"
-       select CPU_V7
-
-config TARGET_NITROGEN6X
-       bool "Support nitrogen6x"
-       select CPU_V7
-
-config TARGET_CGTQMX6EVAL
-       bool "Support cgtqmx6eval"
-       select CPU_V7
-
-config TARGET_EMBESTMX6BOARDS
-       bool "Support embestmx6boards"
-       select CPU_V7
-
-config TARGET_ARISTAINETOS
-       bool "Support aristainetos"
-       select CPU_V7
-
-config TARGET_ARISTAINETOS2
-       bool "Support aristainetos2"
-       select CPU_V7
-
-config TARGET_MX6QARM2
-       bool "Support mx6qarm2"
-       select CPU_V7
-
-config TARGET_MX6QSABREAUTO
-       bool "Support mx6qsabreauto"
-       select CPU_V7
-       select DM
-       select DM_THERMAL
-
-config TARGET_MX6SABRESD
-       bool "Support mx6sabresd"
-       select CPU_V7
-       select SUPPORT_SPL
-       select DM
-       select DM_THERMAL
-
-config TARGET_MX6CUBOXI
-       bool "Support Solid-run mx6 boards"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_MX6SLEVK
-       bool "Support mx6slevk"
-       select CPU_V7
-
-config TARGET_MX6SXSABRESD
-       bool "Support mx6sxsabresd"
-       select CPU_V7
-       select SUPPORT_SPL
-       select DM
-       select DM_THERMAL
-
-config TARGET_MX6UL_14X14_EVK
-       bool "Support mx6ul_14x14_evk"
-       select CPU_V7
-       select DM
-       select DM_THERMAL
-       select SUPPORT_SPL
-
-config TARGET_GW_VENTANA
-       bool "Support gw_ventana"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_KOSAGI_NOVENA
-       bool "Support Kosagi Novena"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_TBS2910
-       bool "Support tbs2910"
-       select CPU_V7
-
-config TARGET_OT1200
-       bool "Bachmann OT1200"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_PLATINUM_PICON
-       bool "Support platinum-picon"
-       select CPU_V7
-       select SUPPORT_SPL
-
-config TARGET_PLATINUM_TITANIUM
-       bool "Support platinum-titanium"
-       select CPU_V7
-       select SUPPORT_SPL
-
 config OMAP34XX
        bool "OMAP34XX SoC"
        select CPU_V7
@@ -888,7 +781,6 @@ source "arch/arm/cpu/armv8/Kconfig"
 
 source "arch/arm/imx-common/Kconfig"
 
-source "board/aristainetos/Kconfig"
 source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
@@ -899,26 +791,17 @@ source "board/Marvell/gplugd/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
-source "board/hisilicon/hikey/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/boundary/nitrogen6x/Kconfig"
 source "board/broadcom/bcm28155_ap/Kconfig"
 source "board/broadcom/bcmcygnus/Kconfig"
 source "board/broadcom/bcmnsp/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
-source "board/compulab/cm_t43/Kconfig"
-source "board/compulab/cm_fx6/Kconfig"
-source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/creative/xfi3/Kconfig"
 source "board/davedenx/qong/Kconfig"
 source "board/denx/m28evk/Kconfig"
 source "board/denx/m53evk/Kconfig"
-source "board/embest/mx6boards/Kconfig"
 source "board/esg/ima3-mx53/Kconfig"
 source "board/freescale/ls2085a/Kconfig"
 source "board/freescale/ls2085aqds/Kconfig"
@@ -936,14 +819,7 @@ source "board/freescale/mx53ard/Kconfig"
 source "board/freescale/mx53evk/Kconfig"
 source "board/freescale/mx53loco/Kconfig"
 source "board/freescale/mx53smd/Kconfig"
-source "board/freescale/mx6qarm2/Kconfig"
-source "board/freescale/mx6qsabreauto/Kconfig"
-source "board/freescale/mx6sabresd/Kconfig"
-source "board/freescale/mx6slevk/Kconfig"
-source "board/freescale/mx6sxsabresd/Kconfig"
-source "board/freescale/mx6ul_14x14_evk/Kconfig"
 source "board/freescale/vf610twr/Kconfig"
-source "board/gateworks/gw_ventana/Kconfig"
 source "board/genesi/mx51_efikamx/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
@@ -953,7 +829,6 @@ source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
 source "board/jornada/Kconfig"
 source "board/karo/tx25/Kconfig"
-source "board/kosagi/novena/Kconfig"
 source "board/logicpd/imx27lite/Kconfig"
 source "board/logicpd/imx31_litekit/Kconfig"
 source "board/maxbcm/Kconfig"
@@ -973,7 +848,6 @@ source "board/siemens/draco/Kconfig"
 source "board/siemens/pxm2/Kconfig"
 source "board/siemens/rut/Kconfig"
 source "board/silica/pengwyn/Kconfig"
-source "board/solidrun/mx6cuboxi/Kconfig"
 source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"
@@ -985,7 +859,6 @@ source "board/st/stm32f429-discovery/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/sunxi/Kconfig"
 source "board/syteco/zmx25/Kconfig"
-source "board/tbs/tbs2910/Kconfig"
 source "board/ti/am335x/Kconfig"
 source "board/ti/am43xx/Kconfig"
 source "board/birdland/bav335x/Kconfig"
@@ -997,11 +870,8 @@ source "board/toradex/colibri_vf/Kconfig"
 source "board/trizepsiv/Kconfig"
 source "board/technologic/ts4800/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
-source "board/udoo/Kconfig"
 source "board/vpac270/Kconfig"
 source "board/vscom/baltos/Kconfig"
-source "board/wandboard/Kconfig"
-source "board/warp/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
 source "board/xaeniax/Kconfig"

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index dce7ffc022ae7ef9d30a29147c509dfdd3cd98f5..c43cea8580babd5d5378758be35b26ddc41a107a 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -33,25 +33,153 @@ choice
        prompt "MX6 board select"
        optional
 
+config TARGET_ARISTAINETOS
+       bool "aristainetos"
+       select CPU_V7
+
+config TARGET_ARISTAINETOS2
+       bool "aristainetos2"
+       select CPU_V7
+
+config TARGET_CGTQMX6EVAL
+       bool "cgtqmx6eval"
+       select CPU_V7
+
 config TARGET_CM_FX6
-       bool "Support CM-FX6"
+       bool "CM-FX6"
        select SUPPORT_SPL
        select DM
        select DM_SERIAL
        select DM_GPIO
 
+config TARGET_EMBESTMX6BOARDS
+       bool "embestmx6boards"
+       select CPU_V7
+
+config TARGET_GW_VENTANA
+       bool "gw_ventana"
+       select CPU_V7
+       select SUPPORT_SPL
+
+config TARGET_KOSAGI_NOVENA
+       bool "Kosagi Novena"
+       select CPU_V7
+       select SUPPORT_SPL
+
+config TARGET_MX6CUBOXI
+       bool "Solid-run mx6 boards"
+       select CPU_V7
+       select SUPPORT_SPL
+
+config TARGET_MX6QARM2
+       bool "mx6qarm2"
+       select CPU_V7
+
+config TARGET_MX6QSABREAUTO
+       bool "mx6qsabreauto"
+       select CPU_V7
+       select DM
+       select DM_THERMAL
+
+config TARGET_MX6SABRESD
+       bool "mx6sabresd"
+       select CPU_V7
+       select SUPPORT_SPL
+       select DM
+       select DM_THERMAL
+
+config TARGET_MX6SLEVK
+       bool "mx6slevk"
+       select CPU_V7
+
+config TARGET_MX6SXSABRESD
+       bool "mx6sxsabresd"
+       select CPU_V7
+       select SUPPORT_SPL
+       select DM
+       select DM_THERMAL
+
+config TARGET_MX6UL_14X14_EVK
+       bool "mx6ul_14x14_evk"
+       select CPU_V7
+       select DM
+       select DM_THERMAL
+       select SUPPORT_SPL
+
+config TARGET_NITROGEN6X
+       bool "nitrogen6x"
+       select CPU_V7
+
+config TARGET_OT1200
+       bool "Bachmann OT1200"
+       select CPU_V7
+       select SUPPORT_SPL
+
+config TARGET_PLATINUM_PICON
+       bool "platinum-picon"
+       select CPU_V7
+       select SUPPORT_SPL
+
+config TARGET_PLATINUM_TITANIUM
+       bool "platinum-titanium"
+       select CPU_V7
+       select SUPPORT_SPL
+
 config TARGET_SECOMX6
-       bool "Support secomx6 boards"
+       bool "secomx6 boards"
+
+config TARGET_TBS2910
+       bool "tbs2910"
+       select CPU_V7
+
+config TARGET_TITANIUM
+       bool "titanium"
+       select CPU_V7
 
 config TARGET_TQMA6
        bool "TQ Systems TQMa6 board"
 
+config TARGET_UDOO
+       bool "udoo"
+       select CPU_V7
+       select SUPPORT_SPL
+
+config TARGET_WANDBOARD
+       bool "wandboard"
+       select CPU_V7
+       select SUPPORT_SPL
+
+config TARGET_WARP
+       bool "WaRP"
+       select CPU_V7
+
 endchoice
 
 config SYS_SOC
        default "mx6"
 
+source "board/aristainetos/Kconfig"
+source "board/bachmann/ot1200/Kconfig"
+source "board/barco/platinum/Kconfig"
+source "board/barco/titanium/Kconfig"
+source "board/boundary/nitrogen6x/Kconfig"
+source "board/compulab/cm_fx6/Kconfig"
+source "board/congatec/cgtqmx6eval/Kconfig"
+source "board/embest/mx6boards/Kconfig"
+source "board/freescale/mx6qarm2/Kconfig"
+source "board/freescale/mx6qsabreauto/Kconfig"
+source "board/freescale/mx6sabresd/Kconfig"
+source "board/freescale/mx6slevk/Kconfig"
+source "board/freescale/mx6sxsabresd/Kconfig"
+source "board/freescale/mx6ul_14x14_evk/Kconfig"
+source "board/gateworks/gw_ventana/Kconfig"
+source "board/kosagi/novena/Kconfig"
 source "board/seco/Kconfig"
+source "board/solidrun/mx6cuboxi/Kconfig"
+source "board/tbs/tbs2910/Kconfig"
 source "board/tqc/tqma6/Kconfig"
+source "board/udoo/Kconfig"
+source "board/wandboard/Kconfig"
+source "board/warp/Kconfig"
 
 endif

diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index e676f0ec0d9890a1d04574c73675edcaaf02258c..e43f6eb2a55a9e42a89edef675811a080fbcb872 100644 (file)
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ARISTAINETOS2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index f5b0b6bf5a71007a6e693000279b0b5c82a05319..e6affedb9c3249761ec67e8c0a3fd64fca1c4206 100644 (file)
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_ARISTAINETOS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig
index 74f95277e80f680facbc120091508cc052747fbb..0289a3fd4d2c9f8c27e0dcf6b8bbfd91498703a5 100644 (file)
--- a/configs/cgtqmx6qeval_defconfig
+++ b/configs/cgtqmx6qeval_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_CGTQMX6EVAL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6Q"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index e294cac0b2fb2e102fac86687bf8a9a433ee3cdb..e45b077e3a5b22ca2529b71ef5cf52e6fc3c485d 100644 (file)
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_GW_VENTANA=y
 CONFIG_SPL=y
 CONFIG_SPL_STACK_R=y

diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index 5ea278fee4ff7d6f70d55e9698eac6a374ac06bd..0707f0d2989ba2bfa206c87d0b6fdf27db6b7439 100644 (file)
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 27fe22eb018ed9356f980e6887d54fb5de8fef2a..59362c661be0001a63035c29c8aaf9315eadc2ac 100644 (file)
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6CUBOXI=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"

diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig
index 6c1ba3361d6cae5ff8aee4984195033070c739ba..e1bdaafe9bb1aac5cbc0a3812899ae7118a6641d 100644 (file)
--- a/configs/mx6dlarm2_defconfig
+++ b/configs/mx6dlarm2_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QARM2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,DDR_MB=2048"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6dlarm2_lpddr2_defconfig b/configs/mx6dlarm2_lpddr2_defconfig
index 4624a09dfe760b8acebf745e2093dfb3df6c3664..a37c254a7d0986905dca14857d1db9db80180045 100644 (file)
--- a/configs/mx6dlarm2_lpddr2_defconfig
+++ b/configs/mx6dlarm2_lpddr2_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QARM2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,MX6DL_LPDDR2,DDR_MB=512"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index 756e5dbff4a032407370f7e631e3a18ce2c9b1a2..17d1b9675136c02e0145be5e30e4044a0407a3f8 100644 (file)
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index de9999851b0631e2ce6c8a805e25e4c4d79e3a85..6610a0c93f37c720fc1a2b05d66f78abea11a6d6 100644 (file)
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig
index 42dbded3433f6367470e29fc7a6501c9beeb1898..5cd78cd300cb6216cdf44bf33c335e2656a26f81 100644 (file)
--- a/configs/mx6qarm2_defconfig
+++ b/configs/mx6qarm2_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QARM2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,DDR_MB=2048"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6qarm2_lpddr2_defconfig b/configs/mx6qarm2_lpddr2_defconfig
index 5f9105fd9a72cd50ac8c2be4df2399ff9e3050b6..89c42b851040211a269c9abb3d2a62df70d2cf56 100644 (file)
--- a/configs/mx6qarm2_lpddr2_defconfig
+++ b/configs/mx6qarm2_lpddr2_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QARM2=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,MX6DQ_LPDDR2,DDR_MB=512"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
index 293e3f27a5646b064e77bed61ddc7d680a3c14ac..2cbbc32b0a5fa6d0bd27487e3122f9e42d9a963c 100644 (file)
--- a/configs/mx6qpsabreauto_defconfig
+++ b/configs/mx6qpsabreauto_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6Q"
 CONFIG_SPI_FLASH=y

diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index 9343bcce5a5c6900c604f816fbaaaff28b480482..11ded404adf9e9fb9ddd8d3fc7c4fb653b188664 100644 (file)
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 427fbee32296314b2765e521c333e4f2c5b2c886..1a2bb221d3d8be02c64be3165c83ee40d9fd0ce2 100644 (file)
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index 732c1dce61729f0d5f43b683e9695c0f220e5670..6cbe1cfbb68dddc6f3bca248eb2a8547c6061529 100644 (file)
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index d93a40dbe3d921fda3f329b0568273d567717e2b..bfd371a32220a32c51cc519940d4ca9284af70fe 100644 (file)
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SABRESD=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q"

diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
index dcc3296a3b93541fc2038e013260a3d230064949..ae9912b2a609b1f5fa5f3fcd847b31c557bdccd0 100644 (file)
--- a/configs/mx6slevk_defconfig
+++ b/configs/mx6slevk_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SLEVK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig
index 964a147cacb9954dcef38b95132132ef0415cad9..39046164ef75cb22240a2c812eb9ecbecc11a3b3 100644 (file)
--- a/configs/mx6slevk_spinor_defconfig
+++ b/configs/mx6slevk_spinor_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SLEVK=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL,SYS_BOOT_SPINOR"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index e6e4db5c48648f484b4bc79876b8d66bb9404a31..a5829053276245115393b6e6ad97592435e1d01c 100644 (file)
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SXSABRESD=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig
index df3489409c8e594107e74f640391638e31f4335e..3f196590c48515f5ece4c6a8199be295c71df3ce 100644 (file)
--- a/configs/mx6sxsabresd_spl_defconfig
+++ b/configs/mx6sxsabresd_spl_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6SXSABRESD=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX"

diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig
index 29159a1bf76a3b110b5648843a7967a8d7a67095..a02b79429d326d7e62a5b1ba39ccc9d2a05ed537 100644 (file)
--- a/configs/mx6ul_14x14_evk_defconfig
+++ b/configs/mx6ul_14x14_evk_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_MX6UL_14X14_EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6UL"

diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 6cbc0e3089a42408398a271ab22fd63c2ded97c9..2044fc9d151fab8224fab02e4cb71e08e07b1b7f 100644 (file)
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 055266ca36c9e5efbd78ae162f666ecf9ccd935f..c90c8c9762929a885e70691ad7b38a50020f7af5 100644 (file)
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index 7b5ccc7ab915d0e4cb63572b795200b8812f2cd2..90ef17eeebe771ff53702e836c6fcc40f4afbd00 100644 (file)
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index 5cc245ed01c01d01bcbab8375f4c8dc2b3056f9d..798467ece01b4908fa79ce5e47c5aba822920c96 100644 (file)
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index b613a491c227c8274080b2f0e8b5c2fcf80d4021..e8eca1b016211a49f4bec21f51beb2a8b2b2fcca 100644 (file)
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index b7cd09abcc18051a7a9130cab173609f7292b908..d142ebc116342b47fd58d01f84532ffeb4841e58 100644 (file)
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index aca98b724564e493b84df68d16dc64958f949967..60d6658217da11cd4e20c4092be28d5d2e6eb6a0 100644 (file)
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_KOSAGI_NOVENA=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"

diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
index ea789345ff6f7dcd00fedd38aff2577534306903..17022a43dee873e1b6fd5d3c0c1b1c7b6e647344 100644 (file)
--- a/configs/ot1200_defconfig
+++ b/configs/ot1200_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_OT1200=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
index 3c7346b5ce4a4ba6a4e234d3487e231a63426a78..dbbea35cf0945126d8da88ab1d423a14cfb7ba61 100644 (file)
--- a/configs/ot1200_spl_defconfig
+++ b/configs/ot1200_spl_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_OT1200=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"

diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig
index 64da7c449b219a456b299b369cff5d19da48f9d6..2e4e879b74063cc1de9c75c84558ffd37b2c2feb 100644 (file)
--- a/configs/platinum_picon_defconfig
+++ b/configs/platinum_picon_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_PLATINUM_PICON=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL"

diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig
index 67957c38305614442e57aea4a968c5c50f8e3214..0c8e32f57746a56409d3d7e3fea24c3c9e1fd6e3 100644 (file)
--- a/configs/platinum_titanium_defconfig
+++ b/configs/platinum_titanium_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_PLATINUM_TITANIUM=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q"

diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index fd18e2de95a611e478cb5db8066c970184e0a3b8..859b14323e51de514501532b0701834a8a8fb520 100644 (file)
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 745d32edd53eb7b720080a05254588c9192f4eb2..5dca2307e4258f07bad17274ef9094cbe1e22175 100644 (file)
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TBS2910=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q"
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig
index 9fe30d361c99eb959236d960c8e87b46fddfc475..e4f1d8d3dece5c6a59ae2888e52559c2cdcb75e2 100644 (file)
--- a/configs/udoo_defconfig
+++ b/configs/udoo_defconfig
@@ -1,5 +1,6 @@
 CONFIG_SPL=y
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y
 CONFIG_TARGET_UDOO=y

diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 62666ffca79b6a698f7d66e1c04f60cfe9500d73..595e4be53dab5eff4565b1a8e3f87432d6767a71 100644 (file)
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_WANDBOARD=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"

diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index dacb4320da543946201e10afd8bd13b50210c8b7..423f82037a5aeed3985840e1794856d01c07b297 100644 (file)
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_WARP=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL"
 # CONFIG_CMD_IMLS is not set