summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2023-02-05 15:36:46 -0700
committerTom Rini <trini@konsulko.com>2023-02-09 16:32:26 -0500
commit93bb62abaf0bdc5003a7dc40f266db29ff0b9b13 (patch)
treeff2a43bdb92ad496f642b7f25f4c99fbf8e95d15 /include
parentb15a4af8105e2a6355333e139d827be558017ae0 (diff)
downloadu-boot-93bb62abaf0bdc5003a7dc40f266db29ff0b9b13.tar.gz
u-boot-93bb62abaf0bdc5003a7dc40f266db29ff0b9b13.tar.bz2
u-boot-93bb62abaf0bdc5003a7dc40f266db29ff0b9b13.zip
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/am335x_evm.h2
-rw-r--r--include/configs/apple.h2
-rw-r--r--include/configs/imx8mm-cl-iot-gate.h2
-rw-r--r--include/configs/iot2050.h2
-rw-r--r--include/configs/rockchip-common.h2
-rw-r--r--include/configs/rpi.h2
-rw-r--r--include/configs/tegra-common-post.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 1f473b5a15..5b47778517 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 ee6e1169b3..0576bc04c9 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 1bb9a918e7..09d87cf214 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 7d08741336..cfff46ce33 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/rockchip-common.h b/include/configs/rockchip-common.h
index e0d38ccc1a..ff8123dabd 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 7c306cb568..4da982f735 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 0fdb5a8160..991ffbb7df 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)