Merge pull request #2441 from BenjaminMiss/imx9_deprecate_legacy_uboot_config

Imx93/943 adapt U-Boot configuration to deprecated UBOOT_CONFIG syntax

2 files changed, 6 insertions, 3 deletions

diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc
index e5a3f0e22..f504694f3 100644
--- a/conf/machine/include/imx93-evk.inc
+++ b/conf/machine/include/imx93-evk.inc
@@ -23,9 +23,10 @@ UBOOT_MAKE_TARGET = ""
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[ecc]  = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG_IMAGE_FSTYPES[sd] = "sdcard"
 
 # Set ATF platform name
 ATF_PLATFORM = "imx93"
diff --git a/conf/machine/include/imx943-evk.inc b/conf/machine/include/imx943-evk.inc
index 875d5eb36..a2abe30dc 100644
--- a/conf/machine/include/imx943-evk.inc
+++ b/conf/machine/include/imx943-evk.inc
@@ -32,10 +32,12 @@ UBOOT_MAKE_TARGET = ""
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 UBOOT_CONFIG ??= "${@bb.utils.contains('COMBINED_FEATURES', 'crrm', 'crrm', 'sd', d)}"
-UBOOT_CONFIG[sd]     = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
-UBOOT_CONFIG[sd-ecc] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]     = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[sd-ecc] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[crrm]   = "${UBOOT_CONFIG_BASENAME}_xspi_crrm_defconfig"
 UBOOT_CONFIG[xspi]   = "${UBOOT_CONFIG_BASENAME}_xspi_defconfig"
+UBOOT_CONFIG_IMAGE_FSTYPES[sd]     = "sdcard"
+UBOOT_CONFIG_IMAGE_FSTYPES[sd-ecc] = "sdcard"
 
 ATF_PLATFORM = "imx94"
 OEI_CORE = "m33"