Hi Tom, > Subject: [PATCH] arm: mx6: Make all i.MX6 SoCs user-selectable > [....] > + > config MX6UL_LITESOM > bool > select DM > select DM_THERMAL > - select MX6UL
Would keep it here to simplify defconfig? Regards, Peng. > select SUPPORT_SPL > imply CMD_DM > > @@ -73,7 +83,6 @@ config MX6UL_OPOS6UL > select DM_GPIO > select DM_MMC > select DM_THERMAL > - select MX6UL > select SPL_DM if SPL > select SPL_OF_CONTROL if SPL > select SPL_PINCTRL if SPL > @@ -81,12 +90,6 @@ config MX6UL_OPOS6UL > select SUPPORT_SPL > imply CMD_DM > > -config MX6ULL > - bool > - select ROM_UNIFIED_SECTIONS > - select SYSCOUNTER_TIMER > - select SYS_L2CACHE_OFF > - > config MX6_OCRAM_256KB > bool "Support 256KB OCRAM" > depends on MX6D || MX6Q > @@ -110,14 +113,14 @@ choice > > config TARGET_ADVANTECH_DMS_BA16 > bool "Advantech dms-ba16" > + depends on MX6Q > select BOARD_LATE_INIT > - select MX6Q > imply CMD_SATA > > config TARGET_APALIS_IMX6 > bool "Toradex Apalis iMX6 board" > + depends on MX6Q > select BOARD_LATE_INIT > - select MX6Q > select DM > select DM_SERIAL > select DM_THERMAL > @@ -127,8 +130,8 @@ config TARGET_APALIS_IMX6 > > config TARGET_ARISTAINETOS2 > bool "aristainetos2" > + depends on MX6DL > select BOARD_LATE_INIT > - select MX6DL > select SYS_I2C_MXC > select MXC_UART > select FEC_MXC > @@ -138,8 +141,8 @@ config TARGET_ARISTAINETOS2 > > config TARGET_ARISTAINETOS2B > bool "Support aristainetos2-revB" > + depends on MX6DL > select BOARD_LATE_INIT > - select MX6DL > select SYS_I2C_MXC > select MXC_UART > select FEC_MXC > @@ -149,8 +152,8 @@ config TARGET_ARISTAINETOS2B > > config TARGET_ARISTAINETOS2BCSL > bool "Support aristainetos2-revB CSL" > + depends on MX6DL > select BOARD_LATE_INIT > - select MX6DL > select SYS_I2C_MXC > select MXC_UART > select FEC_MXC > @@ -160,8 +163,8 @@ config TARGET_ARISTAINETOS2BCSL > > config TARGET_ARISTAINETOS2C > bool "Support aristainetos2-revC" > + depends on MX6DL > select BOARD_LATE_INIT > - select MX6DL > select SYS_I2C_MXC > select MXC_UART > select FEC_MXC > @@ -171,20 +174,20 @@ config TARGET_ARISTAINETOS2C > > config TARGET_CGTQMX6EVAL > bool "cgtqmx6eval" > + depends on MX6QDL > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6QDL > select SUPPORT_SPL > imply CMD_DM > > config TARGET_CM_FX6 > bool "CM-FX6" > + depends on MX6QDL > select BOARD_LATE_INIT > select DM > select DM_GPIO > select DM_SERIAL > - select MX6QDL > select SUPPORT_SPL > imply CMD_DM > > @@ -199,14 +202,14 @@ config TARGET_COLIBRI_IMX6 > > config TARGET_COLIBRI_IMX6ULL > bool "Toradex Colibri iMX6ULL" > + depends on MX6ULL > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6ULL > > config TARGET_DART_6UL > bool "Variscite imx6ULL dart(DART-SOM-6ULL)" > - select MX6ULL > + depends on MX6ULL > select DM > select DM_ETH > select DM_GPIO > @@ -218,17 +221,18 @@ config TARGET_DART_6UL > > config TARGET_DHCOMIMX6 > bool "dh_imx6" > + depends on MX6QDL > select BOARD_EARLY_INIT_F > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6QDL > select SUPPORT_SPL > imply CMD_DM > imply CMD_SPL > > config TARGET_DISPLAY5 > bool "LWN DISPLAY5 board" > + depends on MX6Q > select DM > select DM_ETH > select DM_I2C > @@ -246,12 +250,12 @@ config TARGET_EMBESTMX6BOARDS > > config TARGET_GE_BX50V3 > bool "General Electric Bx50v3" > + depends on MX6Q > select BOARD_LATE_INIT > - select MX6Q > > config TARGET_GW_VENTANA > bool "gw_ventana" > - select MX6QDL > + depends on MX6QDL > select SUPPORT_SPL > imply CMD_SATA > imply CMD_SPL > @@ -272,7 +276,7 @@ config TARGET_KOSAGI_NOVENA > > config TARGET_MCCMON6 > bool "mccmon6" > - select MX6QDL > + depends on MX6QDL > select SUPPORT_SPL > select DM > select DM_GPIO > @@ -284,13 +288,13 @@ config TARGET_MCCMON6 > > config TARGET_MX6CUBOXI > bool "Solid-run mx6 boards" > + depends on MX6QDL > select BOARD_LATE_INIT > - select MX6QDL > select SUPPORT_SPL > > config TARGET_MX6LOGICPD > bool "Logic PD i.MX6 SOM" > - select MX6Q > + depends on MX6Q > select SUPPORT_SPL > select BOARD_EARLY_INIT_F > select BOARD_LATE_INIT > @@ -305,6 +309,7 @@ config TARGET_MX6LOGICPD > > config TARGET_MX6MEMCAL > bool "mx6memcal" > + depends on MX6QDL > select SUPPORT_SPL > help > The mx6memcal board is a virtual board that can be used to validate > @@ -316,6 +321,7 @@ config TARGET_MX6QARM2 > > config TARGET_MX6DL_MAMOJ > bool "Support BTicino Mamoj" > + depends on MX6QDL > select DM > select DM_ETH > select DM_GPIO > @@ -324,7 +330,6 @@ config TARGET_MX6DL_MAMOJ > select DM_PMIC > select DM_PMIC_PFUZE100 > select DM_THERMAL > - select MX6QDL > select OF_CONTROL > select PINCTRL > select SPL > @@ -348,6 +353,7 @@ config TARGET_MX6DL_MAMOJ > > config TARGET_MX6Q_ENGICAM > bool "Support Engicam i.Core(RQS)" > + depends on MX6QDL > select BOARD_LATE_INIT > select DM > select DM_ETH > @@ -355,7 +361,6 @@ config TARGET_MX6Q_ENGICAM > select DM_I2C > select DM_MMC > select DM_THERMAL > - select MX6QDL > select OF_CONTROL > select SPL_DM if SPL > select SPL_OF_CONTROL if SPL > @@ -367,75 +372,76 @@ config TARGET_MX6Q_ENGICAM > > config TARGET_MX6SABREAUTO > bool "mx6sabreauto" > + depends on MX6QDL > select BOARD_EARLY_INIT_F > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6QDL > select SUPPORT_SPL > imply CMD_DM > > config TARGET_MX6SABRESD > bool "mx6sabresd" > + depends on MX6QDL > select BOARD_EARLY_INIT_F > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6QDL > select SUPPORT_SPL > imply CMD_DM > > config TARGET_MX6SLEVK > bool "mx6slevk" > - select MX6SL > + depends on MX6SL > select SUPPORT_SPL > > config TARGET_MX6SLLEVK > bool "mx6sll evk" > + depends on MX6SLL > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6SLL > imply CMD_DM > > config TARGET_MX6SXSABRESD > bool "mx6sxsabresd" > + depends on MX6SX > select BOARD_EARLY_INIT_F > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6SX > select SUPPORT_SPL > > config TARGET_MX6SXSABREAUTO > bool "mx6sxsabreauto" > + depends on MX6SX > select BOARD_EARLY_INIT_F > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6SX > imply CMD_DM > > config TARGET_MX6UL_9X9_EVK > bool "mx6ul_9x9_evk" > + depends on MX6UL > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6UL > select SUPPORT_SPL > imply CMD_DM > > config TARGET_MX6UL_14X14_EVK > bool "mx6ul_14x14_evk" > + depends on MX6UL > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6UL > select SUPPORT_SPL > imply CMD_DM > > config TARGET_MX6UL_ENGICAM > bool "Support Engicam GEAM6UL/Is.IoT" > + depends on MX6UL > select BOARD_LATE_INIT > select DM > select DM_ETH > @@ -443,7 +449,6 @@ config TARGET_MX6UL_ENGICAM > select DM_I2C > select DM_MMC > select DM_THERMAL > - select MX6UL > select OF_CONTROL > select SPL_DM if SPL > select SPL_OF_CONTROL if SPL > @@ -454,15 +459,15 @@ config TARGET_MX6UL_ENGICAM > > config TARGET_MX6ULL_14X14_EVK > bool "Support mx6ull_14x14_evk" > + depends on MX6ULL > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6ULL > imply CMD_DM > > config TARGET_MYS_6ULX > bool "MYiR MYS-6ULX" > - select MX6ULL > + depends on MX6ULL > select DM > select DM_ETH > select DM_GPIO > @@ -474,15 +479,15 @@ config TARGET_MYS_6ULX > > config TARGET_NITROGEN6X > bool "nitrogen6x" > + depends on MX6DL || MX6Q || MX6QDL || MX6S > imply USB_ETHER_ASIX > imply USB_ETHER_MCS7830 > imply USB_ETHER_SMSC95XX > imply USB_HOST_ETHER > - select MX6QDL > > config TARGET_OPOS6ULDEV > bool "Armadeus OPOS6ULDev board" > - select MX6UL_OPOS6UL > + depends on MX6UL > > config TARGET_OT1200 > bool "Bachmann OT1200" > @@ -491,25 +496,25 @@ config TARGET_OT1200 > > config TARGET_PICO_IMX6 > bool "PICO-IMX6" > + depends on MX6QDL > select BOARD_EARLY_INIT_F > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6QDL > select SUPPORT_SPL > imply CMD_DM > > config TARGET_PICO_IMX6UL > bool "PICO-IMX6UL-EMMC" > - select MX6UL > + depends on MX6UL > select DM > select SUPPORT_SPL > imply CMD_DM > > config TARGET_LITEBOARD > bool "Grinn liteBoard (i.MX6UL)" > + depends on MX6UL > select BOARD_LATE_INIT > - select MX6UL_LITESOM > > config TARGET_PLATINUM_PICON > bool "platinum-picon" > @@ -521,22 +526,22 @@ config TARGET_PLATINUM_TITANIUM > > config TARGET_PCM058 > bool "Phytec PCM058 i.MX6 Quad" > + depends on MX6Q > select BOARD_LATE_INIT > select SUPPORT_SPL > - select MX6Q > select DM > select OF_CONTROL > imply CMD_DM > > config TARGET_PFLA02 > bool "Phytec PFLA02 (PhyFlex) i.MX6 Quad" > + depends on MX6QDL > select BOARD_LATE_INIT > - select MX6QDL > select SUPPORT_SPL > > config TARGET_PCL063 > bool "PHYTEC PCL063 (phyCORE-i.MX6UL)" > - select MX6UL > + depends on MX6UL > select DM > select DM_ETH > select DM_GPIO > @@ -548,7 +553,7 @@ config TARGET_PCL063 > > config TARGET_PCL063_ULL > bool "PHYTEC PCL063 (phyCORE-i.MX6ULL)" > - select MX6ULL > + depends on MX6ULL > select DM > select DM_ETH > select DM_GPIO > @@ -563,11 +568,12 @@ config TARGET_SECOMX6 > > config TARGET_SKSIMX6 > bool "sks-imx6" > + depends on MX6QDL > select SUPPORT_SPL > > config TARGET_SOMLABS_VISIONSOM_6ULL > bool "visionsom-6ull" > - select MX6ULL > + depends on MX6ULL > select BOARD_LATE_INIT > select DM > select DM_ETH > @@ -579,12 +585,15 @@ config TARGET_SOMLABS_VISIONSOM_6ULL > > config TARGET_TBS2910 > bool "TBS2910 Matrix ARM mini PC" > + depends on MX6Q > > config TARGET_TITANIUM > bool "titanium" > + depends on MX6Q > > config TARGET_KP_IMX6Q_TPC > bool "K+P KP_IMX6Q_TPC i.MX6 Quad" > + depends on MX6QDL > select BOARD_EARLY_INIT_F > select BOARD_LATE_INIT > select DM > @@ -598,7 +607,6 @@ config TARGET_KP_IMX6Q_TPC > select DM_I2C > select DM_GPIO > select DM_USB > - select MX6QDL > select SUPPORT_SPL > select SPL_SEPARATE_BSS if SPL > imply CMD_DM > @@ -621,45 +629,45 @@ config TARGET_TQMA6 > > config TARGET_UDOO > bool "udoo" > + depends on MX6QDL > select BOARD_LATE_INIT > - select MX6QDL > select SUPPORT_SPL > > config TARGET_UDOO_NEO > bool "UDOO Neo" > + depends on MX6SX > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6SX > select SUPPORT_SPL > imply CMD_DM > > config TARGET_SOFTING_VINING_2000 > bool "Softing VIN|ING 2000" > + depends on MX6SX > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6SX > select SUPPORT_SPL > imply CMD_DM > > config TARGET_WANDBOARD > bool "wandboard" > + depends on MX6QDL > select BOARD_LATE_INIT > - select MX6QDL > select SUPPORT_SPL > > config TARGET_WARP > bool "WaRP" > + depends on MX6SL > select BOARD_LATE_INIT > - select MX6SL > > config TARGET_XPRESS > bool "CCV xPress" > + depends on MX6UL > select BOARD_LATE_INIT > select DM > select DM_THERMAL > - select MX6UL > select SUPPORT_SPL > imply CMD_DM > > @@ -681,8 +689,8 @@ config TARGET_ZC5601 > > config TARGET_BRPPT2 > bool "brppt2" > + depends on MX6QDL > select BOARD_LATE_INIT > - select MX6QDL > select OF_CONTROL > select SPL_OF_LIBFDT > select DM > diff --git a/board/seco/Kconfig b/board/seco/Kconfig > index af1669733f19..12dd965ad52a 100644 > --- a/board/seco/Kconfig > +++ b/board/seco/Kconfig > @@ -21,15 +21,15 @@ choice > > config SECOMX6Q > bool "i.MX6Q" > - select MX6Q > + depends on MX6Q > > config SECOMX6DL > bool "i.MX6DL" > - select MX6DL > + depends on MX6DL > > config SECOMX6S > bool "i.MX6S" > - select MX6S > + depends on MX6S > > endchoice > > diff --git a/board/tbs/tbs2910/Kconfig b/board/tbs/tbs2910/Kconfig > index 2e5e1d492a52..d0ff2191a8ad 100644 > --- a/board/tbs/tbs2910/Kconfig > +++ b/board/tbs/tbs2910/Kconfig > @@ -9,9 +9,6 @@ config SYS_VENDOR > config SYS_CONFIG_NAME > default "tbs2910" > > -config MX6Q > - default y > - > config IMX_CONFIG > default "board/tbs/tbs2910/tbs2910.cfg" > > diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig > index 084fdb5230e9..0cf6d8303809 100644 > --- a/board/tqc/tqma6/Kconfig > +++ b/board/tqc/tqma6/Kconfig > @@ -18,19 +18,19 @@ choice > > config TQMA6Q > bool "TQMa6Q / TQMa6D" > - select MX6Q > + depends on MX6Q > help > select TQMa6Q / TQMa6D with i.MX6Q/D and 1GiB DRAM > > config TQMA6DL > bool "TQMa6DL" > - select MX6DL > + depends on MX6DL > help > select TQMa6DL with i.MX6DL and 1GiB DRAM > > config TQMA6S > bool "TQMa6S" > - select MX6S > + depends on MX6S > help > select TQMa6S with i.MX6S and 512 MiB DRAM > > diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig > index 22ddbe71ba96..ec6f782f515a 100644 > --- a/configs/apalis_imx6_defconfig > +++ b/configs/apalis_imx6_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xFFFFDE00 > +CONFIG_MX6Q=y > CONFIG_TARGET_APALIS_IMX6=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > @@ -18,7 +19,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis" > CONFIG_AHCI=y > CONFIG_DISTRO_DEFAULTS=y > CONFIG_FIT=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_BOOTDELAY=1 > CONFIG_MISC_INIT_R=y > CONFIG_VERSION_VARIABLE=y > diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig > index 18312f921a3e..8aeee5d8bd83 100644 > --- a/configs/aristainetos2_defconfig > +++ b/configs/aristainetos2_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_SYS_MALLOC_F_LEN=0xe000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_OFFSET=0xD0000 > +CONFIG_MX6DL=y > CONFIG_TARGET_ARISTAINETOS2=y > CONFIG_DM_GPIO=y > CONFIG_ENV_OFFSET_REDUND=0xE0000 > diff --git a/configs/aristainetos2b_defconfig > b/configs/aristainetos2b_defconfig > index 82280bc00054..7e2cf085e9e6 100644 > --- a/configs/aristainetos2b_defconfig > +++ b/configs/aristainetos2b_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_SYS_MALLOC_F_LEN=0xe000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_OFFSET=0xD0000 > +CONFIG_MX6DL=y > CONFIG_TARGET_ARISTAINETOS2B=y > CONFIG_DM_GPIO=y > CONFIG_ENV_OFFSET_REDUND=0xE0000 > diff --git a/configs/aristainetos2bcsl_defconfig > b/configs/aristainetos2bcsl_defconfig > index 377228306b72..5b35bd3a431d 100644 > --- a/configs/aristainetos2bcsl_defconfig > +++ b/configs/aristainetos2bcsl_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_SYS_MALLOC_F_LEN=0xe000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_OFFSET=0xD0000 > +CONFIG_MX6DL=y > CONFIG_TARGET_ARISTAINETOS2BCSL=y > CONFIG_DM_GPIO=y > CONFIG_ENV_OFFSET_REDUND=0xE0000 > diff --git a/configs/aristainetos2c_defconfig > b/configs/aristainetos2c_defconfig > index 63914535ea0c..1bbdc1db943d 100644 > --- a/configs/aristainetos2c_defconfig > +++ b/configs/aristainetos2c_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_SYS_MALLOC_F_LEN=0xe000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_OFFSET=0xD0000 > +CONFIG_MX6DL=y > CONFIG_TARGET_ARISTAINETOS2C=y > CONFIG_DM_GPIO=y > CONFIG_ENV_OFFSET_REDUND=0xE0000 > diff --git a/configs/brppt2_defconfig b/configs/brppt2_defconfig > index d6f7ea2bc72a..9844f36f6042 100644 > --- a/configs/brppt2_defconfig > +++ b/configs/brppt2_defconfig > @@ -13,6 +13,7 @@ CONFIG_ENV_SIZE=0x10000 > CONFIG_ENV_OFFSET=0x20000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_BRPPT2=y > CONFIG_SPL_SERIAL_SUPPORT=y > CONFIG_SYS_BOOTCOUNT_ADDR=0x020CC068 > diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig > index 520991869e0d..140aac59e3bf 100644 > --- a/configs/cgtqmx6eval_defconfig > +++ b/configs/cgtqmx6eval_defconfig > @@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_CGTQMX6EVAL=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig > index 3b1681804110..25eecb61adb5 100644 > --- a/configs/cm_fx6_defconfig > +++ b/configs/cm_fx6_defconfig > @@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_CM_FX6=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/colibri-imx6ull_defconfig > b/configs/colibri-imx6ull_defconfig > index a1f6cf1a16d9..19139cf06518 100644 > --- a/configs/colibri-imx6ull_defconfig > +++ b/configs/colibri-imx6ull_defconfig > @@ -4,12 +4,13 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x380000 > +CONFIG_MX6ULL=y > CONFIG_TARGET_COLIBRI_IMX6ULL=y > CONFIG_DM_GPIO=y > CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri" > CONFIG_DISTRO_DEFAULTS=y > CONFIG_FIT=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ul > l/imximage.cfg,MX6ULL,IMX_NAND" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ul > l/imximage.cfg,IMX_NAND" > CONFIG_BOOTDELAY=1 > # CONFIG_USE_BOOTCOMMAND is not set > # CONFIG_CONSOLE_MUX is not set > diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig > index 9506b91f3d28..4885ed6121a7 100644 > --- a/configs/colibri_imx6_defconfig > +++ b/configs/colibri_imx6_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xFFFFDE00 > +CONFIG_MX6DL=y > CONFIG_TARGET_COLIBRI_IMX6=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > @@ -17,7 +18,7 @@ CONFIG_CMD_HDMIDETECT=y > CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri" > CONFIG_DISTRO_DEFAULTS=y > CONFIG_FIT=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6DL" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_BOOTDELAY=1 > CONFIG_MISC_INIT_R=y > CONFIG_VERSION_VARIABLE=y > diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig > index 72797c0ea12a..a48e82155cda 100644 > --- a/configs/dh_imx6_defconfig > +++ b/configs/dh_imx6_defconfig > @@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x11400 > +CONFIG_MX6QDL=y > CONFIG_MX6_DDRCAL=y > CONFIG_TARGET_DHCOMIMX6=y > CONFIG_DM_GPIO=y > diff --git a/configs/display5_defconfig b/configs/display5_defconfig > index 9e3f165c3930..2d96f883bd8b 100644 > --- a/configs/display5_defconfig > +++ b/configs/display5_defconfig > @@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x10000 > CONFIG_ENV_OFFSET=0x120000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 > +CONFIG_MX6Q=y > CONFIG_MX6_DDRCAL=y > CONFIG_TARGET_DISPLAY5=y > CONFIG_SYS_I2C_MXC_I2C1=y > @@ -31,7 +32,7 @@ CONFIG_FIT=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_USE_SPL_FIT_GENERATOR is not set > CONFIG_OF_BOARD_SETUP=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_SUPPORT_RAW_INITRD=y > CONFIG_MISC_INIT_R=y > CONFIG_BOUNCE_BUFFER=y > diff --git a/configs/display5_factory_defconfig > b/configs/display5_factory_defconfig > index 7a11b34755e4..476cada371da 100644 > --- a/configs/display5_factory_defconfig > +++ b/configs/display5_factory_defconfig > @@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x10000 > CONFIG_ENV_OFFSET=0x120000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 > +CONFIG_MX6Q=y > CONFIG_MX6_DDRCAL=y > CONFIG_TARGET_DISPLAY5=y > CONFIG_SYS_I2C_MXC_I2C1=y > @@ -28,7 +29,7 @@ CONFIG_FIT=y > CONFIG_SPL_LOAD_FIT=y > # CONFIG_USE_SPL_FIT_GENERATOR is not set > CONFIG_OF_BOARD_SETUP=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_BOOTDELAY=3 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="echo SDP Display5 recovery" > diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig > index 8dcbf527b2d5..dc2f85004796 100644 > --- a/configs/dms-ba16-1g_defconfig > +++ b/configs/dms-ba16-1g_defconfig > @@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x10000 > +CONFIG_MX6Q=y > CONFIG_TARGET_ADVANTECH_DMS_BA16=y > CONFIG_SYS_DDR_1G=y > CONFIG_BOOTDELAY=1 > diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig > index f26f66837fee..edf22e62eb80 100644 > --- a/configs/dms-ba16_defconfig > +++ b/configs/dms-ba16_defconfig > @@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x10000 > +CONFIG_MX6Q=y > CONFIG_TARGET_ADVANTECH_DMS_BA16=y > CONFIG_BOOTDELAY=1 > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig > index 59151dbaaced..84913f5771ef 100644 > --- a/configs/ge_bx50v3_defconfig > +++ b/configs/ge_bx50v3_defconfig > @@ -6,6 +6,7 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x10000 > +CONFIG_MX6Q=y > CONFIG_TARGET_GE_BX50V3=y > CONFIG_DM_GPIO=y > CONFIG_BOOTCOUNT_BOOTLIMIT=10 > diff --git a/configs/gwventana_emmc_defconfig > b/configs/gwventana_emmc_defconfig > index 537cbdf15215..ca119821fc97 100644 > --- a/configs/gwventana_emmc_defconfig > +++ b/configs/gwventana_emmc_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0xB1400 > +CONFIG_MX6QDL=y > CONFIG_TARGET_GW_VENTANA=y > CONFIG_CMD_EECONFIG=y > CONFIG_CMD_GSC=y > diff --git a/configs/gwventana_gw5904_defconfig > b/configs/gwventana_gw5904_defconfig > index 16ac54fb45cd..dde1665c5053 100644 > --- a/configs/gwventana_gw5904_defconfig > +++ b/configs/gwventana_gw5904_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0xB1400 > +CONFIG_MX6QDL=y > CONFIG_TARGET_GW_VENTANA=y > CONFIG_CMD_EECONFIG=y > CONFIG_CMD_GSC=y > diff --git a/configs/gwventana_nand_defconfig > b/configs/gwventana_nand_defconfig > index 94d42a415fb5..834eaa649fea 100644 > --- a/configs/gwventana_nand_defconfig > +++ b/configs/gwventana_nand_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x1000000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_GW_VENTANA=y > CONFIG_CMD_EECONFIG=y > CONFIG_CMD_GSC=y > diff --git a/configs/imx6dl_icore_nand_defconfig > b/configs/imx6dl_icore_nand_defconfig > index 9fde251387d6..b601dfc1654d 100644 > --- a/configs/imx6dl_icore_nand_defconfig > +++ b/configs/imx6dl_icore_nand_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x400000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MX6Q_ENGICAM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > diff --git a/configs/imx6dl_mamoj_defconfig > b/configs/imx6dl_mamoj_defconfig > index 395cd49ddbaa..9295509f0624 100644 > --- a/configs/imx6dl_mamoj_defconfig > +++ b/configs/imx6dl_mamoj_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MX6DL_MAMOJ=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_IMX_HAB=y > diff --git a/configs/imx6q_icore_nand_defconfig > b/configs/imx6q_icore_nand_defconfig > index 9fe5c8f058c1..735233332de6 100644 > --- a/configs/imx6q_icore_nand_defconfig > +++ b/configs/imx6q_icore_nand_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x400000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MX6Q_ENGICAM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig > index 35dfd8a30345..b8053181cb27 100644 > --- a/configs/imx6q_logic_defconfig > +++ b/configs/imx6q_logic_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x100000 > CONFIG_ENV_OFFSET=0x400000 > +CONFIG_MX6Q=y > CONFIG_MX6_OCRAM_256KB=y > CONFIG_TARGET_MX6LOGICPD=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/imx6qdl_icore_mipi_defconfig > b/configs/imx6qdl_icore_mipi_defconfig > index 78ad25c82fdd..1870e8667a82 100644 > --- a/configs/imx6qdl_icore_mipi_defconfig > +++ b/configs/imx6qdl_icore_mipi_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MX6Q_ENGICAM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > diff --git a/configs/imx6qdl_icore_mmc_defconfig > b/configs/imx6qdl_icore_mmc_defconfig > index 4f236399e1be..5ca5808ca2d9 100644 > --- a/configs/imx6qdl_icore_mmc_defconfig > +++ b/configs/imx6qdl_icore_mmc_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MX6Q_ENGICAM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > diff --git a/configs/imx6qdl_icore_nand_defconfig > b/configs/imx6qdl_icore_nand_defconfig > index 9fe5c8f058c1..735233332de6 100644 > --- a/configs/imx6qdl_icore_nand_defconfig > +++ b/configs/imx6qdl_icore_nand_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x400000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MX6Q_ENGICAM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > diff --git a/configs/imx6qdl_icore_rqs_defconfig > b/configs/imx6qdl_icore_rqs_defconfig > index b24b026dbe0e..d56ac591fa19 100644 > --- a/configs/imx6qdl_icore_rqs_defconfig > +++ b/configs/imx6qdl_icore_rqs_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MX6Q_ENGICAM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > diff --git a/configs/imx6ul_geam_mmc_defconfig > b/configs/imx6ul_geam_mmc_defconfig > index 0de925961899..2d483dca9662 100644 > --- a/configs/imx6ul_geam_mmc_defconfig > +++ b/configs/imx6ul_geam_mmc_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6UL=y > CONFIG_TARGET_MX6UL_ENGICAM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > diff --git a/configs/imx6ul_geam_nand_defconfig > b/configs/imx6ul_geam_nand_defconfig > index 73c7a75b2c16..31d11c56ffe5 100644 > --- a/configs/imx6ul_geam_nand_defconfig > +++ b/configs/imx6ul_geam_nand_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x400000 > +CONFIG_MX6UL=y > CONFIG_TARGET_MX6UL_ENGICAM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > diff --git a/configs/imx6ul_isiot_emmc_defconfig > b/configs/imx6ul_isiot_emmc_defconfig > index d5a4e90699b3..57a323c8d349 100644 > --- a/configs/imx6ul_isiot_emmc_defconfig > +++ b/configs/imx6ul_isiot_emmc_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6UL=y > CONFIG_TARGET_MX6UL_ENGICAM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > diff --git a/configs/imx6ul_isiot_nand_defconfig > b/configs/imx6ul_isiot_nand_defconfig > index b4db4a54be39..4d2fdf17b68d 100644 > --- a/configs/imx6ul_isiot_nand_defconfig > +++ b/configs/imx6ul_isiot_nand_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x400000 > +CONFIG_MX6UL=y > CONFIG_TARGET_MX6UL_ENGICAM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig > index d88f515a82f9..deac7dc6feb1 100644 > --- a/configs/kp_imx6q_tpc_defconfig > +++ b/configs/kp_imx6q_tpc_defconfig > @@ -8,6 +8,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2200 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6QDL=y > CONFIG_MX6_DDRCAL=y > CONFIG_TARGET_KP_IMX6Q_TPC=y > CONFIG_SYS_I2C_MXC_I2C1=y > diff --git a/configs/liteboard_defconfig b/configs/liteboard_defconfig > index d0b79e614b0b..38b9a7bce1ce 100644 > --- a/configs/liteboard_defconfig > +++ b/configs/liteboard_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x80000 > +CONFIG_MX6UL=y > CONFIG_TARGET_LITEBOARD=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig > index 0d2b9b3cf755..bed1f5cbc715 100644 > --- a/configs/marsboard_defconfig > +++ b/configs/marsboard_defconfig > @@ -5,9 +5,10 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x2000 > +CONFIG_MX6Q=y > CONFIG_TARGET_EMBESTMX6BOARDS=y > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6q.cfg,MX6Q,DDR_MB=1024" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6q.cfg,DDR_MB=1024" > CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd" > # CONFIG_CONSOLE_MUX is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > diff --git a/configs/mccmon6_nor_defconfig > b/configs/mccmon6_nor_defconfig > index b4f6aa2ba3c8..691718559769 100644 > --- a/configs/mccmon6_nor_defconfig > +++ b/configs/mccmon6_nor_defconfig > @@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_SECT_SIZE=0x20000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MCCMON6=y > CONFIG_SYS_I2C_MXC_I2C1=y > CONFIG_SYS_I2C_MXC_I2C2=y > diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig > index 888c86298312..b7b5453bfe9a 100644 > --- a/configs/mccmon6_sd_defconfig > +++ b/configs/mccmon6_sd_defconfig > @@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_SECT_SIZE=0x20000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MCCMON6=y > CONFIG_SYS_I2C_MXC_I2C1=y > CONFIG_SYS_I2C_MXC_I2C2=y > diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig > index dcc28c576e2d..41a929efc35b 100644 > --- a/configs/mx6cuboxi_defconfig > +++ b/configs/mx6cuboxi_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xFE000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MX6CUBOXI=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig > index 5c6fc53983fb..ae83a9f7438b 100644 > --- a/configs/mx6dlarm2_defconfig > +++ b/configs/mx6dlarm2_defconfig > @@ -4,9 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6DL=y > CONFIG_TARGET_MX6QARM2=y > # CONFIG_CMD_BMODE is not set > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/i > mximage_mx6dl.cfg,MX6DL,DDR_MB=2048" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/ > imximage_mx6dl.cfg,DDR_MB=2048" > CONFIG_BOOTDELAY=3 > CONFIG_SUPPORT_RAW_INITRD=y > CONFIG_BOUNCE_BUFFER=y > diff --git a/configs/mx6dlarm2_lpddr2_defconfig > b/configs/mx6dlarm2_lpddr2_defconfig > index 2882bab6dc7e..32b60863e97c 100644 > --- a/configs/mx6dlarm2_lpddr2_defconfig > +++ b/configs/mx6dlarm2_lpddr2_defconfig > @@ -4,9 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6DL=y > CONFIG_TARGET_MX6QARM2=y > # CONFIG_CMD_BMODE is not set > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/i > mximage_mx6dl.cfg,MX6DL,MX6DL_LPDDR2,DDR_MB=512" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/ > imximage_mx6dl.cfg,MX6DL_LPDDR2,DDR_MB=512" > CONFIG_BOOTDELAY=3 > CONFIG_SUPPORT_RAW_INITRD=y > CONFIG_BOUNCE_BUFFER=y > diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig > index 32f721568327..15990914eff4 100644 > --- a/configs/mx6memcal_defconfig > +++ b/configs/mx6memcal_defconfig > @@ -5,12 +5,13 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > +CONFIG_MX6QDL=y > CONFIG_MX6_DDRCAL=y > CONFIG_TARGET_MX6MEMCAL=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > CONFIG_SPL=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,SPL,MX6QDL" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg,SPL" > CONFIG_SUPPORT_RAW_INITRD=y > CONFIG_BOUNCE_BUFFER=y > CONFIG_SPL_USB_HOST_SUPPORT=y > diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig > index 12ece7ba8212..f4f699c0806c 100644 > --- a/configs/mx6qarm2_defconfig > +++ b/configs/mx6qarm2_defconfig > @@ -4,9 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6Q=y > CONFIG_TARGET_MX6QARM2=y > # CONFIG_CMD_BMODE is not set > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/i > mximage.cfg,MX6Q,DDR_MB=2048" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/ > imximage.cfg,DDR_MB=2048" > CONFIG_BOOTDELAY=3 > CONFIG_SUPPORT_RAW_INITRD=y > CONFIG_BOUNCE_BUFFER=y > diff --git a/configs/mx6qarm2_lpddr2_defconfig > b/configs/mx6qarm2_lpddr2_defconfig > index ed767f0dffc9..907510be09f9 100644 > --- a/configs/mx6qarm2_lpddr2_defconfig > +++ b/configs/mx6qarm2_lpddr2_defconfig > @@ -4,9 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6Q=y > CONFIG_TARGET_MX6QARM2=y > # CONFIG_CMD_BMODE is not set > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/i > mximage.cfg,MX6Q,MX6DQ_LPDDR2,DDR_MB=512" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/ > imximage.cfg,MX6DQ_LPDDR2,DDR_MB=512" > CONFIG_BOOTDELAY=3 > CONFIG_SUPPORT_RAW_INITRD=y > CONFIG_BOUNCE_BUFFER=y > diff --git a/configs/mx6qsabrelite_defconfig > b/configs/mx6qsabrelite_defconfig > index 216e21ad79d2..d85f831471e2 100644 > --- a/configs/mx6qsabrelite_defconfig > +++ b/configs/mx6qsabrelite_defconfig > @@ -5,13 +5,14 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6Q=y > CONFIG_TARGET_NITROGEN6X=y > CONFIG_DM_GPIO=y > CONFIG_CMD_HDMIDETECT=y > CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabrelite" > CONFIG_AHCI=y > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6q.cfg,DDR_MB=1024,SABRELITE" > CONFIG_BOOTDELAY=3 > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_USE_PREBOOT=y > diff --git a/configs/mx6sabreauto_defconfig > b/configs/mx6sabreauto_defconfig > index 0065a3417d5f..2c61cf512554 100644 > --- a/configs/mx6sabreauto_defconfig > +++ b/configs/mx6sabreauto_defconfig > @@ -8,6 +8,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MX6SABREAUTO=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig > index 69e114220533..dce8b568e3f8 100644 > --- a/configs/mx6sabresd_defconfig > +++ b/configs/mx6sabresd_defconfig > @@ -8,6 +8,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_MX6SABRESD=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig > index 9d74ce42c275..ff811a9f8656 100644 > --- a/configs/mx6slevk_defconfig > +++ b/configs/mx6slevk_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x80000 > +CONFIG_MX6SL=y > CONFIG_TARGET_MX6SLEVK=y > CONFIG_DM_GPIO=y > # CONFIG_CMD_BMODE is not set > diff --git a/configs/mx6slevk_spinor_defconfig > b/configs/mx6slevk_spinor_defconfig > index 575c408e0b72..f9d18ce03921 100644 > --- a/configs/mx6slevk_spinor_defconfig > +++ b/configs/mx6slevk_spinor_defconfig > @@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x10000 > +CONFIG_MX6SL=y > CONFIG_TARGET_MX6SLEVK=y > CONFIG_DM_GPIO=y > # CONFIG_CMD_BMODE is not set > diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig > index 35741699b8cb..99c4cdfae7d2 100644 > --- a/configs/mx6slevk_spl_defconfig > +++ b/configs/mx6slevk_spl_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x80000 > +CONFIG_MX6SL=y > CONFIG_TARGET_MX6SLEVK=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/mx6sllevk_defconfig b/configs/mx6sllevk_defconfig > index a0e316432189..67213c75d390 100644 > --- a/configs/mx6sllevk_defconfig > +++ b/configs/mx6sllevk_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6SLL=y > CONFIG_TARGET_MX6SLLEVK=y > CONFIG_DM_GPIO=y > # CONFIG_CMD_BMODE is not set > diff --git a/configs/mx6sllevk_plugin_defconfig > b/configs/mx6sllevk_plugin_defconfig > index 6753a880ed46..6f249d62d43b 100644 > --- a/configs/mx6sllevk_plugin_defconfig > +++ b/configs/mx6sllevk_plugin_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6SLL=y > CONFIG_TARGET_MX6SLLEVK=y > CONFIG_DM_GPIO=y > CONFIG_USE_IMXIMG_PLUGIN=y > diff --git a/configs/mx6sxsabreauto_defconfig > b/configs/mx6sxsabreauto_defconfig > index 75709a0e4c27..d018de7feb48 100644 > --- a/configs/mx6sxsabreauto_defconfig > +++ b/configs/mx6sxsabreauto_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x80000 > +CONFIG_MX6SX=y > CONFIG_TARGET_MX6SXSABREAUTO=y > CONFIG_DM_GPIO=y > # CONFIG_CMD_BMODE is not set > diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig > index ee498fdbbf6b..7d5450d598f8 100644 > --- a/configs/mx6sxsabresd_defconfig > +++ b/configs/mx6sxsabresd_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xE0000 > +CONFIG_MX6SX=y > CONFIG_TARGET_MX6SXSABRESD=y > CONFIG_DM_GPIO=y > # CONFIG_CMD_BMODE is not set > diff --git a/configs/mx6ul_14x14_evk_defconfig > b/configs/mx6ul_14x14_evk_defconfig > index c60e69d445d4..583bd1a90e1e 100644 > --- a/configs/mx6ul_14x14_evk_defconfig > +++ b/configs/mx6ul_14x14_evk_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6UL=y > CONFIG_TARGET_MX6UL_14X14_EVK=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/mx6ul_9x9_evk_defconfig > b/configs/mx6ul_9x9_evk_defconfig > index 025165787ba8..91c9a0ec6ab0 100644 > --- a/configs/mx6ul_9x9_evk_defconfig > +++ b/configs/mx6ul_9x9_evk_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x80000 > +CONFIG_MX6UL=y > CONFIG_TARGET_MX6UL_9X9_EVK=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/mx6ull_14x14_evk_defconfig > b/configs/mx6ull_14x14_evk_defconfig > index ee90a66aa956..dd31a3fb1036 100644 > --- a/configs/mx6ull_14x14_evk_defconfig > +++ b/configs/mx6ull_14x14_evk_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6ULL=y > CONFIG_TARGET_MX6ULL_14X14_EVK=y > CONFIG_DM_GPIO=y > CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk" > diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig > b/configs/mx6ull_14x14_evk_plugin_defconfig > index 6c20a3559325..72289ef5bd10 100644 > --- a/configs/mx6ull_14x14_evk_plugin_defconfig > +++ b/configs/mx6ull_14x14_evk_plugin_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6ULL=y > CONFIG_TARGET_MX6ULL_14X14_EVK=y > CONFIG_DM_GPIO=y > CONFIG_USE_IMXIMG_PLUGIN=y > diff --git a/configs/mx6ulz_14x14_evk_defconfig > b/configs/mx6ulz_14x14_evk_defconfig > index ca6784210a91..5507860effc8 100644 > --- a/configs/mx6ulz_14x14_evk_defconfig > +++ b/configs/mx6ulz_14x14_evk_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6ULL=y > CONFIG_TARGET_MX6ULL_14X14_EVK=y > CONFIG_DM_GPIO=y > CONFIG_DEFAULT_DEVICE_TREE="imx6ulz-14x14-evk" > diff --git a/configs/myir_mys_6ulx_defconfig > b/configs/myir_mys_6ulx_defconfig > index defa353b6e75..02b2060874aa 100644 > --- a/configs/myir_mys_6ulx_defconfig > +++ b/configs/myir_mys_6ulx_defconfig > @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=8 > CONFIG_ENV_SIZE=0x4000 > +CONFIG_MX6ULL=y > CONFIG_TARGET_MYS_6ULX=y > CONFIG_SPL_TEXT_BASE=0x908000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig > index 3131c51bdeda..7b18cc631dc0 100644 > --- a/configs/nitrogen6dl2g_defconfig > +++ b/configs/nitrogen6dl2g_defconfig > @@ -6,12 +6,13 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x2000 > +CONFIG_MX6DL=y > CONFIG_TARGET_NITROGEN6X=y > CONFIG_DM_GPIO=y > CONFIG_CMD_HDMIDETECT=y > CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x" > CONFIG_AHCI=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6dl2g.cfg,DDR_MB=2048" > CONFIG_BOOTDELAY=3 > CONFIG_USE_PREBOOT=y > CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y > diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig > index 86c2c4ff13dc..43264274f574 100644 > --- a/configs/nitrogen6dl_defconfig > +++ b/configs/nitrogen6dl_defconfig > @@ -6,12 +6,13 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x2000 > +CONFIG_MX6DL=y > CONFIG_TARGET_NITROGEN6X=y > CONFIG_DM_GPIO=y > CONFIG_CMD_HDMIDETECT=y > CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x" > CONFIG_AHCI=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6dl.cfg,MX6DL,DDR_MB=1024" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6dl.cfg,DDR_MB=1024" > CONFIG_BOOTDELAY=3 > CONFIG_USE_PREBOOT=y > CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y > diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig > index 16cf5f3e5b19..bb28fcfcbb25 100644 > --- a/configs/nitrogen6q2g_defconfig > +++ b/configs/nitrogen6q2g_defconfig > @@ -6,12 +6,13 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x2000 > +CONFIG_MX6Q=y > CONFIG_TARGET_NITROGEN6X=y > CONFIG_DM_GPIO=y > CONFIG_CMD_HDMIDETECT=y > CONFIG_DEFAULT_DEVICE_TREE="imx6q-nitrogen6x" > CONFIG_AHCI=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6q2g.cfg,DDR_MB=2048" > CONFIG_BOOTDELAY=3 > CONFIG_USE_PREBOOT=y > CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y > diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig > index ea9098ad68a5..6c15732163f2 100644 > --- a/configs/nitrogen6q_defconfig > +++ b/configs/nitrogen6q_defconfig > @@ -6,12 +6,13 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x2000 > +CONFIG_MX6Q=y > CONFIG_TARGET_NITROGEN6X=y > CONFIG_DM_GPIO=y > CONFIG_CMD_HDMIDETECT=y > CONFIG_DEFAULT_DEVICE_TREE="imx6q-nitrogen6x" > CONFIG_AHCI=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6q.cfg,MX6Q,DDR_MB=1024" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6q.cfg,DDR_MB=1024" > CONFIG_BOOTDELAY=3 > CONFIG_USE_PREBOOT=y > CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y > diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig > index 8a67b419e0fc..3c7cec70888d 100644 > --- a/configs/nitrogen6s1g_defconfig > +++ b/configs/nitrogen6s1g_defconfig > @@ -6,12 +6,13 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x2000 > +CONFIG_MX6S=y > CONFIG_TARGET_NITROGEN6X=y > CONFIG_DM_GPIO=y > CONFIG_CMD_HDMIDETECT=y > CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x" > CONFIG_AHCI=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6s1g.cfg,MX6S,DDR_MB=1024" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6s1g.cfg,DDR_MB=1024" > CONFIG_BOOTDELAY=3 > CONFIG_USE_PREBOOT=y > CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y > diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig > index 71dff7ae857b..ebbe06bcc78b 100644 > --- a/configs/nitrogen6s_defconfig > +++ b/configs/nitrogen6s_defconfig > @@ -6,12 +6,13 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > CONFIG_ENV_SECT_SIZE=0x2000 > +CONFIG_MX6S=y > CONFIG_TARGET_NITROGEN6X=y > CONFIG_DM_GPIO=y > CONFIG_CMD_HDMIDETECT=y > CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x" > CONFIG_AHCI=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6s.cfg,MX6S,DDR_MB=512" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6s.cfg,DDR_MB=512" > CONFIG_BOOTDELAY=3 > CONFIG_USE_PREBOOT=y > CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y > diff --git a/configs/novena_defconfig b/configs/novena_defconfig > index 33cda1b383c4..edf15ad89a7a 100644 > --- a/configs/novena_defconfig > +++ b/configs/novena_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x80000 > +CONFIG_MX6Q=y > CONFIG_MX6_DDRCAL=y > CONFIG_TARGET_KOSAGI_NOVENA=y > CONFIG_SPL_TEXT_BASE=0x00908000 > @@ -21,7 +22,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-novena" > CONFIG_AHCI=y > CONFIG_DISTRO_DEFAULTS=y > CONFIG_FIT=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_USE_BOOTARGS=y > CONFIG_BOOTARGS="console=ttymxc1,115200 " > CONFIG_BOOTCOMMAND="run distro_bootcmd ; run net_nfs" > diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig > index ba85932b4dde..310690600422 100644 > --- a/configs/opos6uldev_defconfig > +++ b/configs/opos6uldev_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2800 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6UL=y > CONFIG_TARGET_OPOS6ULDEV=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig > index 7ee4aaa79891..9af4998126f7 100644 > --- a/configs/ot1200_defconfig > +++ b/configs/ot1200_defconfig > @@ -5,8 +5,9 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x10000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > +CONFIG_MX6Q=y > CONFIG_TARGET_OT1200=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx > 6q_4x_mt41j128.cfg,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/m > x6q_4x_mt41j128.cfg" > CONFIG_BOOTDELAY=3 > CONFIG_USE_PREBOOT=y > CONFIG_SUPPORT_RAW_INITRD=y > diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig > index 726030592043..be02c7538de0 100644 > --- a/configs/ot1200_spl_defconfig > +++ b/configs/ot1200_spl_defconfig > @@ -9,13 +9,14 @@ CONFIG_ENV_SIZE=0x10000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 > +CONFIG_MX6Q=y > CONFIG_TARGET_OT1200=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_SERIAL_SUPPORT=y > CONFIG_SPL=y > CONFIG_SPL_SPI_FLASH_SUPPORT=y > CONFIG_SPL_SPI_SUPPORT=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_BOOTDELAY=3 > CONFIG_USE_PREBOOT=y > CONFIG_SUPPORT_RAW_INITRD=y > diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig > index 592d133584e0..6b1afb830044 100644 > --- a/configs/pcm058_defconfig > +++ b/configs/pcm058_defconfig > @@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x31400 > +CONFIG_MX6Q=y > CONFIG_MX6_OCRAM_256KB=y > CONFIG_TARGET_PCM058=y > CONFIG_DM_GPIO=y > @@ -25,7 +26,7 @@ CONFIG_CMD_HDMIDETECT=y > CONFIG_DEFAULT_DEVICE_TREE="imx6q-phytec-mira-rdk-nand" > CONFIG_DISTRO_DEFAULTS=y > CONFIG_FIT=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_BOOTDELAY=3 > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig > index 78c190a692a8..fc1efa02fa9e 100644 > --- a/configs/pfla02_defconfig > +++ b/configs/pfla02_defconfig > @@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_PFLA02=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/phycore_pcl063_defconfig > b/configs/phycore_pcl063_defconfig > index cf18986d1def..a5b5dfacacf7 100644 > --- a/configs/phycore_pcl063_defconfig > +++ b/configs/phycore_pcl063_defconfig > @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=8 > CONFIG_ENV_SIZE=0x4000 > +CONFIG_MX6UL=y > CONFIG_TARGET_PCL063=y > CONFIG_SPL_TEXT_BASE=0x00909000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/phycore_pcl063_ull_defconfig > b/configs/phycore_pcl063_ull_defconfig > index f5b30354e8bd..9cc0892daba9 100644 > --- a/configs/phycore_pcl063_ull_defconfig > +++ b/configs/phycore_pcl063_ull_defconfig > @@ -5,6 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=8 > CONFIG_ENV_SIZE=0x4000 > +CONFIG_MX6ULL=y > CONFIG_TARGET_PCL063_ULL=y > CONFIG_SPL_TEXT_BASE=0x908000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/pico-dwarf-imx6ul_defconfig > b/configs/pico-dwarf-imx6ul_defconfig > index 4f01ae00990e..deef6020a3a8 100644 > --- a/configs/pico-dwarf-imx6ul_defconfig > +++ b/configs/pico-dwarf-imx6ul_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6UL=y > CONFIG_TARGET_PICO_IMX6UL=y > CONFIG_DM_GPIO=y > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/pico-hobbit-imx6ul_defconfig > b/configs/pico-hobbit-imx6ul_defconfig > index f8aaf9b6fa83..cf3f93fff413 100644 > --- a/configs/pico-hobbit-imx6ul_defconfig > +++ b/configs/pico-hobbit-imx6ul_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6UL=y > CONFIG_TARGET_PICO_IMX6UL=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/pico-imx6_defconfig b/configs/pico-imx6_defconfig > index 231654439869..a71d867796b0 100644 > --- a/configs/pico-imx6_defconfig > +++ b/configs/pico-imx6_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_PICO_IMX6=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig > index 5c841c3e4b0c..637aa877ac45 100644 > --- a/configs/pico-imx6ul_defconfig > +++ b/configs/pico-imx6ul_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6UL=y > CONFIG_TARGET_PICO_IMX6UL=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/pico-pi-imx6ul_defconfig > b/configs/pico-pi-imx6ul_defconfig > index 1d1b8d5bf715..4b67156b3e5b 100644 > --- a/configs/pico-pi-imx6ul_defconfig > +++ b/configs/pico-pi-imx6ul_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6UL=y > CONFIG_TARGET_PICO_IMX6UL=y > CONFIG_DM_GPIO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > diff --git a/configs/platinum_picon_defconfig > b/configs/platinum_picon_defconfig > index 4e6c9b85f526..b401646742ed 100644 > --- a/configs/platinum_picon_defconfig > +++ b/configs/platinum_picon_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x1000000 > +CONFIG_MX6DL=y > CONFIG_TARGET_PLATINUM_PICON=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > @@ -14,7 +15,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y > CONFIG_SPL=y > CONFIG_ENV_OFFSET_REDUND=0x1080000 > CONFIG_SPL_LIBDISK_SUPPORT=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6DL" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_BOOTDELAY=3 > CONFIG_USE_PREBOOT=y > CONFIG_SUPPORT_RAW_INITRD=y > diff --git a/configs/platinum_titanium_defconfig > b/configs/platinum_titanium_defconfig > index 586345f0146e..d1d7d81142ad 100644 > --- a/configs/platinum_titanium_defconfig > +++ b/configs/platinum_titanium_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x1000000 > +CONFIG_MX6Q=y > CONFIG_TARGET_PLATINUM_TITANIUM=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > @@ -14,7 +15,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y > CONFIG_SPL=y > CONFIG_ENV_OFFSET_REDUND=0x1080000 > CONFIG_SPL_LIBDISK_SUPPORT=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_BOOTDELAY=3 > CONFIG_USE_PREBOOT=y > CONFIG_SUPPORT_RAW_INITRD=y > diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig > index e9d0933616dc..135387a31817 100644 > --- a/configs/riotboard_defconfig > +++ b/configs/riotboard_defconfig > @@ -4,9 +4,10 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6S=y > CONFIG_TARGET_EMBESTMX6BOARDS=y > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6s1g.cfg,MX6S,DDR_MB=1024" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6s1g.cfg,DDR_MB=1024" > CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd" > # CONFIG_CONSOLE_MUX is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > diff --git a/configs/riotboard_spl_defconfig b/configs/riotboard_spl_defconfig > index 08150ed1c1b4..ddc551899997 100644 > --- a/configs/riotboard_spl_defconfig > +++ b/configs/riotboard_spl_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6S=y > CONFIG_TARGET_EMBESTMX6BOARDS=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > @@ -14,7 +15,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y > CONFIG_SPL=y > CONFIG_SPL_LIBDISK_SUPPORT=y > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6s1g.cfg,SPL,MX6S,DDR_MB=1024" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/ > nitrogen6s1g.cfg,SPL,DDR_MB=1024" > CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd" > # CONFIG_CONSOLE_MUX is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig > index 6ab5d9eba889..2c1f553ed498 100644 > --- a/configs/secomx6quq7_defconfig > +++ b/configs/secomx6quq7_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6Q=y > CONFIG_TARGET_SECOMX6=y > CONFIG_SECOMX6_UQ7=y > CONFIG_SECOMX6Q=y > diff --git a/configs/sksimx6_defconfig b/configs/sksimx6_defconfig > index 484ece7b4aad..e81fc79ea29a 100644 > --- a/configs/sksimx6_defconfig > +++ b/configs/sksimx6_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6QDL=y > CONFIG_MX6_DDRCAL=y > CONFIG_TARGET_SKSIMX6=y > CONFIG_SPL_TEXT_BASE=0x00908000 > @@ -18,7 +19,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y > CONFIG_DISTRO_DEFAULTS=y > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6QDL" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_BOOTDELAY=1 > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SILENT_CONSOLE=y > diff --git a/configs/somlabs_visionsom_6ull_defconfig > b/configs/somlabs_visionsom_6ull_defconfig > index e3f633c8fe7d..e9e1586f378f 100644 > --- a/configs/somlabs_visionsom_6ull_defconfig > +++ b/configs/somlabs_visionsom_6ull_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6ULL=y > CONFIG_TARGET_SOMLABS_VISIONSOM_6ULL=y > CONFIG_DEFAULT_DEVICE_TREE="imx6ull-somlabs-visionsom" > CONFIG_FIT=y > diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig > index 22c5ce8ee1c4..34d240565eb2 100644 > --- a/configs/tbs2910_defconfig > +++ b/configs/tbs2910_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6Q=y > CONFIG_TARGET_TBS2910=y > CONFIG_DM_GPIO=y > CONFIG_PRE_CON_BUF_ADDR=0x7c000000 > diff --git a/configs/titanium_defconfig b/configs/titanium_defconfig > index 371228a01bb2..1f0af99df4ce 100644 > --- a/configs/titanium_defconfig > +++ b/configs/titanium_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x17800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x1000000 > +CONFIG_MX6Q=y > CONFIG_TARGET_TITANIUM=y > CONFIG_ENV_OFFSET_REDUND=0x1080000 > > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/barco/titanium/imxima > ge.cfg" > diff --git a/configs/tqma6dl_mba6_mmc_defconfig > b/configs/tqma6dl_mba6_mmc_defconfig > index 1ad8db023137..34a226ed3dd0 100644 > --- a/configs/tqma6dl_mba6_mmc_defconfig > +++ b/configs/tqma6dl_mba6_mmc_defconfig > @@ -3,8 +3,8 @@ CONFIG_ARCH_MX6=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6DL=y > CONFIG_TARGET_TQMA6=y > -CONFIG_TQMA6DL=y > CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mba6b" > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > diff --git a/configs/tqma6dl_mba6_spi_defconfig > b/configs/tqma6dl_mba6_spi_defconfig > index ccec893a7da3..09966422ed14 100644 > --- a/configs/tqma6dl_mba6_spi_defconfig > +++ b/configs/tqma6dl_mba6_spi_defconfig > @@ -4,8 +4,8 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x80000 > CONFIG_ENV_SECT_SIZE=0x10000 > +CONFIG_MX6DL=y > CONFIG_TARGET_TQMA6=y > -CONFIG_TQMA6DL=y > CONFIG_TQMA6X_SPI_BOOT=y > CONFIG_ENV_OFFSET_REDUND=0x90000 > CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mba6b" > diff --git a/configs/tqma6q_mba6_mmc_defconfig > b/configs/tqma6q_mba6_mmc_defconfig > index 9ce24d9c6ae5..8bc9684eeb36 100644 > --- a/configs/tqma6q_mba6_mmc_defconfig > +++ b/configs/tqma6q_mba6_mmc_defconfig > @@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6Q=y > CONFIG_TARGET_TQMA6=y > CONFIG_DEFAULT_DEVICE_TREE="imx6q-mba6b" > CONFIG_FIT=y > diff --git a/configs/tqma6q_mba6_spi_defconfig > b/configs/tqma6q_mba6_spi_defconfig > index df4567a0f5aa..49521cd7e98d 100644 > --- a/configs/tqma6q_mba6_spi_defconfig > +++ b/configs/tqma6q_mba6_spi_defconfig > @@ -4,6 +4,7 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x80000 > CONFIG_ENV_SECT_SIZE=0x10000 > +CONFIG_MX6Q=y > CONFIG_TARGET_TQMA6=y > CONFIG_TQMA6X_SPI_BOOT=y > CONFIG_ENV_OFFSET_REDUND=0x90000 > diff --git a/configs/tqma6s_mba6_mmc_defconfig > b/configs/tqma6s_mba6_mmc_defconfig > index 39b609e7f357..55ed840b1c3d 100644 > --- a/configs/tqma6s_mba6_mmc_defconfig > +++ b/configs/tqma6s_mba6_mmc_defconfig > @@ -3,8 +3,8 @@ CONFIG_ARCH_MX6=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6S=y > CONFIG_TARGET_TQMA6=y > -CONFIG_TQMA6S=y > CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mba6b" > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > diff --git a/configs/tqma6s_mba6_spi_defconfig > b/configs/tqma6s_mba6_spi_defconfig > index fc439e14bc2d..420be4b1e141 100644 > --- a/configs/tqma6s_mba6_spi_defconfig > +++ b/configs/tqma6s_mba6_spi_defconfig > @@ -4,8 +4,8 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x80000 > CONFIG_ENV_SECT_SIZE=0x10000 > +CONFIG_MX6S=y > CONFIG_TARGET_TQMA6=y > -CONFIG_TQMA6S=y > CONFIG_TQMA6X_SPI_BOOT=y > CONFIG_ENV_OFFSET_REDUND=0x90000 > CONFIG_DEFAULT_DEVICE_TREE="imx6dl-mba6b" > diff --git a/configs/tqma6s_wru4_mmc_defconfig > b/configs/tqma6s_wru4_mmc_defconfig > index beda6ecb6e90..721583311c14 100644 > --- a/configs/tqma6s_wru4_mmc_defconfig > +++ b/configs/tqma6s_wru4_mmc_defconfig > @@ -3,11 +3,11 @@ CONFIG_ARCH_MX6=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > +CONFIG_MX6S=y > CONFIG_TARGET_TQMA6=y > CONFIG_SYS_I2C_MXC_I2C1=y > CONFIG_SYS_I2C_MXC_I2C2=y > CONFIG_SYS_I2C_MXC_I2C3=y > -CONFIG_TQMA6S=y > CONFIG_WRU4=y > CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000 > CONFIG_FIT=y > diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig > index a76b8d1b0d2b..0c9d90b28dba 100644 > --- a/configs/udoo_defconfig > +++ b/configs/udoo_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_UDOO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig > index 214e942d387c..0f6854f31045 100644 > --- a/configs/udoo_neo_defconfig > +++ b/configs/udoo_neo_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x80000 > +CONFIG_MX6SX=y > CONFIG_TARGET_UDOO_NEO=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/variscite_dart6ul_defconfig > b/configs/variscite_dart6ul_defconfig > index 3fca70012cee..37d9687c065c 100644 > --- a/configs/variscite_dart6ul_defconfig > +++ b/configs/variscite_dart6ul_defconfig > @@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_SYS_MALLOC_F_LEN=0x4000 > CONFIG_NR_DRAM_BANKS=8 > CONFIG_ENV_SIZE=0x2000 > +CONFIG_MX6ULL=y > CONFIG_TARGET_DART_6UL=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig > index 6399d1f71bfe..35ee142cc2b2 100644 > --- a/configs/vining_2000_defconfig > +++ b/configs/vining_2000_defconfig > @@ -8,6 +8,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x80000 > +CONFIG_MX6SX=y > CONFIG_MX6_DDRCAL=y > CONFIG_TARGET_SOFTING_VINING_2000=y > CONFIG_DM_GPIO=y > diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig > index 5ff1b15fb396..4687ec2683b3 100644 > --- a/configs/wandboard_defconfig > +++ b/configs/wandboard_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_MX6QDL=y > CONFIG_TARGET_WANDBOARD=y > CONFIG_SYS_I2C_MXC_I2C1=y > CONFIG_SYS_I2C_MXC_I2C2=y > diff --git a/configs/warp_defconfig b/configs/warp_defconfig > index 91549464f2a0..7a82265b3d0a 100644 > --- a/configs/warp_defconfig > +++ b/configs/warp_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x60000 > +CONFIG_MX6SL=y > CONFIG_TARGET_WARP=y > # CONFIG_CMD_BMODE is not set > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg" > diff --git a/configs/xpress_defconfig b/configs/xpress_defconfig > index b0fac0f1ba60..e39393fe3c59 100644 > --- a/configs/xpress_defconfig > +++ b/configs/xpress_defconfig > @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x87800000 > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x80000 > +CONFIG_MX6UL=y > CONFIG_TARGET_XPRESS=y > > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ccv/xpress/imximage.c > fg" > CONFIG_BOOTDELAY=3 > diff --git a/configs/xpress_spl_defconfig b/configs/xpress_spl_defconfig > index b95a8c814078..63decf86ee36 100644 > --- a/configs/xpress_spl_defconfig > +++ b/configs/xpress_spl_defconfig > @@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x80000 > +CONFIG_MX6UL=y > CONFIG_TARGET_XPRESS=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > diff --git a/configs/zc5202_defconfig b/configs/zc5202_defconfig > index 00dce4086968..7847a341eaff 100644 > --- a/configs/zc5202_defconfig > +++ b/configs/zc5202_defconfig > @@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 > +CONFIG_MX6Q=y > CONFIG_TARGET_ZC5202=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > @@ -17,7 +18,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y > CONFIG_SPL_SPI_FLASH_SUPPORT=y > CONFIG_SPL_SPI_SUPPORT=y > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_BOOTDELAY=3 > CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" > CONFIG_DEFAULT_FDT_FILE="imx6q-zc5202.dtb" > diff --git a/configs/zc5601_defconfig b/configs/zc5601_defconfig > index 0bd9cc4937e4..7c88e1fdb0f7 100644 > --- a/configs/zc5601_defconfig > +++ b/configs/zc5601_defconfig > @@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 > +CONFIG_MX6Q=y > CONFIG_TARGET_ZC5601=y > CONFIG_SPL_TEXT_BASE=0x00908000 > CONFIG_SPL_MMC_SUPPORT=y > @@ -17,7 +18,7 @@ CONFIG_SPL_LIBDISK_SUPPORT=y > CONFIG_SPL_SPI_FLASH_SUPPORT=y > CONFIG_SPL_SPI_SUPPORT=y > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.c > fg,MX6Q" > +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd. > cfg" > CONFIG_BOOTDELAY=3 > CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" > CONFIG_DEFAULT_FDT_FILE="imx6q-zc5601.dtb" > diff --git a/include/configs/titanium.h b/include/configs/titanium.h > index 7678f69dede3..895c79f1a9d2 100644 > --- a/include/configs/titanium.h > +++ b/include/configs/titanium.h > @@ -14,8 +14,6 @@ > > #include "mx6_common.h" > > -#define CONFIG_MX6Q > - > /* Provide the MACH_TYPE value that the vendor kernel requires. */ > #define CONFIG_MACH_TYPE 3769 > > -- > 2.17.1
