[PATCH 062/171] Correct SPL uses of CMD_USB

Simon Glass
2023-01-30T15:26:46Z

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

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

include/configs/am335x_evm.h | 2 +-
include/configs/apple.h | 2 +-
include/configs/imx8mm-cl-iot-gate.h | 2 +-
include/configs/iot2050.h | 2 +-
include/configs/qemu-arm.h | 2 +-
include/configs/rockchip-common.h | 2 +-
include/configs/rpi.h | 2 +-
include/configs/tegra-common-post.h | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index d66614598a1..cef19090f68 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -47,7 +47,7 @@
#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
#devtypel #instance " "

-#if CONFIG_IS_ENABLED(CMD_USB)
+#if IS_ENABLED(CONFIG_CMD_USB)
# define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else
# define BOOT_TARGET_USB(func)
diff --git a/include/configs/apple.h b/include/configs/apple.h
index ee6e1169b3b..0576bc04c94 100644
--- a/include/configs/apple.h
+++ b/include/configs/apple.h
@@ -15,7 +15,7 @@
#define BOOT_TARGET_NVME(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_USB)
+#if IS_ENABLED(CONFIG_CMD_USB)
#define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else
#define BOOT_TARGET_USB(func)
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index c6d7cfbcbcd..44e45e7791d 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -38,7 +38,7 @@
# define BOOT_TARGET_MMC(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_USB)
+#if IS_ENABLED(CONFIG_CMD_USB)
# define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else
# define BOOT_TARGET_USB(func)
diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h
index 7d087413362..cfff46ce339 100644
--- a/include/configs/iot2050.h
+++ b/include/configs/iot2050.h
@@ -19,7 +19,7 @@
#define EXTRA_ENV_IOT2050_BOARD_SETTINGS \
"usb_pgood_delay=900\0"

-#if CONFIG_IS_ENABLED(CMD_USB)
+#if IS_ENABLED(CONFIG_CMD_USB)
# define BOOT_TARGET_USB(func) \
func(USB, usb, 0) \
func(USB, usb, 1) \
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index 23fba23ce0a..60ac5489ac1 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -36,7 +36,7 @@

/* Environment options */

-#if CONFIG_IS_ENABLED(CMD_USB)
+#if IS_ENABLED(CONFIG_CMD_USB)
# define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else
# define BOOT_TARGET_USB(func)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 96deb4b3b6c..37321f964fb 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -32,7 +32,7 @@
#define BOOT_TARGET_SCSI(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_USB)
+#if IS_ENABLED(CONFIG_CMD_USB)
#define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else
#define BOOT_TARGET_USB(func)
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 2593edcf96b..032d228f477 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -131,7 +131,7 @@
#define BOOT_TARGET_MMC(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_USB)
+#if IS_ENABLED(CONFIG_CMD_USB)
#define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else
#define BOOT_TARGET_USB(func)
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index 0fdb5a81605..991ffbb7dff 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -7,7 +7,7 @@
#ifndef __TEGRA_COMMON_POST_H
#define __TEGRA_COMMON_POST_H

-#if CONFIG_IS_ENABLED(CMD_USB)
+#if IS_ENABLED(CONFIG_CMD_USB)
# define BOOT_TARGET_USB(func) func(USB, usb, 0)
#else
# define BOOT_TARGET_USB(func)
--
2.39.1.456.gfc5497dd1b-goog