Correct SPL uses of CMD_USB

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>

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 1f473b5a15005636a397d63d0811ed26f8e0da7a..5b4777851742ffbb0ffa1c5f276b22d49070442b 100644 (file)
--- 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 ee6e1169b3b58e05be595b987c1030cc0cdb7aa0..0576bc04c94807370369f2ca89b36628715b30b3 100644 (file)
--- 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 1bb9a918e7d0c49c4599aac403e865bb466e58e4..09d87cf214bf3e9e427ca34335044328aa3551f3 100644 (file)
--- 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 7d087413362ce9978d1e4f38dfc16eab299ac6aa..cfff46ce339897425b6d9a854307cdb79a02a206 100644 (file)
--- 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/rockchip-common.h b/include/configs/rockchip-common.h
index e0d38ccc1aac41fb8c072eb7eb9d30d6bddddf83..ff8123dabd69c4a414b33e2e40f473b9e35c7cbd 100644 (file)
--- 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 7c306cb5680c4c12e5aee5af8768b07a9b3067c3..4da982f73578e94a224b2b4f6961120ebd662504 100644 (file)
--- 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 0fdb5a81605d180dfef9429327ac2b22254a2ef7..991ffbb7dff0827c17fe1998025c0d98f32c4a2a 100644 (file)
--- 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)