[PATCH 043/171] Correct SPL uses of CMD_DHCP

Simon Glass
2023-01-30T14:56:42Z

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

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

include/configs/am335x_evm.h | 2 +-
include/configs/imx8mm-cl-iot-gate.h | 2 +-
include/configs/imx8mp_rsb3720.h | 2 +-
include/configs/j721e_evm.h | 2 +-
include/configs/qemu-arm.h | 2 +-
include/configs/rockchip-common.h | 2 +-
include/configs/rpi.h | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 1f473b5a150..60006173c0c 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -59,7 +59,7 @@
# define BOOT_TARGET_PXE(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_DHCP)
+#if IS_ENABLED(CONFIG_CMD_DHCP)
# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
#else
# define BOOT_TARGET_DHCP(func)
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 2641d7bc960..6f34b79e0db 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -50,7 +50,7 @@
# define BOOT_TARGET_PXE(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_DHCP)
+#if IS_ENABLED(CONFIG_CMD_DHCP)
# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
#else
# define BOOT_TARGET_DHCP(func)
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index d4ab6a6207d..86311ee862b 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -53,7 +53,7 @@
# define BOOT_TARGET_PXE(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_DHCP)
+#if IS_ENABLED(CONFIG_CMD_DHCP)
# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
#else
# define BOOT_TARGET_DHCP(func)
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index a7210b5cf3a..f72b31e1d63 100644
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -155,7 +155,7 @@
# define BOOT_TARGET_PXE(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_DHCP)
+#if IS_ENABLED(CONFIG_CMD_DHCP)
# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
#else
# define BOOT_TARGET_DHCP(func)
diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index 45bd94ee5c7..8289e338f6a 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -60,7 +60,7 @@
# define BOOT_TARGET_NVME(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_DHCP)
+#if IS_ENABLED(CONFIG_CMD_DHCP)
# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
#else
# define BOOT_TARGET_DHCP(func)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 0b23e4c0433..4b849134d12 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -44,7 +44,7 @@
#define BOOT_TARGET_PXE(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_DHCP)
+#if IS_ENABLED(CONFIG_CMD_DHCP)
#define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
#else
#define BOOT_TARGET_DHCP(func)
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index c3f8e7bf85c..ffbf4347658 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -143,7 +143,7 @@
#define BOOT_TARGET_PXE(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_DHCP)
+#if IS_ENABLED(CONFIG_CMD_DHCP)
#define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
#else
#define BOOT_TARGET_DHCP(func)
--
2.39.1.456.gfc5497dd1b-goog