conf/machine: Drop non-existent image type sdcard

The machine configuration files specify an image type `sdcard` via
`UBOOT_CONFIG`. This type is not listed in `IMAGE_TYPES`, and the
specification appears to have no effect on the build. It appears to be
historical only and of no use, so drop it.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

22 files changed, 40 insertions, 40 deletions

diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index cecb97d27..f6946b771 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -17,9 +17,9 @@ UBOOT_MAKE_TARGET = "u-boot.sb"
 UBOOT_SUFFIX = "sb"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx28evk_config,sdcard"
+UBOOT_CONFIG[sd] = "mx28evk_config"
 UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs"
-UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"
+UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config"
 
 KERNEL_DEVICETREE = "nxp/mxs/imx28-evk.dtb"
 
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 61d81ab69..08c5e8452 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -56,8 +56,8 @@ UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx-mfgtool = "imx"
 
-UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard"
-UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard"
+UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig"
+UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig"
 UBOOT_CONFIG[eimnor]   = "${UBOOT_CONFIG_MACHINE_NAME}_eimnor_defconfig"
 UBOOT_CONFIG[nand]     = "${UBOOT_CONFIG_MACHINE_NAME}_nand_defconfig,ubifs"
 UBOOT_CONFIG[spinor]   = "${UBOOT_CONFIG_MACHINE_NAME}_spinor_defconfig"
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index c65bc9b91..48609ef84 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -62,8 +62,8 @@ UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx-mfgtool = "imx"
 
-UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig,sdcard"
-UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig,sdcard"
+UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_MACHINE_NAME}_defconfig"
+UBOOT_CONFIG[sd-optee] = "${UBOOT_CONFIG_MACHINE_NAME}_optee_defconfig"
 UBOOT_CONFIG[sata]     = "${UBOOT_CONFIG_MACHINE_NAME}_sata_defconfig"
 
 # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index df022d635..3f9c2f6a2 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -24,8 +24,8 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6slevk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6slevk_optee_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6slevk_config"
+UBOOT_CONFIG[sd-optee] = "mx6slevk_optee_config"
 UBOOT_CONFIG[epdc]     = "mx6slevk_epdc_config"
 UBOOT_CONFIG[spinor]   = "mx6slevk_spinor_config"
 
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index 58fff6db0..2e93d8f26 100644
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -21,8 +21,8 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6sllevk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6sllevk_optee_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6sllevk_config"
+UBOOT_CONFIG[sd-optee] = "mx6sllevk_optee_config"
 UBOOT_CONFIG[epdc]     = "mx6sllevk_epdc_config"
 
 OPTEE_BIN_EXT:imx6sllevk = "6sllevk"
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index cbb20d567..e4b5a6835 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -19,8 +19,8 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6sxsabreauto_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6sxsabreauto_optee_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6sxsabreauto_config"
+UBOOT_CONFIG[sd-optee] = "mx6sxsabreauto_optee_config"
 UBOOT_CONFIG[qspi1]    = "mx6sxsabreauto_qspi1_config"
 UBOOT_CONFIG[nand]     = "mx6sxsabreauto_nand_config,ubifs"
 
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index d85c7ce74..de4281320 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -32,9 +32,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6sxsabresd_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6sxsabresd_optee_config,sdcard"
-UBOOT_CONFIG[emmc]     = "mx6sxsabresd_emmc_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6sxsabresd_config"
+UBOOT_CONFIG[sd-optee] = "mx6sxsabresd_optee_config"
+UBOOT_CONFIG[emmc]     = "mx6sxsabresd_emmc_config"
 UBOOT_CONFIG[qspi2]    = "mx6sxsabresd_qspi2_config"
 UBOOT_CONFIG[m4fastup] = "mx6sxsabresd_m4fastup_config"
 
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 3bab4f549..35b99c8ce 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -57,9 +57,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6ul_14x14_evk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6ul_14x14_evk_optee_config,sdcard"
-UBOOT_CONFIG[emmc]     = "mx6ul_14x14_evk_emmc_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6ul_14x14_evk_config"
+UBOOT_CONFIG[sd-optee] = "mx6ul_14x14_evk_optee_config"
+UBOOT_CONFIG[emmc]     = "mx6ul_14x14_evk_emmc_config"
 UBOOT_CONFIG[qspi1]    = "mx6ul_14x14_evk_qspi1_config"
 
 OPTEE_BIN_EXT = "6ulevk"
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index 4c1184a79..a9ff8bf10 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -39,9 +39,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6ull_14x14_evk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6ull_14x14_evk_optee_config,sdcard"
-UBOOT_CONFIG[emmc]     = "mx6ull_14x14_evk_emmc_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6ull_14x14_evk_config"
+UBOOT_CONFIG[sd-optee] = "mx6ull_14x14_evk_optee_config"
+UBOOT_CONFIG[emmc]     = "mx6ull_14x14_evk_emmc_config"
 UBOOT_CONFIG[nand]     = "mx6ull_14x14_evk_nand_config,ubifs"
 UBOOT_CONFIG[qspi1]    = "mx6ull_14x14_evk_qspi1_config"
 
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index 572434ae7..25b0d0d06 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -32,9 +32,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx6ulz_14x14_evk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx6ulz_14x14_evk_optee_config,sdcard"
-UBOOT_CONFIG[emmc]     = "mx6ulz_14x14_evk_emmc_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx6ulz_14x14_evk_config"
+UBOOT_CONFIG[sd-optee] = "mx6ulz_14x14_evk_optee_config"
+UBOOT_CONFIG[emmc]     = "mx6ulz_14x14_evk_emmc_config"
 UBOOT_CONFIG[nand]     = "mx6ulz_14x14_evk_nand_config,ubifs"
 UBOOT_CONFIG[qspi1]    = "mx6ulz_14x14_evk_qspi1_config"
 
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 96942ebb2..9f88dc4fd 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -33,9 +33,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx7dsabresd_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx7dsabresd_optee_config,sdcard"
-UBOOT_CONFIG[nonsec]   = "mx7dsabresd_nonsec_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx7dsabresd_config"
+UBOOT_CONFIG[sd-optee] = "mx7dsabresd_optee_config"
+UBOOT_CONFIG[nonsec]   = "mx7dsabresd_nonsec_config"
 UBOOT_CONFIG[qspi1]    = "mx7dsabresd_qspi1_config"
 UBOOT_CONFIG[nand]     = "mx7dsabresd_nand_config,ubifs"
 UBOOT_CONFIG[epdc]     = "mx7dsabresd_epdc_config"
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index b5196e30b..569548d56 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -36,9 +36,9 @@ UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
 "
-UBOOT_CONFIG[sd]       = "mx7ulp_evk_config,sdcard"
-UBOOT_CONFIG[sd-optee] = "mx7ulp_evk_optee_config,sdcard"
-UBOOT_CONFIG[emmc]     = "mx7ulp_evk_emmc_config,sdcard"
+UBOOT_CONFIG[sd]       = "mx7ulp_evk_config"
+UBOOT_CONFIG[sd-optee] = "mx7ulp_evk_optee_config"
+UBOOT_CONFIG[emmc]     = "mx7ulp_evk_emmc_config"
 
 OPTEE_BIN_EXT = "7ulp"
 
diff --git a/conf/machine/imx8mnul-ddr3l-evk.conf b/conf/machine/imx8mnul-ddr3l-evk.conf
index a481c48bc..a71ec3019 100644
--- a/conf/machine/imx8mnul-ddr3l-evk.conf
+++ b/conf/machine/imx8mnul-ddr3l-evk.conf
@@ -34,7 +34,7 @@ UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG_BASENAME      = "imx8mn_ddr3l_evk"
-UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_config,sdcard"
+UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_config"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 
 SPL_BINARY = "spl/u-boot-spl.bin"
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index 796b7b9ef..7b347bf10 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -49,7 +49,7 @@ IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]       = "imx8mq_evk_config,sdcard"
+UBOOT_CONFIG[sd]       = "imx8mq_evk_config"
 
 SPL_BINARY = "spl/u-boot-spl.bin"
 
diff --git a/conf/machine/imx8mq-lpddr4-wevk.conf b/conf/machine/imx8mq-lpddr4-wevk.conf
index 6aa8e0ee7..e66eda2f4 100644
--- a/conf/machine/imx8mq-lpddr4-wevk.conf
+++ b/conf/machine/imx8mq-lpddr4-wevk.conf
@@ -8,7 +8,7 @@ MACHINEOVERRIDES =. "imx8mq-evk:"
 require conf/machine/imx8mq-evk.conf
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "imx8mq_wevk_config,sdcard"
+UBOOT_CONFIG[sd] = "imx8mq_wevk_config"
 
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi"
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index fa4974761..a7e52d54d 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -95,7 +95,7 @@ IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]      = "imx8qm_mek_defconfig,sdcard"
+UBOOT_CONFIG[sd]      = "imx8qm_mek_defconfig"
 UBOOT_CONFIG[fspi]    = "imx8qm_mek_fspi_defconfig"
 
 IMX_BOOT_SEEK = "32"
diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc
index 4f5d12986..50ee85b42 100644
--- a/conf/machine/include/imx8dxl-evk.inc
+++ b/conf/machine/include/imx8dxl-evk.inc
@@ -39,7 +39,7 @@ SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
 
 IMX_BOOT_SEEK = "32"
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 1a8b5b57a..55718acc3 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -33,7 +33,7 @@ UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]       = "${UBOOT_CONFIG_BASENAME}_defconfig"
 
 SPL_BINARY = "spl/u-boot-spl.bin"
 
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 1f108f598..d29446125 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -36,7 +36,7 @@ IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]      = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]      = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[fspi]    = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[ld]      = "${UBOOT_CONFIG_BASENAME}_ld_defconfig"
 
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index f076233b7..79d7bc15e 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -29,7 +29,7 @@ IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 UBOOT_SUFFIX = "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"
 
 SPL_BINARY = "spl/u-boot-spl.bin"
diff --git a/conf/machine/include/imx8ulp-evk.inc b/conf/machine/include/imx8ulp-evk.inc
index 232695306..7a1f2213d 100644
--- a/conf/machine/include/imx8ulp-evk.inc
+++ b/conf/machine/include/imx8ulp-evk.inc
@@ -19,7 +19,7 @@ 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[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[nd]   = "${UBOOT_CONFIG_BASENAME}_nd_defconfig"
 
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index e83085860..ad3422e07 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -44,7 +44,7 @@ SPL_BINARY = \
                                                        '', d)}"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
 
 IMX_BOOT_SEEK = "32"