[PATCH 050/171] Correct SPL uses of CMD_MMC

Simon Glass
2023-01-30T14:58:43Z

This converts 6 usages of this option to the non-SPL form, since there is
no SPL_CMD_MMC defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
---

include/configs/am62ax_evm.h | 4 ++--
include/configs/imx8mm-cl-iot-gate.h | 2 +-
include/configs/imx8mp_rsb3720.h | 2 +-
include/configs/rockchip-common.h | 2 +-
include/configs/rpi.h | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h
index cdd639b9309..a18b1572b13 100644
--- a/include/configs/am62ax_evm.h
+++ b/include/configs/am62ax_evm.h
@@ -71,12 +71,12 @@
#define BOOTENV_DEV_NAME_TI_MMC(devtyeu, devtypel, instance) \
"ti_mmc "

-#if CONFIG_IS_ENABLED(CMD_MMC)
+#if IS_ENABLED(CONFIG_CMD_MMC)
#define BOOT_TARGET_MMC(func) \
func(TI_MMC, ti_mmc, na)
#else
#define BOOT_TARGET_MMC(func)
-#endif /* CONFIG_IS_ENABLED(CMD_MMC) */
+#endif /* IS_ENABLED(CONFIG_CMD_MMC) */

#define BOOT_TARGET_DEVICES(func) \
BOOT_TARGET_MMC(func)
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 6f34b79e0db..3a666acb736 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -30,7 +30,7 @@
EFI_GUID(0x0bf1165c, 0x1831, 0x4864, 0x94, 0x5e, \
0xac, 0x3d, 0x38, 0x48, 0xf4, 0x99)

-#if CONFIG_IS_ENABLED(CMD_MMC)
+#if IS_ENABLED(CONFIG_CMD_MMC)
# define BOOT_TARGET_MMC(func) \
func(MMC, mmc, 2) \
func(MMC, mmc, 0)
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 86311ee862b..8008631a7c0 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -39,7 +39,7 @@

#endif

-#if CONFIG_IS_ENABLED(CMD_MMC)
+#if IS_ENABLED(CONFIG_CMD_MMC)
# define BOOT_TARGET_MMC(func) \
func(MMC, mmc, 2) \
func(MMC, mmc, 1)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 4b849134d12..6a283dcfe78 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -12,7 +12,7 @@
#ifndef CONFIG_SPL_BUILD

/* First try to boot from SD (index 1), then eMMC (index 0) */
-#if CONFIG_IS_ENABLED(CMD_MMC)
+#if IS_ENABLED(CONFIG_CMD_MMC)
#define BOOT_TARGET_MMC(func) \
func(MMC, mmc, 1) \
func(MMC, mmc, 0)
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index ffbf4347658..9e63fe9ca96 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -122,7 +122,7 @@
"fdt_addr_r=0x02600000\0" \
"ramdisk_addr_r=0x02700000\0"

-#if CONFIG_IS_ENABLED(CMD_MMC)
+#if IS_ENABLED(CONFIG_CMD_MMC)
#define BOOT_TARGET_MMC(func) \
func(MMC, mmc, 0) \
func(MMC, mmc, 1) \
--
2.39.1.456.gfc5497dd1b-goog