Skip to contentSkip to conversation

imx: Introduce CONFIG_MACH_IMX

PATCH In review Tom Rini 2 participants 10 messages Aug 25, 2021 – Aug 31, 2021

Subsystems (3)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/6 imx: Introduce CONFIG_MACH_IMX

Currently, there is no over-arching symbol for access to arch/arm/mach-imx nor the CONFIG symbols that are common over all of these related platforms. This new CONFIG symbol will allow us to start down this path.

---
 arch/arm/Kconfig          | 13 +++++++++++++
 arch/arm/mach-imx/Kconfig |  3 +++
 2 files changed, 16 insertions(+)
arch/arm/Kconfig +13 -0
index d692139199c4..ca6d6fb17e3b 100644
@@ -787,6 +787,7 @@ config ARCH_IMX8
 	select ARM64
 	select DM
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 	select OF_CONTROL
 	select ENABLE_ARM_SOC_BOOT0_HOOK
 
@@ -794,6 +795,7 @@ config ARCH_IMX8M
 	bool "NXP i.MX8M platform"
 	select ARM64
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 	select SYS_FSL_HAS_SEC if IMX_HAB
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_FSL_SEC_LE
@@ -805,6 +807,7 @@ config ARCH_IMX8ULP
 	bool "NXP i.MX8ULP platform"
 	select ARM64
 	select DM
+	select MACH_IMX
 	select OF_CONTROL
 	select SUPPORT_SPL
 	select GPIO_EXTRA_HEADER
@@ -816,6 +819,7 @@ config ARCH_IMXRT
 	select DM
 	select DM_SERIAL
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 	select SUPPORT_SPL
 	imply CMD_DM
 
@@ -823,6 +827,7 @@ config ARCH_MX23
 	bool "NXP i.MX23 family"
 	select CPU_ARM926EJS
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 	select PL011_SERIAL
 	select SUPPORT_SPL
 
@@ -830,6 +835,7 @@ config ARCH_MX25
 	bool "NXP MX25"
 	select CPU_ARM926EJS
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 	imply MXC_GPIO
 
 config ARCH_MX28
@@ -837,17 +843,20 @@ config ARCH_MX28
 	select CPU_ARM926EJS
 	select GPIO_EXTRA_HEADER
 	select PL011_SERIAL
+	select MACH_IMX
 	select SUPPORT_SPL
 
 config ARCH_MX31
 	bool "NXP i.MX31 family"
 	select CPU_ARM1136
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 
 config ARCH_MX7ULP
 	bool "NXP MX7ULP"
 	select CPU_V7A
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 	select SYS_FSL_HAS_SEC if IMX_HAB
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_FSL_SEC_LE
@@ -860,6 +869,7 @@ config ARCH_MX7
 	select ARCH_MISC_INIT
 	select CPU_V7A
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 	select SYS_FSL_HAS_SEC if IMX_HAB
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_FSL_SEC_LE
@@ -871,6 +881,7 @@ config ARCH_MX6
 	bool "Freescale MX6"
 	select CPU_V7A
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 	select SYS_FSL_HAS_SEC
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_FSL_SEC_LE
@@ -887,6 +898,7 @@ config ARCH_MX5
 	select BOARD_EARLY_INIT_F
 	select CPU_V7A
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 	imply MXC_GPIO
 
 config ARCH_NEXELL
@@ -1071,6 +1083,7 @@ config ARCH_VF610
 	bool "Freescale Vybrid"
 	select CPU_V7A
 	select GPIO_EXTRA_HEADER
+	select MACH_IMX
 	select SYS_FSL_ERRATUM_ESDHC111
 	imply CMD_MTDPARTS
 	imply MTD_RAW_NAND
arch/arm/mach-imx/Kconfig +3 -0
index 653463ab461f..c5923e333c3d 100644
@@ -1,3 +1,6 @@
+config MACH_IMX
+	bool
+
 config HAS_CAAM
 	bool
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/6 imx: Finish migration of IMX_CONFIG to Kconfig

- Provide a default Kconfig value of the default script
- Largely continue to define this via the board Kconfig file
- For the boards that select a script based on defconfig rather than TARGET, keep this within the defconfig.

---
 arch/arm/config.mk                            | 4 +++-
 arch/arm/mach-imx/Kconfig                     | 4 +++-
 board/advantech/imx8qm_rom7720_a1/Kconfig     | 3 +++
 board/aristainetos/Kconfig                    | 6 ++++++
 board/armadeus/opos6uldev/Kconfig             | 3 ---
 board/beacon/imx8mm/Kconfig                   | 3 +++
 board/beacon/imx8mn/Kconfig                   | 3 +++
 board/beckhoff/mx53cx9020/Kconfig             | 3 +++
 board/compulab/imx8mm-cl-iot-gate/Kconfig     | 3 +++
 board/congatec/cgtqmx8/Kconfig                | 3 +++
 board/ea/mx7ulp_com/Kconfig                   | 3 +++
 board/engicam/imx8mm/Kconfig                  | 3 +++
 board/freescale/imx8mm_evk/Kconfig            | 3 +++
 board/freescale/imx8mn_evk/Kconfig            | 3 +++
 board/freescale/imx8mp_evk/Kconfig            | 3 +++
 board/freescale/imx8mq_evk/Kconfig            | 3 +++
 board/freescale/imx8qm_mek/Kconfig            | 3 +++
 board/freescale/imx8qxp_mek/Kconfig           | 3 +++
 board/freescale/mx51evk/Kconfig               | 3 +++
 board/freescale/mx53loco/Kconfig              | 3 +++
 board/freescale/mx6memcal/Kconfig             | 5 ++++-
 board/freescale/mx6slevk/Kconfig              | 3 +++
 board/freescale/mx6sllevk/Kconfig             | 3 +++
 board/freescale/mx6sxsabreauto/Kconfig        | 3 +++
 board/freescale/mx6sxsabresd/Kconfig          | 3 +++
 board/freescale/mx6ullevk/Kconfig             | 3 +++
 board/freescale/mx7dsabresd/Kconfig           | 3 +++
 board/freescale/mx7ulp_evk/Kconfig            | 3 +++
 board/freescale/vf610twr/Kconfig              | 3 +++
 board/gateworks/venice/Kconfig                | 3 +++
 board/ge/mx53ppd/Kconfig                      | 4 +++-
 board/google/imx8mq_phanbell/Kconfig          | 3 +++
 board/k+p/kp_imx53/Kconfig                    | 3 +++
 board/menlo/m53menlo/Kconfig                  | 3 +++
 board/novtech/meerkat96/Kconfig               | 3 +++
 board/phytec/pcm052/Kconfig                   | 6 ++++++
 board/phytec/phycore_imx8mm/Kconfig           | 3 +++
 board/phytec/phycore_imx8mp/Kconfig           | 3 +++
 board/ronetix/imx8mq-cm/Kconfig               | 3 +++
 board/siemens/capricorn/Kconfig               | 5 +++++
 board/softing/vining_2000/Kconfig             | 3 +++
 board/somlabs/visionsom-6ull/Kconfig          | 3 +++
 board/storopack/smegw01/Kconfig               | 3 +++
 board/technexion/pico-imx8mq/Kconfig          | 3 +++
 board/toradex/apalis-imx8/Kconfig             | 3 +++
 board/toradex/apalis-imx8x/Kconfig            | 3 +++
 board/toradex/colibri-imx6ull/Kconfig         | 3 +++
 board/toradex/colibri-imx8x/Kconfig           | 3 +++
 board/toradex/colibri_imx7/Kconfig            | 3 +++
 board/toradex/colibri_vf/Kconfig              | 3 +++
 board/toradex/verdin-imx8mm/Kconfig           | 3 +++
 board/warp/Kconfig                            | 3 +++
 board/warp7/Kconfig                           | 3 +++
 configs/apalis-imx8_defconfig                 | 1 -
 configs/apalis-imx8x_defconfig                | 1 -
 configs/apalis_imx6_defconfig                 | 1 -
 configs/aristainetos2c_defconfig              | 1 -
 configs/aristainetos2ccslb_defconfig          | 1 -
 configs/bg0900_defconfig                      | 1 +
 configs/bk4r1_defconfig                       | 1 -
 configs/brppt2_defconfig                      | 1 -
 configs/cgtqmx8_defconfig                     | 1 -
 configs/cl-som-imx7_defconfig                 | 1 -
 configs/cm_fx6_defconfig                      | 1 -
 configs/colibri-imx6ull_defconfig             | 2 +-
 configs/colibri-imx8x_defconfig               | 1 -
 configs/colibri_imx6_defconfig                | 1 -
 configs/colibri_imx7_defconfig                | 1 -
 configs/colibri_imx7_emmc_defconfig           | 1 -
 configs/colibri_vf_defconfig                  | 2 +-
 configs/deneb_defconfig                       | 1 -
 configs/dh_imx6_defconfig                     | 1 -
 configs/display5_defconfig                    | 1 -
 configs/display5_factory_defconfig            | 1 -
 configs/ge_b1x5v2_defconfig                   | 1 -
 configs/giedi_defconfig                       | 1 -
 configs/gwventana_emmc_defconfig              | 1 -
 configs/gwventana_gw5904_defconfig            | 1 -
 configs/gwventana_nand_defconfig              | 1 -
 configs/imx28_xea_defconfig                   | 1 +
 configs/imx6dl_icore_nand_defconfig           | 1 -
 configs/imx6dl_mamoj_defconfig                | 1 -
 configs/imx6q_icore_nand_defconfig            | 1 -
 configs/imx6q_logic_defconfig                 | 1 -
 configs/imx6qdl_icore_mipi_defconfig          | 1 -
 configs/imx6qdl_icore_mmc_defconfig           | 1 -
 configs/imx6qdl_icore_nand_defconfig          | 1 -
 configs/imx6qdl_icore_rqs_defconfig           | 1 -
 configs/imx6ul_geam_mmc_defconfig             | 1 -
 configs/imx6ul_geam_nand_defconfig            | 1 -
 configs/imx6ul_isiot_emmc_defconfig           | 1 -
 configs/imx6ul_isiot_nand_defconfig           | 1 -
 configs/imx7_cm_defconfig                     | 1 -
 configs/imx8mm-cl-iot-gate_defconfig          | 1 -
 configs/imx8mm-icore-mx8mm-ctouch2_defconfig  | 1 -
 configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 1 -
 configs/imx8mm_beacon_defconfig               | 1 -
 configs/imx8mm_evk_defconfig                  | 1 -
 configs/imx8mm_venice_defconfig               | 1 -
 configs/imx8mn_beacon_2g_defconfig            | 1 -
 configs/imx8mn_beacon_defconfig               | 1 -
 configs/imx8mn_ddr4_evk_defconfig             | 1 -
 configs/imx8mn_evk_defconfig                  | 1 -
 configs/imx8mp_evk_defconfig                  | 1 -
 configs/imx8mq_cm_defconfig                   | 1 -
 configs/imx8mq_evk_defconfig                  | 1 -
 configs/imx8mq_phanbell_defconfig             | 1 -
 configs/imx8qm_mek_defconfig                  | 1 -
 configs/imx8qm_rom7720_a1_4G_defconfig        | 1 -
 configs/imx8qxp_mek_defconfig                 | 1 -
 configs/imx8ulp_evk_defconfig                 | 1 +
 configs/kp_imx53_defconfig                    | 1 -
 configs/kp_imx6q_tpc_defconfig                | 1 -
 configs/liteboard_defconfig                   | 1 -
 configs/m53menlo_defconfig                    | 1 -
 configs/marsboard_defconfig                   | 3 ++-
 configs/mccmon6_nor_defconfig                 | 2 +-
 configs/mccmon6_sd_defconfig                  | 2 +-
 configs/meerkat96_defconfig                   | 1 -
 configs/mx23_olinuxino_defconfig              | 1 +
 configs/mx23evk_defconfig                     | 1 +
 configs/mx28evk_auart_console_defconfig       | 1 +
 configs/mx28evk_defconfig                     | 1 +
 configs/mx28evk_nand_defconfig                | 1 +
 configs/mx28evk_spi_defconfig                 | 1 +
 configs/mx51evk_defconfig                     | 1 -
 configs/mx53cx9020_defconfig                  | 1 -
 configs/mx53loco_defconfig                    | 1 -
 configs/mx53ppd_defconfig                     | 1 -
 configs/mx6cuboxi_defconfig                   | 1 -
 configs/mx6memcal_defconfig                   | 2 +-
 configs/mx6qsabrelite_defconfig               | 3 ++-
 configs/mx6sabreauto_defconfig                | 1 -
 configs/mx6sabresd_defconfig                  | 1 -
 configs/mx6slevk_defconfig                    | 1 -
 configs/mx6slevk_spinor_defconfig             | 1 -
 configs/mx6slevk_spl_defconfig                | 1 -
 configs/mx6sllevk_defconfig                   | 1 -
 configs/mx6sllevk_plugin_defconfig            | 1 -
 configs/mx6sxsabreauto_defconfig              | 1 -
 configs/mx6sxsabresd_defconfig                | 1 -
 configs/mx6ul_14x14_evk_defconfig             | 1 -
 configs/mx6ul_9x9_evk_defconfig               | 1 -
 configs/mx6ull_14x14_evk_defconfig            | 1 -
 configs/mx6ull_14x14_evk_plugin_defconfig     | 1 -
 configs/mx6ulz_14x14_evk_defconfig            | 1 -
 configs/mx7dsabresd_defconfig                 | 1 -
 configs/mx7dsabresd_qspi_defconfig            | 1 -
 configs/mx7ulp_com_defconfig                  | 1 -
 configs/mx7ulp_evk_defconfig                  | 1 -
 configs/mx7ulp_evk_plugin_defconfig           | 1 -
 configs/myir_mys_6ulx_defconfig               | 1 -
 configs/nitrogen6dl2g_defconfig               | 3 ++-
 configs/nitrogen6dl_defconfig                 | 3 ++-
 configs/nitrogen6q2g_defconfig                | 3 ++-
 configs/nitrogen6q_defconfig                  | 3 ++-
 configs/nitrogen6s1g_defconfig                | 3 ++-
 configs/nitrogen6s_defconfig                  | 3 ++-
 configs/novena_defconfig                      | 1 -
 configs/pcm052_defconfig                      | 1 -
 configs/pcm058_defconfig                      | 1 -
 configs/phycore-imx8mm_defconfig              | 1 -
 configs/phycore-imx8mp_defconfig              | 1 -
 configs/phycore_pcl063_defconfig              | 1 -
 configs/phycore_pcl063_ull_defconfig          | 1 -
 configs/pico-dwarf-imx6ul_defconfig           | 1 -
 configs/pico-dwarf-imx7d_defconfig            | 1 -
 configs/pico-hobbit-imx6ul_defconfig          | 1 -
 configs/pico-hobbit-imx7d_defconfig           | 1 -
 configs/pico-imx6_defconfig                   | 1 -
 configs/pico-imx6ul_defconfig                 | 1 -
 configs/pico-imx7d_bl33_defconfig             | 1 -
 configs/pico-imx7d_defconfig                  | 1 -
 configs/pico-imx8mq_defconfig                 | 1 -
 configs/pico-nymph-imx7d_defconfig            | 1 -
 configs/pico-pi-imx6ul_defconfig              | 1 -
 configs/pico-pi-imx7d_defconfig               | 1 -
 configs/riotboard_defconfig                   | 3 ++-
 configs/seeed_npi_imx6ull_defconfig           | 1 -
 configs/smegw01_defconfig                     | 1 -
 configs/somlabs_visionsom_6ull_defconfig      | 1 -
 configs/udoo_defconfig                        | 1 -
 configs/udoo_neo_defconfig                    | 1 -
 configs/variscite_dart6ul_defconfig           | 1 -
 configs/verdin-imx8mm_defconfig               | 1 -
 configs/vf610twr_defconfig                    | 1 -
 configs/vf610twr_nand_defconfig               | 1 -
 configs/vining_2000_defconfig                 | 1 -
 configs/wandboard_defconfig                   | 1 -
 configs/warp7_bl33_defconfig                  | 1 -
 configs/warp7_defconfig                       | 1 -
 configs/warp_defconfig                        | 1 -
 configs/zmx25_defconfig                       | 1 +
 193 files changed, 198 insertions(+), 137 deletions(-)
arch/arm/config.mk +3 -1
index 16c63e12667e..b684d8b416f7 100644
@@ -158,7 +158,8 @@ ifdef CONFIG_EFI_LOADER
 OBJCOPYFLAGS += -j .efi_runtime -j .efi_runtime_rel
 endif
 
-ifneq ($(CONFIG_IMX_CONFIG),)
+ifdef CONFIG_MACH_IMX
+ifneq ($(CONFIG_IMX_CONFIG),"")
 ifdef CONFIG_SPL
 ifndef CONFIG_SPL_BUILD
 INPUTS-y += SPL
@@ -174,6 +175,7 @@ ifneq ($(CONFIG_VF610),)
 INPUTS-y += u-boot.vyb
 endif
 endif
+endif
 
 EFI_LDS := elf_arm_efi.lds
 EFI_CRT0 := crt0_arm_efi.o
arch/arm/mach-imx/Kconfig +3 -1
index c5923e333c3d..dd4f027f36d0 100644
@@ -5,7 +5,9 @@ config HAS_CAAM
 	bool
 
 config IMX_CONFIG
-	string
+	string "DCD script to use"
+	depends on MACH_IMX
+	default "arch/arm/mach-imx/spl_sd.cfg"
 
 config ROM_UNIFIED_SECTIONS
 	bool
board/advantech/imx8qm_rom7720_a1/Kconfig +3 -0
index cf3869ed9286..8bf3a7d34846 100644
@@ -9,6 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8qm_rom7720"
 
+config IMX_CONFIG
+	default "board/advantech/imx8qm_rom7720_a1/imximage.cfg"
+
 source "board/freescale/common/Kconfig"
 
 endif
board/aristainetos/Kconfig +6 -0
index cc603c1bc2d1..2d8fcc513f80 100644
@@ -8,6 +8,9 @@ config SYS_BOARD
 config SYS_BOARD_VERSION
 	default 5
 
+config IMX_CONFIG
+	default "board/aristainetos/aristainetos2.cfg"
+
 endif
 
 if TARGET_ARISTAINETOS2CCSLB
@@ -20,4 +23,7 @@ config SYS_BOARD
 config SYS_BOARD_VERSION
 	default 6
 
+config IMX_CONFIG
+	default "board/aristainetos/aristainetos2.cfg"
+
 endif
board/armadeus/opos6uldev/Kconfig +0 -3
index e66f060d140e..2a96c0044b44 100644
@@ -9,7 +9,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "opos6uldev"
 
-config IMX_CONFIG
-	default "arch/arm/mach-imx/spl_sd.cfg"
-
 endif
board/beacon/imx8mm/Kconfig +3 -0
index df3125eae9a5..58799c1a6553 100644
@@ -9,6 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8mm_beacon"
 
+config IMX_CONFIG
+	default "arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
+
 source "board/freescale/common/Kconfig"
 
 endif
board/beacon/imx8mn/Kconfig +3 -0
index 2bcfb25cf838..dceb3de65472 100644
@@ -17,6 +17,9 @@ config IMX8MN_BEACON_2GB_LPDDR
 	bool "Enable 2GB LPDDR"
 	default n
 
+config IMX_CONFIG
+	default "arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
+
 source "board/freescale/common/Kconfig"
 
 endif
board/beckhoff/mx53cx9020/Kconfig +3 -0
index dcdafb68e5d0..d4416cf09d11 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "mx53cx9020"
 
+config IMX_CONFIG
+	default "board/beckhoff/mx53cx9020/imximage.cfg"
+
 endif
board/compulab/imx8mm-cl-iot-gate/Kconfig +3 -0
index 7f5c794bf54d..30760cbf4517 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8mm-cl-iot-gate"
 
+config IMX_CONFIG
+	default "board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg"
+
 endif
board/congatec/cgtqmx8/Kconfig +3 -0
index 72730392615e..74e9838d29ea 100644
@@ -9,6 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "cgtqmx8"
 
+config IMX_CONFIG
+	default "board/congatec/cgtqmx8/imximage.cfg"
+
 source "board/congatec/common/Kconfig"
 
 endif
board/ea/mx7ulp_com/Kconfig +3 -0
index 90883aced458..f7b1f1bf46fd 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "mx7ulp_com"
 
+config IMX_CONFIG
+	default "board/ea/mx7ulp_com/imximage.cfg"
+
 endif
board/engicam/imx8mm/Kconfig +3 -0
index ed68516df450..5495b3bf99be 100644
@@ -9,6 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8mm_icore_mx8mm"
 
+config IMX_CONFIG
+	default "arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
+
 source "board/freescale/common/Kconfig"
 
 endif
board/freescale/imx8mm_evk/Kconfig +3 -0
index 299691a61949..24cc526b0abe 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8mm_evk"
 
+config IMX_CONFIG
+	default "board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg"
+
 endif
board/freescale/imx8mn_evk/Kconfig +3 -0
index 478f4ed66ed8..eb37630718d2 100644
@@ -13,6 +13,9 @@ config IMX8MN_LOW_DRIVE_MODE
 	bool "Enable the low drive mode of iMX8MN on EVK board"
 	default n
 
+config IMX_CONFIG
+	default "board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg"
+
 source "board/freescale/common/Kconfig"
 
 endif
board/freescale/imx8mp_evk/Kconfig +3 -0
index 49bb29a45d8a..42625fd58889 100644
@@ -9,6 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8mp_evk"
 
+config IMX_CONFIG
+	default "board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg"
+
 source "board/freescale/common/Kconfig"
 
 endif
board/freescale/imx8mq_evk/Kconfig +3 -0
index 421b081c7616..c4d20ad7c7d0 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8mq_evk"
 
+config IMX_CONFIG
+	default "arch/arm/mach-imx/imx8m/imximage.cfg"
+
 endif
board/freescale/imx8qm_mek/Kconfig +3 -0
index 93d7d5f9c576..aed6ab25ce18 100644
@@ -9,6 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8qm_mek"
 
+config IMX_CONFIG
+	default "board/freescale/imx8qm_mek/imximage.cfg"
+
 source "board/freescale/common/Kconfig"
 
 endif
board/freescale/imx8qxp_mek/Kconfig +3 -0
index b67300d816cc..b9aab3789ee4 100644
@@ -9,6 +9,9 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8qxp_mek"
 
+config IMX_CONFIG
+	default "board/freescale/imx8qxp_mek/imximage.cfg"
+
 source "board/freescale/common/Kconfig"
 
 endif
board/freescale/mx51evk/Kconfig +3 -0
index f9b69cbd661b..a26b539536e7 100644
@@ -12,4 +12,7 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "mx51evk"
 
+config IMX_CONFIG
+	default "board/freescale/mx51evk/imximage.cfg"
+
 endif
board/freescale/mx53loco/Kconfig +3 -0
index 5ca1672bf7a5..a690a601ac0e 100644
@@ -12,4 +12,7 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "mx53loco"
 
+config IMX_CONFIG
+	default "board/freescale/mx53loco/imximage.cfg"
+
 endif
board/freescale/mx6memcal/Kconfig +4 -1
index 9987cba5dcb7..8eedee431b19 100644
@@ -223,5 +223,8 @@ config REFR
 	   details.
 
 endmenu
-endif
 
+config IMX_CONFIG
+	default "arch/arm/mach-imx/spl_sd.cfg"
+
+endif
board/freescale/mx6slevk/Kconfig +3 -0
index 18482b551e5b..e6bbb4194f46 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "mx6slevk"
 
+config IMX_CONFIG
+	default "board/freescale/mx6slevk/imximage.cfg"
+
 endif
board/freescale/mx6sllevk/Kconfig +3 -0
index 4ba9bbf14180..d47f1fa90966 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "mx6sllevk"
 
+config IMX_CONFIG
+	default "board/freescale/mx6sllevk/imximage.cfg"
+
 endif
board/freescale/mx6sxsabreauto/Kconfig +3 -0
index ae2ea0243949..e6da7b38f914 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "mx6sxsabreauto"
 
+config IMX_CONFIG
+	default "board/freescale/mx6sxsabreauto/imximage.cfg"
+
 endif
board/freescale/mx6sxsabresd/Kconfig +3 -0
index fcfac0aae4e7..88ac7ee8050c 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "mx6sxsabresd"
 
+config IMX_CONFIG
+	default "board/freescale/mx6sxsabresd/imximage.cfg"
+
 endif
board/freescale/mx6ullevk/Kconfig +3 -0
index 7eec497e3ea3..49aa302553e6 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "mx6ullevk"
 
+config IMX_CONFIG
+	default "board/freescale/mx6ullevk/imximage.cfg"
+
 endif
board/freescale/mx7dsabresd/Kconfig +3 -0
index c6a969ca67ff..bf3ceafe2b4b 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "mx7dsabresd"
 
+config IMX_CONFIG
+	default "board/freescale/mx7dsabresd/imximage.cfg"
+
 endif
board/freescale/mx7ulp_evk/Kconfig +3 -0
index ff448311f9d0..591697041dda 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "mx7ulp_evk"
 
+config IMX_CONFIG
+	default "board/freescale/mx7ulp_evk/imximage.cfg"
+
 endif
board/freescale/vf610twr/Kconfig +3 -0
index 3b90ed67fe6a..208c7ae2f425 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "vf610twr"
 
+config IMX_CONFIG
+	default "board/freescale/vf610twr/imximage.cfg"
+
 endif
board/gateworks/venice/Kconfig +3 -0
index 64cb97c1e0a9..639bf35d2050 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8mm_venice"
 
+config IMX_CONFIG
+	default "arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
+
 endif
board/ge/mx53ppd/Kconfig +3 -1
index bebb2fab0173..728e9a992118 100644
@@ -1,4 +1,3 @@
-
 if TARGET_MX53PPD
 
 config SYS_BOARD
@@ -13,6 +12,9 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "mx53ppd"
 
+config IMX_CONFIG
+	default "board/ge/mx53ppd/imximage.cfg"
+
 source "board/ge/common/Kconfig"
 
 endif
board/google/imx8mq_phanbell/Kconfig +3 -0
index fba2e9ce6721..54cfb9995272 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8mq_phanbell"
 
+config IMX_CONFIG
+	default "arch/arm/mach-imx/imx8m/imximage.cfg"
+
 endif
board/k+p/kp_imx53/Kconfig +3 -0
index 017c1e30d882..fb35127696b7 100644
@@ -12,4 +12,7 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "kp_imx53"
 
+config IMX_CONFIG
+	default "board/freescale/mx53loco/imximage.cfg"
+
 endif
board/menlo/m53menlo/Kconfig +3 -0
index 1953f5041b80..34c92f452126 100644
@@ -12,4 +12,7 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "m53menlo"
 
+config IMX_CONFIG
+	default "board/menlo/m53menlo/imximage.cfg"
+
 endif
board/novtech/meerkat96/Kconfig +3 -0
index b0e46fcc1b3f..23b0ba3230e5 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "meerkat96"
 
+config IMX_CONFIG
+	default "board/novtech/meerkat96/imximage.cfg"
+
 endif
board/phytec/pcm052/Kconfig +6 -0
index 4fde21c586d8..23f2565f9f43 100644
@@ -13,6 +13,9 @@ config PCM052_DDR_SIZE
 	int
 	default 256
 
+config IMX_CONFIG
+	default "board/phytec/pcm052/imximage.cfg"
+
 endif
 
 if TARGET_BK4R1
@@ -30,4 +33,7 @@ config PCM052_DDR_SIZE
 	int
 	default 512
 
+config IMX_CONFIG
+	default "board/phytec/pcm052/imximage.cfg"
+
 endif
board/phytec/phycore_imx8mm/Kconfig +3 -0
index 92f5524bdb07..9868e984875e 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "phycore_imx8mm"
 
+config IMX_CONFIG
+	default "arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
+
 endif
board/phytec/phycore_imx8mp/Kconfig +3 -0
index 7a20d6e8fe44..c053a46fc9d1 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "phycore_imx8mp"
 
+config IMX_CONFIG
+	default "board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg"
+
 endif
board/ronetix/imx8mq-cm/Kconfig +3 -0
index 9dd6a86add17..f0a240cc0d15 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8mq_cm"
 
+config IMX_CONFIG
+	default "board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg"
+
 endif
board/siemens/capricorn/Kconfig +5 -0
index 21c3ef909415..c5a28ff0220a 100644
@@ -9,6 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "giedi"
 
+config IMX_CONFIG
+	default "board/siemens/capricorn/imximage.cfg"
 endif
 
 if TARGET_DENEB
@@ -22,4 +24,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "deneb"
 
+config IMX_CONFIG
+	default "board/siemens/capricorn/imximage.cfg"
+
 endif
board/softing/vining_2000/Kconfig +3 -0
index 90d45a7f6e85..36b20f805a76 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "vining_2000"
 
+config IMX_CONFIG
+	default "board/softing/vining_2000/imximage.cfg"
+
 endif
board/somlabs/visionsom-6ull/Kconfig +3 -0
index 37408aa798b0..374d427ee5b5 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "somlabs_visionsom_6ull"
 
+config IMX_CONFIG
+	default "board/somlabs/visionsom-6ull/imximage.cfg"
+
 endif
board/storopack/smegw01/Kconfig +3 -0
index 4503b65419a6..d8f24695d0d2 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "smegw01"
 
+config IMX_CONFIG
+	default "board/storopack/smegw01/imximage.cfg"
+
 endif
board/technexion/pico-imx8mq/Kconfig +3 -0
index 031fc1d56364..628b0511490a 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "pico-imx8mq"
 
+config IMX_CONFIG
+	default "arch/arm/mach-imx/imx8m/imximage.cfg"
+
 endif
board/toradex/apalis-imx8/Kconfig +3 -0
index c680d63fa1a2..b43d6281b681 100644
@@ -25,6 +25,9 @@ config TDX_CFG_BLOCK_PART
 config TDX_CFG_BLOCK_OFFSET
 	default "-512"
 
+config IMX_CONFIG
+	default "board/toradex/apalis-imx8/apalis-imx8-imximage.cfg"
+
 source "board/toradex/common/Kconfig"
 
 endif
board/toradex/apalis-imx8x/Kconfig +3 -0
index ee61e09736f1..d6cda7e3ff06 100644
@@ -25,6 +25,9 @@ config TDX_CFG_BLOCK_PART
 config TDX_CFG_BLOCK_OFFSET
 	default "-512"
 
+config IMX_CONFIG
+	default "board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg"
+
 source "board/toradex/common/Kconfig"
 
 endif
board/toradex/colibri-imx6ull/Kconfig +3 -0
index 3ce9885c122b..e5e4af336480 100644
@@ -24,6 +24,9 @@ config TDX_CFG_BLOCK_OFFSET2
 config TDX_CFG_BLOCK_2ND_ETHADDR
 	default y
 
+config IMX_CONFIG
+	default "board/toradex/colibri-imx6ull/imximage.cfg"
+
 source "board/toradex/common/Kconfig"
 
 endif
board/toradex/colibri-imx8x/Kconfig +3 -0
index d97fed020e71..b89840a379c4 100644
@@ -25,6 +25,9 @@ config TDX_CFG_BLOCK_PART
 config TDX_CFG_BLOCK_OFFSET
 	default "-512"
 
+config IMX_CONFIG
+	default "board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg"
+
 source "board/toradex/common/Kconfig"
 
 endif
board/toradex/colibri_imx7/Kconfig +3 -0
index d33ec635238e..87c416ac2fac 100644
@@ -71,6 +71,9 @@ config TDX_CFG_BLOCK_OFFSET
 
 endif
 
+config IMX_CONFIG
+	default "board/toradex/colibri_imx7/imximage.cfg"
+
 source "board/toradex/common/Kconfig"
 
 endif
board/toradex/colibri_vf/Kconfig +3 -0
index 5f7129dd359b..83315d87577d 100644
@@ -21,6 +21,9 @@ config TDX_CFG_BLOCK_OFFSET
 config TDX_CFG_BLOCK_2ND_ETHADDR
 	default y
 
+config IMX_CONFIG
+	default "board/toradex/colibri_vf/imximage.cfg"
+
 source "board/toradex/common/Kconfig"
 
 endif
board/toradex/verdin-imx8mm/Kconfig +3 -0
index 149aed6da743..51e8ba618b98 100644
@@ -31,6 +31,9 @@ config TDX_CFG_BLOCK_PART
 config TDX_CFG_BLOCK_OFFSET
 	default "-512"
 
+config IMX_CONFIG
+	default "board/toradex/verdin-imx8mm/imximage.cfg"
+
 source "board/toradex/common/Kconfig"
 
 endif
board/warp/Kconfig +3 -0
index dc0263631906..9c2fc9df67ee 100644
@@ -6,4 +6,7 @@ config SYS_BOARD
 config SYS_CONFIG_NAME
 	default "warp"
 
+config IMX_CONFIG
+	default "board/warp/imximage.cfg"
+
 endif
board/warp7/Kconfig +3 -0
index c089bca2bafb..e5051cdda66a 100644
@@ -20,4 +20,7 @@ config SYS_FDT_ADDR
 	help
 	  The address the FDT file should be loaded to.
 
+config IMX_CONFIG
+	default "board/warp7/imximage.cfg"
+
 endif
configs/apalis-imx8_defconfig +0 -1
index 59179e2bd3a0..00dfa8575ced 100644
@@ -13,7 +13,6 @@ CONFIG_TARGET_APALIS_IMX8=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis-imx8/apalis-imx8-imximage.cfg"
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
configs/apalis-imx8x_defconfig +0 -1
index ed9686e0d870..f5389a375be0 100644
@@ -13,7 +13,6 @@ CONFIG_TARGET_APALIS_IMX8X=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg"
 CONFIG_BOOTDELAY=1
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
configs/apalis_imx6_defconfig +0 -1
index a0e85ba23a48..9c4e34b7c2b4 100644
@@ -21,7 +21,6 @@ CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=1
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
configs/aristainetos2c_defconfig +0 -1
index 67fc4e3e23cc..0a4c48fb5dd5 100644
@@ -13,7 +13,6 @@ CONFIG_IMX_HAB=y
 # CONFIG_CMD_DEKBLOB is not set
 CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg"
 CONFIG_BOOTDELAY=-2
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_ENCRYPTION=y
configs/aristainetos2ccslb_defconfig +0 -1
index c156a6ade808..342e4e9a458d 100644
@@ -13,7 +13,6 @@ CONFIG_IMX_HAB=y
 # CONFIG_CMD_DEKBLOB is not set
 CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg"
 CONFIG_BOOTDELAY=-2
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_ENCRYPTION=y
configs/bg0900_defconfig +1 -0
index d5aeb97c8ee6..10e4a07aad0b 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
+CONFIG_IMX_CONFIG=""
 CONFIG_SPL_TEXT_BASE=0x00001000
 CONFIG_TARGET_BG0900=y
 CONFIG_SPL_SERIAL_SUPPORT=y
configs/bk4r1_defconfig +0 -1
index 20262e8be1d5..1eef623dc126 100644
@@ -16,7 +16,6 @@ CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
 CONFIG_ENV_OFFSET_REDUND=0x220000
 CONFIG_TARGET_BK4R1=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Enter passphrase to stop autoboot, booting in %d seconds\n"
configs/brppt2_defconfig +0 -1
index 51c13726505d..416a4b32edd2 100644
@@ -24,7 +24,6 @@ CONFIG_SPL_SPI_SUPPORT=y
 # CONFIG_CMD_BMODE is not set
 # CONFIG_EXPERT is not set
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_SPI_BOOT=y
 CONFIG_BOOTDELAY=0
 CONFIG_USE_BOOTCOMMAND=y
configs/cgtqmx8_defconfig +0 -1
index 34aca6ea858d..5c5d7a6d53bb 100644
@@ -19,7 +19,6 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx8/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOG=y
 CONFIG_SPL_BOARD_INIT=y
configs/cl-som-imx7_defconfig +0 -1
index f5d146038c1d..0cb18d545939 100644
@@ -18,7 +18,6 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_SPI_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_LATE_INIT=y
configs/cm_fx6_defconfig +0 -1
index de7870b123fc..2b35bee885d0 100644
@@ -21,7 +21,6 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run legacy_bootcmd"
 CONFIG_USE_PREBOOT=y
configs/colibri-imx6ull_defconfig +1 -1
index 739eea7c07f9..d0e85b1bc343 100644
@@ -12,7 +12,7 @@ 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,IMX_NAND"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_NAND"
 CONFIG_BOOTDELAY=1
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
configs/colibri-imx8x_defconfig +0 -1
index a0816acc27c9..a13e50554644 100644
@@ -12,7 +12,6 @@ CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri"
 CONFIG_TARGET_COLIBRI_IMX8X=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg"
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
configs/colibri_imx6_defconfig +0 -1
index 47b1cfb19179..b29ec2a27343 100644
@@ -20,7 +20,6 @@ CONFIG_SPL=y
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=1
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
configs/colibri_imx7_defconfig +0 -1
index e31e663acd14..bac96a16f5a3 100644
@@ -12,7 +12,6 @@ CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg"
 CONFIG_BOOTDELAY=1
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
configs/colibri_imx7_emmc_defconfig +0 -1
index 35f5c32dd293..a8fed7171eff 100644
@@ -14,7 +14,6 @@ CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg"
 CONFIG_BOOTDELAY=1
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
configs/colibri_vf_defconfig +1 -1
index abb811780460..6bc79c30e34b 100644
@@ -12,7 +12,7 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
 CONFIG_TARGET_COLIBRI_VF=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,IMX_NAND"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_NAND"
 CONFIG_BOOTDELAY=1
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb"
configs/deneb_defconfig +0 -1
index 4e2c6d668f50..81c4c3321333 100644
@@ -21,7 +21,6 @@ CONFIG_SPL_LOAD_IMX_CONTAINER=y
 CONFIG_IMX_CONTAINER_CFG="board/siemens/capricorn/uboot-container.cfg"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/siemens/capricorn/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
configs/dh_imx6_defconfig +0 -1
index ce966420f83f..1f843ed4acbb 100644
@@ -32,7 +32,6 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/display5_defconfig +0 -1
index d6541876f14a..0b97cd8316ae 100644
@@ -32,7 +32,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_MISC_INIT_R=y
 CONFIG_SPL_BOOTCOUNT_LIMIT=y
 # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
configs/display5_factory_defconfig +0 -1
index 7dbed0473a72..acbec1091747 100644
@@ -29,7 +29,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_OF_BOARD_SETUP=y
-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"
configs/ge_b1x5v2_defconfig +0 -1
index cea6a736492c..8379b9e98d2d 100644
@@ -27,7 +27,6 @@ CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=1
 CONFIG_DEFAULT_FDT_FILE="imx6dl-b1x5v2.dtb"
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/giedi_defconfig +0 -1
index 759640065a3e..1fee440a606e 100644
@@ -21,7 +21,6 @@ CONFIG_SPL_LOAD_IMX_CONTAINER=y
 CONFIG_IMX_CONTAINER_CFG="board/siemens/capricorn/uboot-container.cfg"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/siemens/capricorn/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
configs/gwventana_emmc_defconfig +0 -1
index 9e764f40a229..c9fbbc4149e8 100644
@@ -26,7 +26,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
configs/gwventana_gw5904_defconfig +0 -1
index bab61e7daad0..ec50a2ebef25 100644
@@ -26,7 +26,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
configs/gwventana_nand_defconfig +0 -1
index e59efebab777..bafe73ea5e6e 100644
@@ -26,7 +26,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 # CONFIG_DISPLAY_BOARDINFO is not set
configs/imx28_xea_defconfig +1 -0
index cab908e4fd37..660508d3d9ae 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x800
 CONFIG_NR_DRAM_BANKS=1
+CONFIG_IMX_CONFIG=""
 CONFIG_DM_GPIO=y
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="imx28-xea"
configs/imx6dl_icore_nand_defconfig +0 -1
index fed8793c435f..90ec3e15ac54 100644
@@ -20,7 +20,6 @@ CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_DMA=y
 CONFIG_SPL_WATCHDOG=y
configs/imx6dl_mamoj_defconfig +0 -1
index 48f0c0356d33..466f194ad063 100644
@@ -13,7 +13,6 @@ CONFIG_SPL_TEXT_BASE=0x00908000
 CONFIG_IMX_HAB=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_OS_BOOT=y
 CONFIG_CMD_SPL=y
configs/imx6q_icore_nand_defconfig +0 -1
index 3064a1301bac..ca486d52b94a 100644
@@ -21,7 +21,6 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_DMA=y
 CONFIG_SPL_WATCHDOG=y
configs/imx6q_logic_defconfig +0 -1
index ed8db745b6fb..a7523822a8b6 100644
@@ -21,7 +21,6 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_PAYLOAD="u-boot.img"
 CONFIG_LTO=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/imx6qdl_icore_mipi_defconfig +0 -1
index d3191a250a99..e71510ac3cd8 100644
@@ -27,7 +27,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_WATCHDOG=y
configs/imx6qdl_icore_mmc_defconfig +0 -1
index 76375ae9111c..fcf5da75df83 100644
@@ -30,7 +30,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_WATCHDOG=y
configs/imx6qdl_icore_nand_defconfig +0 -1
index 3064a1301bac..ca486d52b94a 100644
@@ -21,7 +21,6 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_DMA=y
 CONFIG_SPL_WATCHDOG=y
configs/imx6qdl_icore_rqs_defconfig +0 -1
index 328e68d20aee..527bc2340359 100644
@@ -24,7 +24,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_WATCHDOG=y
configs/imx6ul_geam_mmc_defconfig +0 -1
index ebcccdd85add..32335f301261 100644
@@ -22,7 +22,6 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
configs/imx6ul_geam_nand_defconfig +0 -1
index 8f9583d86f4f..55fd165a3ddb 100644
@@ -21,7 +21,6 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_DMA=y
 CONFIG_SPL_WATCHDOG=y
configs/imx6ul_isiot_emmc_defconfig +0 -1
index 18850f6a4382..f5667bb2faa3 100644
@@ -22,7 +22,6 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
configs/imx6ul_isiot_nand_defconfig +0 -1
index a29dac03df41..3a277338b945 100644
@@ -21,7 +21,6 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_SPL_DMA=y
 CONFIG_SPL_WATCHDOG=y
configs/imx7_cm_defconfig +0 -1
index 72a1dc29e94a..a999f33f543a 100644
@@ -20,7 +20,6 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="ask"
 # CONFIG_BOARD_EARLY_INIT_F is not set
configs/imx8mm-cl-iot-gate_defconfig +0 -1
index 79e4bde07036..5b0a23612f42 100644
@@ -27,7 +27,6 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SEPARATE_BSS=y
configs/imx8mm-icore-mx8mm-ctouch2_defconfig +0 -1
index abc4d659c385..c7ab8d837c40 100644
@@ -21,7 +21,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
 CONFIG_DEFAULT_FDT_FILE="imx8mm-icore-mx8mm-ctouch2.dtb"
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SEPARATE_BSS=y
configs/imx8mm-icore-mx8mm-edimm2.2_defconfig +0 -1
index 5f45e3352fbc..562678471b31 100644
@@ -21,7 +21,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
 CONFIG_DEFAULT_FDT_FILE="imx8mm-icore-mx8mm-edimm2.2.dtb"
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SEPARATE_BSS=y
configs/imx8mm_beacon_defconfig +0 -1
index 78334c45e743..ab3ed814950e 100644
@@ -24,7 +24,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
 CONFIG_DEFAULT_FDT_FILE="imx8mm-beacon-kit.dtb"
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SEPARATE_BSS=y
configs/imx8mm_evk_defconfig +0 -1
index f7f39b8dc63c..12af6af4613c 100644
@@ -24,7 +24,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SEPARATE_BSS=y
configs/imx8mm_venice_defconfig +0 -1
index 44ff5f84da46..0fef50742f6a 100644
@@ -29,7 +29,6 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="gsc wd-disable"
configs/imx8mn_beacon_2g_defconfig +0 -1
index 8fec003edd36..ec75a3d2ae14 100644
@@ -29,7 +29,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
 CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
 CONFIG_ARCH_MISC_INIT=y
 CONFIG_SPL_BOARD_INIT=y
configs/imx8mn_beacon_defconfig +0 -1
index 5296204aad84..1efea990faf0 100644
@@ -28,7 +28,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg"
 CONFIG_DEFAULT_FDT_FILE="imx8mn-beacon-kit.dtb"
 CONFIG_ARCH_MISC_INIT=y
 CONFIG_SPL_BOARD_INIT=y
configs/imx8mn_ddr4_evk_defconfig +0 -1
index 78943dd91d38..1c1c1a2267ff 100644
@@ -25,7 +25,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg"
 CONFIG_DEFAULT_FDT_FILE="imx8mn-ddr4-evk.dtb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
configs/imx8mn_evk_defconfig +0 -1
index 4b4a0d0d0b28..54856ab85773 100644
@@ -26,7 +26,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg"
 CONFIG_DEFAULT_FDT_FILE="imx8mn-evk.dtb"
 CONFIG_ARCH_MISC_INIT=y
 CONFIG_BOARD_LATE_INIT=y
configs/imx8mp_evk_defconfig +0 -1
index 2c6fc16cdf56..fb9e2f5c3a5c 100644
@@ -25,7 +25,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg"
 CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_LATE_INIT=y
configs/imx8mq_cm_defconfig +0 -1
index e0a038b168c9..442c9dc73668 100644
@@ -22,7 +22,6 @@ CONFIG_SPL_FIT_PRINT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SEPARATE_BSS=y
configs/imx8mq_evk_defconfig +0 -1
index 50132c833e23..6433b437d3be 100644
@@ -14,7 +14,6 @@ CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
configs/imx8mq_phanbell_defconfig +0 -1
index 3a1b60b8a395..94b474f4cc05 100644
@@ -14,7 +14,6 @@ CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
 CONFIG_SD_BOOT=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_BOARD_INIT=y
configs/imx8qm_mek_defconfig +0 -1
index a181d37ff751..606ccb667330 100644
@@ -19,7 +19,6 @@ CONFIG_SPL=y
 CONFIG_SPL_LOAD_IMX_CONTAINER=y
 CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qm_mek/uboot-container.cfg"
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qm_mek/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOG=y
 CONFIG_BOARD_EARLY_INIT_F=y
configs/imx8qm_rom7720_a1_4G_defconfig +0 -1
index 33556356cf94..684d26e80837 100644
@@ -17,7 +17,6 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/advantech/imx8qm_rom7720_a1/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOG=y
 CONFIG_BOARD_EARLY_INIT_F=y
configs/imx8qxp_mek_defconfig +0 -1
index 19e7076f8ca7..5a38f76301d4 100644
@@ -19,7 +19,6 @@ CONFIG_SPL=y
 CONFIG_SPL_LOAD_IMX_CONTAINER=y
 CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qxp_mek/uboot-container.cfg"
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOG=y
 CONFIG_BOARD_EARLY_INIT_F=y
configs/imx8ulp_evk_defconfig +1 -0
index 2a97c6dc4472..77180f08b1b0 100644
@@ -7,6 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x400000
+CONFIG_IMX_CONFIG=""
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx8ulp-evk"
 CONFIG_SPL_TEXT_BASE=0x22020000
configs/kp_imx53_defconfig +0 -1
index 4a2d8afe4ee3..2c12625b5a23 100644
@@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET_REDUND=0x102000
 # CONFIG_CMD_BMODE is not set
 CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
 CONFIG_SHOW_BOOT_PROGRESS=y
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_STOP_STR="."
configs/kp_imx6q_tpc_defconfig +0 -1
index 96c1061683bd..b2c6438fb12c 100644
@@ -22,7 +22,6 @@ CONFIG_ENV_OFFSET_REDUND=0x102000
 CONFIG_SPL_PAYLOAD="u-boot.img"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_AUTOBOOT_KEYED=y
configs/liteboard_defconfig +0 -1
index a04cfdbe15f5..668654fb3f7e 100644
@@ -18,7 +18,6 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=1
 CONFIG_DEFAULT_FDT_FILE="imx6ul-liteboard.dtb"
 CONFIG_BOARD_EARLY_INIT_F=y
configs/m53menlo_defconfig +0 -1
index 505dd078b0c9..ca51892a8856 100644
@@ -21,7 +21,6 @@ CONFIG_ENV_OFFSET_REDUND=0x180000
 # CONFIG_CMD_BMODE is not set
 CONFIG_FIT=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/menlo/m53menlo/imximage.cfg"
 CONFIG_BOOTDELAY=1
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttymxc0,115200"
configs/marsboard_defconfig +2 -1
index 62f0b2f1c2a5..bcb83b5d73de 100644
@@ -5,12 +5,13 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_ENV_SECT_SIZE=0x2000
+CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6q.cfg"
 CONFIG_MX6Q=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-marsboard"
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,DDR_MB=1024"
+CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mccmon6_nor_defconfig +1 -1
index 2c82e3ca45b6..1c739cbf7dc9 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_IMX_CONFIG="board/liebherr/mccmon6/mon6_imximage_nor.cfg"
 CONFIG_MX6QDL=y
 CONFIG_TARGET_MCCMON6=y
 CONFIG_SYS_I2C_MXC_I2C1=y
@@ -19,7 +20,6 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_nor.cfg"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
configs/mccmon6_sd_defconfig +1 -1
index 5c1aea8f7a86..5237ee5809c3 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_SECT_SIZE=0x20000
+CONFIG_IMX_CONFIG="board/liebherr/mccmon6/mon6_imximage_sd.cfg"
 CONFIG_MX6QDL=y
 CONFIG_TARGET_MCCMON6=y
 CONFIG_SYS_I2C_MXC_I2C1=y
@@ -20,7 +21,6 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_sd.cfg"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
configs/meerkat96_defconfig +0 -1
index ee6b9e14d05f..7a92ba7c7a8a 100644
@@ -13,7 +13,6 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 # CONFIG_ARMV7_VIRT is not set
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/novtech/meerkat96/imximage.cfg"
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
configs/mx23_olinuxino_defconfig +1 -0
index 5805205a8a61..4994115ad5a7 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x40000
+CONFIG_IMX_CONFIG=""
 CONFIG_DEFAULT_DEVICE_TREE="imx23-olinuxino"
 CONFIG_SPL_TEXT_BASE=0x00001000
 CONFIG_TARGET_MX23_OLINUXINO=y
configs/mx23evk_defconfig +1 -0
index ab45a9c80f9b..1c37562c3a7f 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x40000
+CONFIG_IMX_CONFIG=""
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx23-evk"
 CONFIG_SPL_TEXT_BASE=0x00001000
configs/mx28evk_auart_console_defconfig +1 -0
index 1f61dda5ed98..fbc9a4db52a0 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x40000
+CONFIG_IMX_CONFIG=""
 CONFIG_SPL_TEXT_BASE=0x00001000
 CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL_SERIAL_SUPPORT=y
configs/mx28evk_defconfig +1 -0
index 306a678aefd5..603375d5181a 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x40000
+CONFIG_IMX_CONFIG=""
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx28-evk"
 CONFIG_SPL_TEXT_BASE=0x00001000
configs/mx28evk_nand_defconfig +1 -0
index e40f83f92e01..2e9b46611995 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x300000
+CONFIG_IMX_CONFIG=""
 CONFIG_SPL_TEXT_BASE=0x00001000
 CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL_SERIAL_SUPPORT=y
configs/mx28evk_spi_defconfig +1 -0
index 577515e34762..7e9dc224fceb 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x4000
+CONFIG_IMX_CONFIG=""
 CONFIG_SPL_TEXT_BASE=0x00001000
 CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL_SERIAL_SUPPORT=y
configs/mx51evk_defconfig +0 -1
index 6c8b9b62e517..e04c26a77f04 100644
@@ -8,7 +8,6 @@ CONFIG_TARGET_MX51EVK=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx51-babbage"
 # CONFIG_CMD_BMODE is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg"
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/mx53cx9020_defconfig +0 -1
index 8ee442f2b90f..39f0d5d6d865 100644
@@ -9,7 +9,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx53-cx9020"
 # CONFIG_CMD_BMODE is not set
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beckhoff/mx53cx9020/imximage.cfg"
 CONFIG_BOOTDELAY=1
 CONFIG_USE_PREBOOT=y
 CONFIG_CMD_MMC=y
configs/mx53loco_defconfig +0 -1
index 296886dd6c8b..4036ae4f68b2 100644
@@ -10,7 +10,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx53-qsb"
 # CONFIG_CMD_BMODE is not set
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg"
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/mx53ppd_defconfig +0 -1
index 4a8fa34c2754..53ae2d5cfa4c 100644
@@ -11,7 +11,6 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=10
 CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ge/mx53ppd/imximage.cfg"
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6cuboxi_defconfig +0 -1
index dd2710f47502..fc9d549a1c00 100644
@@ -21,7 +21,6 @@ CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="if hdmidet; then usb start; setenv stdin  serial,usbkbd; setenv stdout serial,vidconsole; setenv stderr serial,vidconsole; else setenv stdin  serial; setenv stdout serial; setenv stderr serial; fi;"
configs/mx6memcal_defconfig +1 -1
index a1ee10f143b1..746dc81e50b2 100644
@@ -14,7 +14,7 @@ CONFIG_SPL_TEXT_BASE=0x00908000
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL"
+CONFIG_SYS_EXTRA_OPTIONS="SPL"
 CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
configs/mx6qsabrelite_defconfig +2 -1
index 7d0453ac384c..3aa679b163b4 100644
@@ -7,6 +7,7 @@ CONFIG_SYS_MEMTEST_START=0x10000000
 CONFIG_SYS_MEMTEST_END=0x10010000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
+CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6q.cfg"
 CONFIG_MX6Q=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_DM_GPIO=y
@@ -14,7 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabrelite"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,DDR_MB=1024,SABRELITE"
+CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024,SABRELITE"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
configs/mx6sabreauto_defconfig +0 -1
index 1059c5a8a3b0..39cc71c4ea76 100644
@@ -23,7 +23,6 @@ CONFIG_SPL_FIT_PRINT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/mx6sabresd_defconfig +0 -1
index 61e9054717b8..d5bab535d003 100644
@@ -22,7 +22,6 @@ CONFIG_SPL_FIT_PRINT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/mx6slevk_defconfig +0 -1
index 9e1032938f12..8788849821a7 100644
@@ -10,7 +10,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
 # CONFIG_CMD_BMODE is not set
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx6slevk_spinor_defconfig +0 -1
index 8df10ed2ae5d..e1ccaa621696 100644
@@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6sl-evk"
 # CONFIG_CMD_BMODE is not set
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg"
 CONFIG_SPI_BOOT=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
configs/mx6slevk_spl_defconfig +0 -1
index 987573f6c0d8..6beadeb5aa08 100644
@@ -18,7 +18,6 @@ CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_FS_EXT4=y
 CONFIG_SPL_I2C=y
configs/mx6sllevk_defconfig +0 -1
index 9f02ec838a03..1ebc7fa1ae3c 100644
@@ -12,7 +12,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6sll-evk"
 # CONFIG_CMD_BMODE is not set
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sllevk/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx6sllevk_plugin_defconfig +0 -1
index 6fc49150b3c1..ed992e29594c 100644
@@ -13,7 +13,6 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6sll-evk"
 CONFIG_USE_IMXIMG_PLUGIN=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sllevk/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx6sxsabreauto_defconfig +0 -1
index d888e7255d2d..66c08ea9b1a7 100644
@@ -10,7 +10,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6sx-sabreauto"
 # CONFIG_CMD_BMODE is not set
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabreauto/imximage.cfg"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
configs/mx6sxsabresd_defconfig +0 -1
index 67dfcda8fa74..2087848e8a5a 100644
@@ -11,7 +11,6 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6sx-sdb"
 # CONFIG_CMD_BMODE is not set
 CONFIG_NXP_BOARD_REVISION=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx6ul_14x14_evk_defconfig +0 -1
index d28b6f6e3cef..43b765d2467a 100644
@@ -19,7 +19,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_BOARD_EARLY_INIT_F=y
configs/mx6ul_9x9_evk_defconfig +0 -1
index 1425724429e1..9e924e58390c 100644
@@ -19,7 +19,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_BOARD_EARLY_INIT_F=y
configs/mx6ull_14x14_evk_defconfig +0 -1
index 24e18c1d4ebd..fc8ca6b5689a 100644
@@ -11,7 +11,6 @@ CONFIG_TARGET_MX6ULL_14X14_EVK=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk"
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx6ull_14x14_evk_plugin_defconfig +0 -1
index 2700f98e6c6a..74faceef9026 100644
@@ -12,7 +12,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk"
 CONFIG_USE_IMXIMG_PLUGIN=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx6ulz_14x14_evk_defconfig +0 -1
index 23c821079e5d..6c6aaba058b5 100644
@@ -11,7 +11,6 @@ CONFIG_TARGET_MX6ULL_14X14_EVK=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ulz-14x14-evk"
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx7dsabresd_defconfig +0 -1
index 39e73042bfb9..13cb29cbe2cc 100644
@@ -13,7 +13,6 @@ CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_CMD_BOOTD is not set
configs/mx7dsabresd_qspi_defconfig +0 -1
index f5d2f253657c..bed45aa4f533 100644
@@ -12,7 +12,6 @@ CONFIG_TARGET_MX7DSABRESD=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_CMD_BOOTD is not set
configs/mx7ulp_com_defconfig +0 -1
index 62992fecdf26..f670bb7343cd 100644
@@ -8,7 +8,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-com"
 CONFIG_LDO_ENABLED_MODE=y
 CONFIG_TARGET_MX7ULP_COM=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ea/mx7ulp_com/imximage.cfg"
 CONFIG_DEFAULT_FDT_FILE="imx7ulp-com"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
configs/mx7ulp_evk_defconfig +0 -1
index c7738a6b8075..83e7eaeb6892 100644
@@ -10,7 +10,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk"
 CONFIG_TARGET_MX7ULP_EVK=y
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/mx7ulp_evk_plugin_defconfig +0 -1
index 05e62fc165fe..1b518526ddc8 100644
@@ -9,7 +9,6 @@ CONFIG_ENV_OFFSET=0xC0000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk"
 CONFIG_TARGET_MX7ULP_EVK=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MEMTEST=y
configs/myir_mys_6ulx_defconfig +0 -1
index d7a68d6c5160..639e5663f829 100644
@@ -16,7 +16,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_BOARD_EARLY_INIT_F=y
configs/nitrogen6dl2g_defconfig +2 -1
index 865f6fac84a1..e2e9eb94a924 100644
@@ -8,6 +8,7 @@ CONFIG_SYS_MEMTEST_END=0x10010000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_ENV_SECT_SIZE=0x2000
+CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6dl2g.cfg"
 CONFIG_MX6DL=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_DM_GPIO=y
@@ -15,7 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,DDR_MB=2048"
+CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=2048"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/nitrogen6dl_defconfig +2 -1
index 7852eb8638c7..5282e36550c1 100644
@@ -8,6 +8,7 @@ CONFIG_SYS_MEMTEST_END=0x10010000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_ENV_SECT_SIZE=0x2000
+CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6dl.cfg"
 CONFIG_MX6DL=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_DM_GPIO=y
@@ -15,7 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,DDR_MB=1024"
+CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/nitrogen6q2g_defconfig +2 -1
index 2007126023d0..38af0d8a4aaa 100644
@@ -8,6 +8,7 @@ CONFIG_SYS_MEMTEST_END=0x10010000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_ENV_SECT_SIZE=0x2000
+CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6q2g.cfg"
 CONFIG_MX6Q=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_DM_GPIO=y
@@ -15,7 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,DDR_MB=2048"
+CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=2048"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/nitrogen6q_defconfig +2 -1
index af38dd711f29..8bb207201933 100644
@@ -8,6 +8,7 @@ CONFIG_SYS_MEMTEST_END=0x10010000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_ENV_SECT_SIZE=0x2000
+CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6q.cfg"
 CONFIG_MX6Q=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_DM_GPIO=y
@@ -15,7 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,DDR_MB=1024"
+CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/nitrogen6s1g_defconfig +2 -1
index ae00482f9cb8..e53fb05d3cfc 100644
@@ -8,6 +8,7 @@ CONFIG_SYS_MEMTEST_END=0x10010000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_ENV_SECT_SIZE=0x2000
+CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6s1g.cfg"
 CONFIG_MX6S=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_DM_GPIO=y
@@ -15,7 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,DDR_MB=1024"
+CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/nitrogen6s_defconfig +2 -1
index 92ccabaa26ca..ca0652d2d5fc 100644
@@ -8,6 +8,7 @@ CONFIG_SYS_MEMTEST_END=0x10010000
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_ENV_SECT_SIZE=0x2000
+CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6s.cfg"
 CONFIG_MX6S=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_DM_GPIO=y
@@ -15,7 +16,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,DDR_MB=512"
+CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=512"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/novena_defconfig +0 -1
index 2efa14406b55..0372ebad4880 100644
@@ -22,7 +22,6 @@ CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-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"
configs/pcm052_defconfig +0 -1
index 260d3d459b48..bc3b95e8fd8a 100644
@@ -11,7 +11,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="vf610-pcm052"
 CONFIG_ENV_OFFSET_REDUND=0xC0000
 CONFIG_TARGET_PCM052=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
configs/pcm058_defconfig +0 -1
index f9babdb504f2..275b5c04b579 100644
@@ -25,7 +25,6 @@ CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-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
configs/phycore-imx8mm_defconfig +0 -1
index 7892cd492651..d9d19293d91e 100644
@@ -24,7 +24,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
 CONFIG_DEFAULT_FDT_FILE="oftree"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
configs/phycore-imx8mp_defconfig +0 -1
index 84a0a5cbaf24..7300096dd7fd 100644
@@ -22,7 +22,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg"
 CONFIG_DEFAULT_FDT_FILE="oftree"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
configs/phycore_pcl063_defconfig +0 -1
index a74a7a3eec6c..bdfa1287cf83 100644
@@ -15,7 +15,6 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_BOARD_EARLY_INIT_F=y
configs/phycore_pcl063_ull_defconfig +0 -1
index c2a83d418f2b..0fd1089ab36b 100644
@@ -14,7 +14,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_BOARD_EARLY_INIT_F=y
configs/pico-dwarf-imx6ul_defconfig +0 -1
index 673911ca6329..32a53f33ee19 100644
@@ -18,7 +18,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-dwarf.dtb"
configs/pico-dwarf-imx7d_defconfig +0 -1
index 1ef415f03adb..e9d46a18c679 100644
@@ -16,7 +16,6 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx7d-pico-dwarf.dtb"
 CONFIG_SPL_I2C=y
configs/pico-hobbit-imx6ul_defconfig +0 -1
index 0c11d0c88cf6..92bb4beece75 100644
@@ -19,7 +19,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-hobbit.dtb"
configs/pico-hobbit-imx7d_defconfig +0 -1
index 64a76a947753..ed1f3aa3f150 100644
@@ -16,7 +16,6 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
 CONFIG_SPL_I2C=y
configs/pico-imx6_defconfig +0 -1
index c3cd660813c8..588ddd0ede28 100644
@@ -21,7 +21,6 @@ CONFIG_FIT=y
 CONFIG_SPL_FIT_PRINT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run default_boot"
 CONFIG_DEFAULT_FDT_FILE="ask"
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/pico-imx6ul_defconfig +0 -1
index f027c866f564..69cde6b362cb 100644
@@ -19,7 +19,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="ask"
configs/pico-imx7d_bl33_defconfig +0 -1
index 4657d51e23bf..32290d4dd4fe 100644
@@ -17,7 +17,6 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_SPL_I2C=y
 CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_USB_GADGET=y
configs/pico-imx7d_defconfig +0 -1
index c68294821851..f88525a97e1f 100644
@@ -16,7 +16,6 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="ask"
 CONFIG_SPL_I2C=y
configs/pico-imx8mq_defconfig +0 -1
index 9d664c07f065..7653e11b9fe2 100644
@@ -13,7 +13,6 @@ CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
configs/pico-nymph-imx7d_defconfig +0 -1
index 1ef415f03adb..e9d46a18c679 100644
@@ -16,7 +16,6 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx7d-pico-dwarf.dtb"
 CONFIG_SPL_I2C=y
configs/pico-pi-imx6ul_defconfig +0 -1
index 93606bf48787..18d7ad421aaa 100644
@@ -19,7 +19,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-pi.dtb"
configs/pico-pi-imx7d_defconfig +0 -1
index 8d668936d776..b03988a4b76f 100644
@@ -16,7 +16,6 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb"
 CONFIG_SPL_I2C=y
configs/riotboard_defconfig +2 -1
index 2f4553604ef1..454a532f9f38 100644
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0x60000
+CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6s1g.cfg"
 CONFIG_MX6S=y
 CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_DM_GPIO=y
@@ -17,7 +18,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,DDR_MB=1024"
+CONFIG_SYS_EXTRA_OPTIONS="SPL,DDR_MB=1024"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/seeed_npi_imx6ull_defconfig +0 -1
index dbe0171ce128..bc6b4e83657b 100644
@@ -17,7 +17,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_BOARD_EARLY_INIT_F=y
configs/smegw01_defconfig +0 -1
index 75fd5bc24a81..f0ecf8ec15a1 100644
@@ -14,7 +14,6 @@ CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/storopack/smegw01/imximage.cfg"
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
configs/somlabs_visionsom_6ull_defconfig +0 -1
index 0c407b3ff9b7..9251055bd9f2 100644
@@ -11,7 +11,6 @@ CONFIG_TARGET_SOMLABS_VISIONSOM_6ULL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ull-somlabs-visionsom"
 CONFIG_FIT=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/somlabs/visionsom-6ull/imximage.cfg"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
configs/udoo_defconfig +0 -1
index eecca2e6c50f..1fdf0b0093f5 100644
@@ -18,7 +18,6 @@ CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
 CONFIG_BOARD_EARLY_INIT_F=y
configs/udoo_neo_defconfig +0 -1
index 63960d069743..aceea8f026a8 100644
@@ -18,7 +18,6 @@ CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_ENV_SUPPORT=y
configs/variscite_dart6ul_defconfig +0 -1
index 930a178bc6a8..ef69d87efa1c 100644
@@ -15,7 +15,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SPL_USB_HOST=y
configs/verdin-imx8mm_defconfig +0 -1
index 624f1b99096e..0141c20a02da 100644
@@ -26,7 +26,6 @@ CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/verdin-imx8mm/imximage.cfg"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-verdin-dev.dtb"
 CONFIG_LOG=y
configs/vf610twr_defconfig +0 -1
index 24a7bdedf0ac..6280d4bfcd9a 100644
@@ -9,7 +9,6 @@ CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="vf610-twr"
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOGLEVEL=3
 CONFIG_BOARD_EARLY_INIT_F=y
configs/vf610twr_nand_defconfig +0 -1
index 7cf8ae660420..238814610c91 100644
@@ -9,7 +9,6 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x180000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="vf610-twr"
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_LOGLEVEL=3
 CONFIG_BOARD_EARLY_INIT_F=y
configs/vining_2000_defconfig +0 -1
index f1ac8e80a2c4..8dae94e9c0ea 100644
@@ -23,7 +23,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/softing/vining_2000/imximage.cfg"
 CONFIG_BOOTDELAY=0
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_BOARD_EARLY_INIT_F=y
configs/wandboard_defconfig +0 -1
index d3f0e0e68c34..69fd435e5607 100644
@@ -26,7 +26,6 @@ CONFIG_FIT=y
 CONFIG_SPL_FIT_PRINT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/warp7_bl33_defconfig +0 -1
index ec078178abf8..7cc43dbe4719 100644
@@ -12,7 +12,6 @@ CONFIG_IMX_HAB=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp7/imximage.cfg"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_MEMTEST=y
configs/warp7_defconfig +0 -1
index 19c0c183f7e5..1c00e211c124 100644
@@ -15,7 +15,6 @@ CONFIG_IMX_BOOTAUX=y
 CONFIG_IMX_HAB=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp7/imximage.cfg"
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
configs/warp_defconfig +0 -1
index dce2170354bd..179d5a605b73 100644
@@ -8,7 +8,6 @@ CONFIG_MX6SL=y
 CONFIG_TARGET_WARP=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg"
 CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
configs/zmx25_defconfig +1 -0
index 2afe42998685..3a11a537e102 100644
@@ -5,6 +5,7 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_SECT_SIZE=0x20000
 CONFIG_TARGET_ZMX25=y
+CONFIG_IMX_CONFIG=""
 CONFIG_BOOTDELAY=5
 CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="boot in %d s\n"
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 3/6 Convert CONFIG_SPL to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SPL

---
 configs/mx6memcal_defconfig | 1 -
 configs/riotboard_defconfig | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
configs/mx6memcal_defconfig +0 -1
index 746dc81e50b2..8cf0d1350dee 100644
@@ -14,7 +14,6 @@ CONFIG_SPL_TEXT_BASE=0x00908000
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="SPL"
 CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
configs/riotboard_defconfig +1 -1
index 454a532f9f38..292d6a49f25e 100644
@@ -18,7 +18,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="SPL,DDR_MB=1024"
+CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH 4/6 nitrogen6x: Migrate DDR_MB to Kconfig

In reply to Tom Rini

Move the CONFIG_DDR_MB symbol to Kconfig. A later clean-up would be to make dynamic memory size detection work based on how this is done on other i.MX6 platforms.

---
For example, mx6cuboxi does dynamic memory size detection and that code could be adapted for this platform and perhaps moved to a more generic imx6 location.

---
 board/boundary/nitrogen6x/Kconfig | 3 +++
 configs/marsboard_defconfig       | 1 -
 configs/mx6qsabrelite_defconfig   | 3 ++-
 configs/nitrogen6dl2g_defconfig   | 2 +-
 configs/nitrogen6dl_defconfig     | 2 +-
 configs/nitrogen6q2g_defconfig    | 2 +-
 configs/nitrogen6q_defconfig      | 2 +-
 configs/nitrogen6s1g_defconfig    | 2 +-
 configs/nitrogen6s_defconfig      | 2 +-
 configs/riotboard_defconfig       | 1 -
 10 files changed, 11 insertions(+), 9 deletions(-)
board/boundary/nitrogen6x/Kconfig +3 -0
index f4db56d49601..9c176c071e72 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "nitrogen6x"
 
+config DDR_MB
+	int "Memory size in MB"
+
 endif
configs/marsboard_defconfig +0 -1
index bcb83b5d73de..8fcb16c108d1 100644
@@ -11,7 +11,6 @@ CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-marsboard"
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mx6qsabrelite_defconfig +2 -1
index 3aa679b163b4..9f0882e932f4 100644
@@ -10,12 +10,13 @@ CONFIG_ENV_OFFSET=0xC0000
 CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6q.cfg"
 CONFIG_MX6Q=y
 CONFIG_TARGET_NITROGEN6X=y
+CONFIG_DDR_MB=1024
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabrelite"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024,SABRELITE"
+CONFIG_SYS_EXTRA_OPTIONS="SABRELITE"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
configs/nitrogen6dl2g_defconfig +1 -1
index e2e9eb94a924..a42744ee637b 100644
@@ -11,12 +11,12 @@ CONFIG_ENV_SECT_SIZE=0x2000
 CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6dl2g.cfg"
 CONFIG_MX6DL=y
 CONFIG_TARGET_NITROGEN6X=y
+CONFIG_DDR_MB=2048
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=2048"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/nitrogen6dl_defconfig +1 -1
index 5282e36550c1..bbd72084fd70 100644
@@ -11,12 +11,12 @@ CONFIG_ENV_SECT_SIZE=0x2000
 CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6dl.cfg"
 CONFIG_MX6DL=y
 CONFIG_TARGET_NITROGEN6X=y
+CONFIG_DDR_MB=1024
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/nitrogen6q2g_defconfig +1 -1
index 38af0d8a4aaa..3b5029cfbbc4 100644
@@ -11,12 +11,12 @@ CONFIG_ENV_SECT_SIZE=0x2000
 CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6q2g.cfg"
 CONFIG_MX6Q=y
 CONFIG_TARGET_NITROGEN6X=y
+CONFIG_DDR_MB=2048
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=2048"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/nitrogen6q_defconfig +1 -1
index 8bb207201933..a74cb8e993c5 100644
@@ -11,12 +11,12 @@ CONFIG_ENV_SECT_SIZE=0x2000
 CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6q.cfg"
 CONFIG_MX6Q=y
 CONFIG_TARGET_NITROGEN6X=y
+CONFIG_DDR_MB=1024
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/nitrogen6s1g_defconfig +1 -1
index e53fb05d3cfc..187657873387 100644
@@ -11,12 +11,12 @@ CONFIG_ENV_SECT_SIZE=0x2000
 CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6s1g.cfg"
 CONFIG_MX6S=y
 CONFIG_TARGET_NITROGEN6X=y
+CONFIG_DDR_MB=1024
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/nitrogen6s_defconfig +1 -1
index ca0652d2d5fc..ef2d65f9789f 100644
@@ -11,12 +11,12 @@ CONFIG_ENV_SECT_SIZE=0x2000
 CONFIG_IMX_CONFIG="board/boundary/nitrogen6x/nitrogen6s.cfg"
 CONFIG_MX6S=y
 CONFIG_TARGET_NITROGEN6X=y
+CONFIG_DDR_MB=512
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6dl-nitrogen6x"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_SUPPORT_RAW_INITRD=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=512"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
configs/riotboard_defconfig +0 -1
index 292d6a49f25e..69f604a700ee 100644
@@ -18,7 +18,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
Signature · 1 line
2.17.1
Acked-by on v1 4/6
#4 lore raw

Re: [PATCH 4/6] nitrogen6x: Migrate DDR_MB to Kconfig

Quoted 54 lines · Tom Rini

Move the CONFIG_DDR_MB symbol to Kconfig. A later clean-up would be to make dynamic memory size detection work based on how this is done on other i.MX6 platforms.

---
For example, mx6cuboxi does dynamic memory size detection and that code could be adapted for this platform and perhaps moved to a more generic imx6 location.

---
 board/boundary/nitrogen6x/Kconfig | 3 +++
 configs/marsboard_defconfig       | 1 -
 configs/mx6qsabrelite_defconfig   | 3 ++-
 configs/nitrogen6dl2g_defconfig   | 2 +-
 configs/nitrogen6dl_defconfig     | 2 +-
 configs/nitrogen6q2g_defconfig    | 2 +-
 configs/nitrogen6q_defconfig      | 2 +-
 configs/nitrogen6s1g_defconfig    | 2 +-
 configs/nitrogen6s_defconfig      | 2 +-
 configs/riotboard_defconfig       | 1 -
 10 files changed, 11 insertions(+), 9 deletions(-)
board/boundary/nitrogen6x/Kconfig +3 -0
index f4db56d49601..9c176c071e72 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "nitrogen6x"
 
+config DDR_MB
+	int "Memory size in MB"
+
 endif
configs/marsboard_defconfig +1 -1
index bcb83b5d73de..8fcb16c108d1 100644
@@ -11,7 +11,6 @@ CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-marsboard"
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 
+++ b/configs/riotboard_defconfig

configs/marsboard_defconfig CONFIG_SPL_SERIAL_SUPPORT=y · line 23

Quoted 7 lines
configs/marsboard_defconfig +0 -1
@@ -18,7 +18,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y

I guess marsboard_defconfig/riotboard_defconfig was a copy/paste issue, and never needed DDR_MB=1024 ?

For boundary boards

Thanks

author
#5 lore raw

Re: [PATCH 4/6] nitrogen6x: Migrate DDR_MB to Kconfig

Quoted 52 lines · Troy Kisky
Quoted 50 lines · Tom Rini

Move the CONFIG_DDR_MB symbol to Kconfig. A later clean-up would be to make dynamic memory size detection work based on how this is done on other i.MX6 platforms.

---
For example, mx6cuboxi does dynamic memory size detection and that code could be adapted for this platform and perhaps moved to a more generic imx6 location.

---
 board/boundary/nitrogen6x/Kconfig | 3 +++
 configs/marsboard_defconfig       | 1 -
 configs/mx6qsabrelite_defconfig   | 3 ++-
 configs/nitrogen6dl2g_defconfig   | 2 +-
 configs/nitrogen6dl_defconfig     | 2 +-
 configs/nitrogen6q2g_defconfig    | 2 +-
 configs/nitrogen6q_defconfig      | 2 +-
 configs/nitrogen6s1g_defconfig    | 2 +-
 configs/nitrogen6s_defconfig      | 2 +-
 configs/riotboard_defconfig       | 1 -
 10 files changed, 11 insertions(+), 9 deletions(-)
board/boundary/nitrogen6x/Kconfig +3 -0
index f4db56d49601..9c176c071e72 100644
@@ -9,4 +9,7 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "nitrogen6x"
 
+config DDR_MB
+	int "Memory size in MB"
+
 endif
configs/marsboard_defconfig +0 -1
index bcb83b5d73de..8fcb16c108d1 100644
@@ -11,7 +11,6 @@ CONFIG_TARGET_EMBESTMX6BOARDS=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-marsboard"
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
Quoted 13 lines

configs/marsboard_defconfig CONFIG_SPL_SERIAL_SUPPORT=y · line 23

Quoted 10 lines

+++ b/configs/riotboard_defconfig

configs/marsboard_defconfig +0 -1
@@ -18,7 +18,6 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="DDR_MB=1024"
 CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y

I guess marsboard_defconfig/riotboard_defconfig was a copy/paste issue, and never needed DDR_MB=1024 ?

Correct.

Quoted 2 lines

For boundary boards

Thanks!

Signature · 1 line
Tom
author
#6 lore raw

PATCH 5/6 nitrogen6x: Populate FDTFILE at build-time for all platforms

In reply to Tom Rini

Rather than using CONFIG_SABRELITE to set FDTFILE for only that platform, switch to always setting this based on CONFIG_DEFAULT_DEVICE_TREE as this should always match the kernel device tree name anyhow.

---
 configs/mx6qsabrelite_defconfig |  1 -
 include/configs/nitrogen6x.h    | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)
configs/mx6qsabrelite_defconfig +0 -1
index 9f0882e932f4..b496df8a4dac 100644
@@ -16,7 +16,6 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabrelite"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="SABRELITE"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
include/configs/nitrogen6x.h +1 -9
index 0c407503517d..1a0d970de716 100644
@@ -90,14 +90,6 @@
 #define DISTRO_BOOT_DEV_DHCP(func)
 #endif
 
-
-#if defined(CONFIG_SABRELITE)
-#define FDTFILE "fdtfile=imx6q-sabrelite.dtb\0"
-#else
-/* FIXME: nitrogen6x covers multiple configs. Define fdtfile for each supported config. */
-#define FDTFILE
-#endif
-
 #define BOOT_TARGET_DEVICES(func) \
 	DISTRO_BOOT_DEV_MMC(func) \
 	DISTRO_BOOT_DEV_SATA(func) \
@@ -113,7 +105,7 @@
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
 	"fdt_addr_r=0x18000000\0" \
-	FDTFILE \
+	"fdtfile=" __stringify(CONFIG_DEFAULT_DEVICE_TREE) ".dtb\0" \
 	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0"  \
 	"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
 	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
Signature · 1 line
2.17.1
Acked-by on v1 5/6
#7 lore raw

Re: [PATCH 5/6] nitrogen6x: Populate FDTFILE at build-time for all platforms

Quoted 45 lines · Tom Rini

Rather than using CONFIG_SABRELITE to set FDTFILE for only that platform, switch to always setting this based on CONFIG_DEFAULT_DEVICE_TREE as this should always match the kernel device tree name anyhow.

---
 configs/mx6qsabrelite_defconfig |  1 -
 include/configs/nitrogen6x.h    | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)
configs/mx6qsabrelite_defconfig +0 -1
index 9f0882e932f4..b496df8a4dac 100644
@@ -16,7 +16,6 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabrelite"
 CONFIG_CMD_HDMIDETECT=y
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="SABRELITE"
 CONFIG_BOOTDELAY=3
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
include/configs/nitrogen6x.h +0 -8
index 0c407503517d..1a0d970de716 100644
@@ -90,14 +90,6 @@
 #define DISTRO_BOOT_DEV_DHCP(func)
 #endif
 
-
-#if defined(CONFIG_SABRELITE)
-#define FDTFILE "fdtfile=imx6q-sabrelite.dtb\0"
-#else
-/* FIXME: nitrogen6x covers multiple configs. Define fdtfile for each supported config. */
-#define FDTFILE
-#endif
-
 #define BOOT_TARGET_DEVICES(func) \
 	DISTRO_BOOT_DEV_MMC(func) \
 	DISTRO_BOOT_DEV_SATA(func) \

include/configs/nitrogen6x.h line 111

Quoted 8 lines
include/configs/nitrogen6x.h +1 -1
@@ -113,7 +105,7 @@
 	"fdt_high=0xffffffff\0" \
 	"initrd_high=0xffffffff\0" \
 	"fdt_addr_r=0x18000000\0" \
-	FDTFILE \
+	"fdtfile=" __stringify(CONFIG_DEFAULT_DEVICE_TREE) ".dtb\0" \
 	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0"  \
 	"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
 	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \

Thanks!

author
#8 lore raw

PATCH 6/6 configs: Remove unused IMX_NAND symbol

In reply to Tom Rini

The symbol CONFIG_IMX_NAND is not referenced in the code, remove it.

---
 configs/colibri-imx6ull_defconfig | 1 -
 configs/colibri_vf_defconfig      | 1 -
 2 files changed, 2 deletions(-)
configs/colibri-imx6ull_defconfig +0 -1
index d0e85b1bc343..0d46ddafadc8 100644
@@ -12,7 +12,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_NAND"
 CONFIG_BOOTDELAY=1
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
configs/colibri_vf_defconfig +0 -1
index 6bc79c30e34b..7e0f67fb554e 100644
@@ -12,7 +12,6 @@ CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
 CONFIG_TARGET_COLIBRI_VF=y
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_NAND"
 CONFIG_BOOTDELAY=1
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb"
Signature · 1 line
2.17.1
author
#9 lore raw
In reply to Tom Rini
Quoted 6 lines · Tom Rini

Currently, there is no over-arching symbol for access to arch/arm/mach-imx nor the CONFIG symbols that are common over all of these related platforms. This new CONFIG symbol will allow us to start down this path.

For the series, applied to u-boot/next, thanks!

Signature · 1 line
Tom