Hi Peng, On 06/08/2015 07:43, Peng Fan wrote: > 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" >
This is a cleanup we need since a lot of time - thanks for that. > Signed-off-by: Peng Fan <peng....@freescale.com> > Cc: Stefano Babic <sba...@denx.de> > Cc: Heiko Schocher <h...@denx.de> > Cc: Tim Harvey <thar...@gateworks.com> > Cc: Eric Bénard <e...@eukrea.com> > Cc: Fabio Estevam <fabio.este...@freescale.com> > Cc: Eric Nelson <eric.nel...@boundarydevices.com> > Cc: Marek Vasut <ma...@denx.de> > Cc: Christian Gmeiner <christian.gmei...@gmail.com> > Cc: Stefan Roese <s...@denx.de> > Cc: Soeren Moch <sm...@web.de> > Cc: Otavio Salvador <ota...@ossystems.com.br> > Signed-off-by: Peng Fan <peng....@freescale.com> > --- > arch/arm/Kconfig | 128 > ------------------------------------ > arch/arm/cpu/armv7/mx6/Kconfig | 128 > ++++++++++++++++++++++++++++++++++++ > configs/aristainetos2_defconfig | 1 + > configs/aristainetos_defconfig | 1 + > configs/cgtqmx6qeval_defconfig | 1 + > configs/gwventana_defconfig | 1 + > configs/marsboard_defconfig | 1 + > configs/mx6cuboxi_defconfig | 1 + > configs/mx6dlarm2_defconfig | 1 + > configs/mx6dlarm2_lpddr2_defconfig | 1 + > configs/mx6dlsabreauto_defconfig | 1 + > configs/mx6dlsabresd_defconfig | 1 + > configs/mx6qarm2_defconfig | 1 + > configs/mx6qarm2_lpddr2_defconfig | 1 + > configs/mx6qpsabreauto_defconfig | 1 + > configs/mx6qsabreauto_defconfig | 1 + > configs/mx6qsabrelite_defconfig | 1 + > configs/mx6qsabresd_defconfig | 1 + > configs/mx6sabresd_spl_defconfig | 1 + > configs/mx6slevk_defconfig | 1 + > configs/mx6slevk_spinor_defconfig | 1 + > configs/mx6sxsabresd_defconfig | 1 + > configs/mx6sxsabresd_spl_defconfig | 1 + > configs/mx6ul_14x14_evk_defconfig | 1 + > configs/nitrogen6dl2g_defconfig | 1 + > configs/nitrogen6dl_defconfig | 1 + > configs/nitrogen6q2g_defconfig | 1 + > configs/nitrogen6q_defconfig | 1 + > configs/nitrogen6s1g_defconfig | 1 + > configs/nitrogen6s_defconfig | 1 + > configs/novena_defconfig | 1 + > configs/ot1200_defconfig | 1 + > configs/ot1200_spl_defconfig | 1 + > configs/platinum_picon_defconfig | 1 + > configs/platinum_titanium_defconfig | 1 + > configs/riotboard_defconfig | 1 + > configs/tbs2910_defconfig | 1 + > configs/udoo_defconfig | 1 + > configs/wandboard_defconfig | 1 + > configs/warp_defconfig | 1 + > 40 files changed, 166 insertions(+), 128 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 5d54604..d28b50b 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -508,113 +508,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 > @@ -869,7 +762,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" > @@ -880,24 +772,17 @@ source "board/Marvell/gplugd/Kconfig" > source "board/armadeus/apf27/Kconfig" > source "board/armltd/vexpress/Kconfig" > source "board/armltd/vexpress64/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_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" > @@ -915,14 +800,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" > @@ -932,7 +810,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" > @@ -952,7 +829,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" > @@ -964,7 +840,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" > @@ -975,11 +850,8 @@ source "board/toradex/colibri_pxa270/Kconfig" > source "board/toradex/colibri_vf/Kconfig" > source "board/trizepsiv/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 dce7ffc..b7481e7 100644 > --- a/arch/arm/cpu/armv7/mx6/Kconfig > +++ b/arch/arm/cpu/armv7/mx6/Kconfig > @@ -46,6 +46,113 @@ config TARGET_SECOMX6 > config TARGET_TQMA6 > bool "TQ Systems TQMa6 board" > > +config TARGET_UDOO > + bool "Support udoo" > + select CPU_V7 > + select SUPPORT_SPL > + > +config TARGET_OT1200 > + bool "Bachmann OT1200" > + 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_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_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_GW_VENTANA > + bool "Support gw_ventana" > + select CPU_V7 > + select SUPPORT_SPL > + > +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_KOSAGI_NOVENA > + bool "Support Kosagi Novena" > + select CPU_V7 > + select SUPPORT_SPL > + > +config TARGET_TBS2910 > + bool "Support tbs2910" > + select CPU_V7 > + > +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 > + > endchoice > > config SYS_SOC > @@ -53,5 +160,26 @@ config SYS_SOC > > source "board/seco/Kconfig" > source "board/tqc/tqma6/Kconfig" > +source "board/udoo/Kconfig" > +source "board/bachmann/ot1200/Kconfig" > +source "board/wandboard/Kconfig" > +source "board/warp/Kconfig" > +source "board/compulab/cm_fx6/Kconfig" > +source "board/solidrun/mx6cuboxi/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/barco/platinum/Kconfig" > +source "board/barco/titanium/Kconfig" > +source "board/boundary/nitrogen6x/Kconfig" > +source "board/congatec/cgtqmx6eval/Kconfig" > +source "board/embest/mx6boards/Kconfig" > +source "board/aristainetos/Kconfig" > +source "board/kosagi/novena/Kconfig" > +source "board/tbs/tbs2910/Kconfig" > > endif > diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig > index e676f0e..e43f6eb 100644 > --- 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 f5b0b6b..e6affed 100644 > --- 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 6fd29a0..a6ccd7a 100644 > --- 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_NET=y > diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig > index 401f77e..82d7206 100644 > --- 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 5ea278f..0707f0d 100644 > --- 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 27fe22e..59362c6 100644 > --- 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 6c1ba33..e1bdaaf 100644 > --- 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 4624a09..a37c254 100644 > --- 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 756e5db..17d1b96 100644 > --- 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 de99998..6610a0c 100644 > --- 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 42dbded..5cd78cd 100644 > --- 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 5f9105f..89c42b8 100644 > --- 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 293e3f2..2cbbc32 100644 > --- 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 9343bcc..11ded40 100644 > --- 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 427fbee..1a2bb22 100644 > --- 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 732c1dc..6cbe1cf 100644 > --- 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 d93a40d..bfd371a 100644 > --- 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 dcc3296..ae9912b 100644 > --- 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 964a147..3904616 100644 > --- 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 e6e4db5..a582905 100644 > --- 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 df34894..3f19659 100644 > --- 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 87ba686..250f3f2 100644 > --- a/configs/mx6ul_14x14_evk_defconfig > +++ b/configs/mx6ul_14x14_evk_defconfig > @@ -1,5 +1,6 @@ > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6UL" > CONFIG_ARM=y > +CONFIG_ARCH_MX6=y > CONFIG_TARGET_MX6UL_14X14_EVK=y > CONFIG_SPL=y > CONFIG_CMD_NET=y > diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig > index 6cbc0e3..2044fc9 100644 > --- 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 055266c..c90c8c9 100644 > --- 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 7b5ccc7..90ef17e 100644 > --- 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 5cc245e..798467e 100644 > --- 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 b613a49..e8eca1b 100644 > --- 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 b7cd09a..d142ebc 100644 > --- 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 aca98b7..60d6658 100644 > --- 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 ea78934..17022a4 100644 > --- 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 3c7346b..dbbea35 100644 > --- 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 3484c46..446a726 100644 > --- 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 6a2cacf..01cbb08 100644 > --- 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 fd18e2d..859b143 100644 > --- 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 f0e5106..1e20d29 100644 > --- 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 9fe30d3..e4f1d8d 100644 > --- 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 62666ff..595e4be 100644 > --- 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 dacb432..423f820 100644 > --- 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 > Acked-by: Stefano Babic <sba...@denx.de> Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de ===================================================================== _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
