Browse Source

arm: mx6: Make all i.MX6 SoCs user-selectable

We have a number of platforms that are a combination of a carrier board
and System-on-Module (SoM) that in turn allows for the board to have
different SoCs on it.  In some cases, this is handled via board-specific
Kconfig options.  In other cases we make use of
CONFIG_SYS_EXTRA_OPTIONS.  This latter case however can lead to invalid
configurations as we will not in turn get options that in Kconfig are
selected by or depend on that setting.

To resolve this, make the SoC option a choice in Kconfig and make boards
depend on what they can support.  This change opens us up for further
clean-ups in the cases where a single CONFIG_TARGET_xxx can support
different SoCs and today they do not, or do not cleanly do so.

Reported-by: Matt Porter <mporter@konsulko.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: "NXP i.MX U-Boot Team" <uboot-imx@nxp.com>
Cc: Soeren Moch <smoch@web.de>
Cc: Markus Niebel <Markus.Niebel@tq-group.com>
Cc: Igor Opaniuk <igor.opaniuk@toradex.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Andreas Geisreiter <ageisreiter@dh-electronics.de>
Cc: Ludwig Zenz <lzenz@dh-electronics.de>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Akshay Bhat <akshaybhat@timesys.com>
Cc: Ken Lin <Ken.Lin@advantech.com.tw>
Cc: Ian Ray <ian.ray@ge.com>
Cc: Tim Harvey <tharvey@gateworks.com>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Raffaele RECALCATI <raffaele.recalcati@bticino.it>
Cc: Simone CIANNI <simone.cianni@bticino.it>
Cc: Adam Ford <aford173@gmail.com>
Cc: Marcin Niestroj <m.niestroj@grinn-global.com>
Cc: "Eric Bénard" <eric@eukrea.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Jason Liu <jason.hui.liu@nxp.com>
Cc: Ye Li <ye.li@nxp.com>
Cc: Eric Nelson <eric@nelint.com>
Cc: Troy Kisky <troy.kisky@boundarydevices.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Parthiban Nallathambi <parthiban@linumiz.com>
Cc: Marek Vasut <marex@denx.de>
Cc: "Sébastien Szymanski" <sebastien.szymanski@armadeus.com>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: Niel Fourie <lusus@denx.de>
Cc: Martyn Welch <martyn.welch@collabora.com>
Cc: Richard Hu <richard.hu@technexion.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Boris Brezillon <bbrezillon@kernel.org>
Cc: Arkadiusz Karas <arkadiusz.karas@somlabs.com>
Cc: Breno Lima <breno.lima@nxp.com>
Cc: Francesco Montefoschi <francesco.montefoschi@udoo.org>
Cc: Silvio Fricke <open-source@softing.de>
Tested-by: Matt Porter <mporter@konsulko.com> [colibri_imx6]
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Tom Rini 3 years ago
parent
commit
f27ffe4177
100 changed files with 201 additions and 103 deletions
  1. 72 62
      arch/arm/mach-imx/mx6/Kconfig
  2. 3 3
      board/seco/Kconfig
  3. 0 3
      board/tbs/tbs2910/Kconfig
  4. 3 3
      board/tqc/tqma6/Kconfig
  5. 2 1
      configs/apalis_imx6_defconfig
  6. 1 0
      configs/aristainetos2_defconfig
  7. 1 0
      configs/aristainetos2b_defconfig
  8. 1 0
      configs/aristainetos2bcsl_defconfig
  9. 1 0
      configs/aristainetos2c_defconfig
  10. 1 0
      configs/brppt2_defconfig
  11. 1 0
      configs/cgtqmx6eval_defconfig
  12. 1 0
      configs/cm_fx6_defconfig
  13. 2 1
      configs/colibri-imx6ull_defconfig
  14. 2 1
      configs/colibri_imx6_defconfig
  15. 1 0
      configs/dh_imx6_defconfig
  16. 2 1
      configs/display5_defconfig
  17. 2 1
      configs/display5_factory_defconfig
  18. 1 0
      configs/dms-ba16-1g_defconfig
  19. 1 0
      configs/dms-ba16_defconfig
  20. 1 0
      configs/ge_bx50v3_defconfig
  21. 1 0
      configs/gwventana_emmc_defconfig
  22. 1 0
      configs/gwventana_gw5904_defconfig
  23. 1 0
      configs/gwventana_nand_defconfig
  24. 1 0
      configs/imx6dl_icore_nand_defconfig
  25. 1 0
      configs/imx6dl_mamoj_defconfig
  26. 1 0
      configs/imx6q_icore_nand_defconfig
  27. 1 0
      configs/imx6q_logic_defconfig
  28. 1 0
      configs/imx6qdl_icore_mipi_defconfig
  29. 1 0
      configs/imx6qdl_icore_mmc_defconfig
  30. 1 0
      configs/imx6qdl_icore_nand_defconfig
  31. 1 0
      configs/imx6qdl_icore_rqs_defconfig
  32. 1 0
      configs/imx6ul_geam_mmc_defconfig
  33. 1 0
      configs/imx6ul_geam_nand_defconfig
  34. 1 0
      configs/imx6ul_isiot_emmc_defconfig
  35. 1 0
      configs/imx6ul_isiot_nand_defconfig
  36. 1 0
      configs/kp_imx6q_tpc_defconfig
  37. 1 0
      configs/liteboard_defconfig
  38. 2 1
      configs/marsboard_defconfig
  39. 1 0
      configs/mccmon6_nor_defconfig
  40. 1 0
      configs/mccmon6_sd_defconfig
  41. 1 0
      configs/mx6cuboxi_defconfig
  42. 2 1
      configs/mx6dlarm2_defconfig
  43. 2 1
      configs/mx6dlarm2_lpddr2_defconfig
  44. 2 1
      configs/mx6memcal_defconfig
  45. 2 1
      configs/mx6qarm2_defconfig
  46. 2 1
      configs/mx6qarm2_lpddr2_defconfig
  47. 2 1
      configs/mx6qsabrelite_defconfig
  48. 1 0
      configs/mx6sabreauto_defconfig
  49. 1 0
      configs/mx6sabresd_defconfig
  50. 1 0
      configs/mx6slevk_defconfig
  51. 1 0
      configs/mx6slevk_spinor_defconfig
  52. 1 0
      configs/mx6slevk_spl_defconfig
  53. 1 0
      configs/mx6sllevk_defconfig
  54. 1 0
      configs/mx6sllevk_plugin_defconfig
  55. 1 0
      configs/mx6sxsabreauto_defconfig
  56. 1 0
      configs/mx6sxsabresd_defconfig
  57. 1 0
      configs/mx6ul_14x14_evk_defconfig
  58. 1 0
      configs/mx6ul_9x9_evk_defconfig
  59. 1 0
      configs/mx6ull_14x14_evk_defconfig
  60. 1 0
      configs/mx6ull_14x14_evk_plugin_defconfig
  61. 1 0
      configs/mx6ulz_14x14_evk_defconfig
  62. 1 0
      configs/myir_mys_6ulx_defconfig
  63. 2 1
      configs/nitrogen6dl2g_defconfig
  64. 2 1
      configs/nitrogen6dl_defconfig
  65. 2 1
      configs/nitrogen6q2g_defconfig
  66. 2 1
      configs/nitrogen6q_defconfig
  67. 2 1
      configs/nitrogen6s1g_defconfig
  68. 2 1
      configs/nitrogen6s_defconfig
  69. 2 1
      configs/novena_defconfig
  70. 1 0
      configs/opos6uldev_defconfig
  71. 2 1
      configs/ot1200_defconfig
  72. 2 1
      configs/ot1200_spl_defconfig
  73. 2 1
      configs/pcm058_defconfig
  74. 1 0
      configs/pfla02_defconfig
  75. 1 0
      configs/phycore_pcl063_defconfig
  76. 1 0
      configs/phycore_pcl063_ull_defconfig
  77. 1 0
      configs/pico-dwarf-imx6ul_defconfig
  78. 1 0
      configs/pico-hobbit-imx6ul_defconfig
  79. 1 0
      configs/pico-imx6_defconfig
  80. 1 0
      configs/pico-imx6ul_defconfig
  81. 1 0
      configs/pico-pi-imx6ul_defconfig
  82. 2 1
      configs/platinum_picon_defconfig
  83. 2 1
      configs/platinum_titanium_defconfig
  84. 2 1
      configs/riotboard_defconfig
  85. 2 1
      configs/riotboard_spl_defconfig
  86. 1 0
      configs/secomx6quq7_defconfig
  87. 2 1
      configs/sksimx6_defconfig
  88. 1 0
      configs/somlabs_visionsom_6ull_defconfig
  89. 1 0
      configs/tbs2910_defconfig
  90. 1 0
      configs/titanium_defconfig
  91. 1 1
      configs/tqma6dl_mba6_mmc_defconfig
  92. 1 1
      configs/tqma6dl_mba6_spi_defconfig
  93. 1 0
      configs/tqma6q_mba6_mmc_defconfig
  94. 1 0
      configs/tqma6q_mba6_spi_defconfig
  95. 1 1
      configs/tqma6s_mba6_mmc_defconfig
  96. 1 1
      configs/tqma6s_mba6_spi_defconfig
  97. 1 1
      configs/tqma6s_wru4_mmc_defconfig
  98. 1 0
      configs/udoo_defconfig
  99. 1 0
      configs/udoo_neo_defconfig
  100. 1 0
      configs/variscite_dart6ul_defconfig

+ 72 - 62
arch/arm/mach-imx/mx6/Kconfig

@@ -15,54 +15,64 @@ config MX6
 	select GPT_TIMER if !MX6UL && !MX6ULL
 	imply CMD_FUSE
 
+choice
+	prompt "i.MX6 SoC select"
+
 config MX6D
-	bool
+	bool "i.MX 6Dual SoC support"
 	select HAS_CAAM
 	select MX6_SMP
 
 config MX6DL
-	bool
+	bool "i.MX 6DualLite SoC support"
 	select HAS_CAAM
 	select MX6_SMP
 
 config MX6Q
-	bool
+	bool "i.MX 6Quad SoC support"
 	select HAS_CAAM
 	select MX6_SMP
 
 config MX6QDL
-	bool
+	bool "i.MX 6Dual and 6Quad SoC support"
 	select HAS_CAAM
 	select MX6_SMP
 
 config MX6S
-	bool
+	bool "i.MX 6Solo SoC support"
 	select HAS_CAAM
 
 config MX6SL
-	bool
+	bool "i.MX 6SoloLite SoC support"
 
 config MX6SX
-	bool
+	bool "i.MX 6SoloX SoC support"
 	select HAS_CAAM
 	select ROM_UNIFIED_SECTIONS
 
 config MX6SLL
-	bool
+	bool "i.MX 6SLL SoC support"
 	select ROM_UNIFIED_SECTIONS
 
 config MX6UL
-	bool
+	bool "i.MX 6UltraLite SoC support"
 	select HAS_CAAM
 	select ROM_UNIFIED_SECTIONS
 	select SYSCOUNTER_TIMER
 	select SYS_L2CACHE_OFF
 
+config MX6ULL
+	bool "i.MX 6ULL SoC support"
+	select ROM_UNIFIED_SECTIONS
+	select SYSCOUNTER_TIMER
+	select SYS_L2CACHE_OFF
+
+endchoice
+
 config MX6UL_LITESOM
 	bool
 	select DM
 	select DM_THERMAL
-	select MX6UL
 	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,14 +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"
+	depends on MX6UL
 	select MX6UL_OPOS6UL
 
 config TARGET_OT1200
@@ -491,23 +497,24 @@ 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
 
@@ -521,22 +528,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 +555,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 +570,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 +587,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 +609,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 +631,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 +691,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

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

+ 0 - 3
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"
 

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

+ 2 - 1
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.cfg,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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 2 - 1
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-imx6ull/imximage.cfg,MX6ULL,IMX_NAND"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ull/imximage.cfg,IMX_NAND"
 CONFIG_BOOTDELAY=1
 # CONFIG_USE_BOOTCOMMAND is not set
 # CONFIG_CONSOLE_MUX is not set

+ 2 - 1
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.cfg,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

+ 1 - 0
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

+ 2 - 1
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.cfg,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

+ 2 - 1
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.cfg,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"

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 2 - 1
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 2 - 1
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/imximage_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

+ 2 - 1
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/imximage_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

+ 2 - 1
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.cfg,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

+ 2 - 1
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/imximage.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

+ 2 - 1
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/imximage.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

+ 2 - 1
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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"

+ 1 - 0
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

+ 1 - 0
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"

+ 1 - 0
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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.cfg,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"

+ 1 - 0
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

+ 2 - 1
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/mx6q_4x_mt41j128.cfg,MX6Q"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SUPPORT_RAW_INITRD=y

+ 2 - 1
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.cfg,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

+ 2 - 1
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.cfg,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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

+ 2 - 1
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.cfg,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

+ 2 - 1
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.cfg,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

+ 2 - 1
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

+ 2 - 1
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

+ 1 - 0
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

+ 2 - 1
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.cfg,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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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/imximage.cfg"

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

+ 1 - 1
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"

+ 1 - 0
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

+ 1 - 0
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

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

+ 1 - 1
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"

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

+ 1 - 0
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

+ 1 - 0
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

+ 1 - 0
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

Some files were not shown because too many files changed in this diff