[PATCH 055/171] Correct SPL uses of CMD_PXE

Simon Glass
2023-01-30T15:02:36Z

This converts 6 usages of this option to the non-SPL form, since there is
no SPL_CMD_PXE 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/rockchip-common.h | 2 +-
include/configs/rpi.h | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 60006173c0c..d66614598a1 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -53,7 +53,7 @@
# define BOOT_TARGET_USB(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_PXE)
+#if IS_ENABLED(CONFIG_CMD_PXE)
# define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
#else
# define BOOT_TARGET_PXE(func)
diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 3a666acb736..c6d7cfbcbcd 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -44,7 +44,7 @@
# define BOOT_TARGET_USB(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_PXE)
+#if IS_ENABLED(CONFIG_CMD_PXE)
# define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
#else
# define BOOT_TARGET_PXE(func)
diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index 8008631a7c0..6ebdeb0f11b 100644
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -47,7 +47,7 @@
# define BOOT_TARGET_MMC(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_PXE)
+#if IS_ENABLED(CONFIG_CMD_PXE)
# define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
#else
# define BOOT_TARGET_PXE(func)
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index f72b31e1d63..cda2fcea0ab 100644
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -149,7 +149,7 @@
DFU_ALT_INFO_RAM \
DFU_ALT_INFO_OSPI

-#if CONFIG_IS_ENABLED(CMD_PXE)
+#if IS_ENABLED(CONFIG_CMD_PXE)
# define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
#else
# define BOOT_TARGET_PXE(func)
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 2e1325fc816..332338a876d 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -38,7 +38,7 @@
#define BOOT_TARGET_USB(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_PXE)
+#if IS_ENABLED(CONFIG_CMD_PXE)
#define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
#else
#define BOOT_TARGET_PXE(func)
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 9e63fe9ca96..2593edcf96b 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -137,7 +137,7 @@
#define BOOT_TARGET_USB(func)
#endif

-#if CONFIG_IS_ENABLED(CMD_PXE)
+#if IS_ENABLED(CONFIG_CMD_PXE)
#define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
#else
#define BOOT_TARGET_PXE(func)
--
2.39.1.456.gfc5497dd1b-goog