[PATCH 085/171] Correct SPL uses of FASTBOOT

Simon Glass sjg at chromium.org
Mon Jan 30 15:41:58 CET 2023


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

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

 arch/arm/mach-rockchip/board.c | 2 +-
 board/ti/am57xx/board.c        | 2 +-
 board/ti/dra7xx/evm.c          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 6e05a8f76ef..ebffb6c3ff0 100644
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -306,7 +306,7 @@ int board_usb_init(int index, enum usb_init_type init)
 
 #endif /* CONFIG_USB_GADGET */
 
-#if CONFIG_IS_ENABLED(FASTBOOT)
+#if IS_ENABLED(CONFIG_FASTBOOT)
 int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
 {
 	if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 0e57ee566b3..9ea507a8e96 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -1172,7 +1172,7 @@ int board_fit_config_name_match(const char *name)
 }
 #endif
 
-#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
+#if IS_ENABLED(CONFIG_FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
 int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
 {
 	if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 568c8fb0411..a8a216d034a 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -1049,7 +1049,7 @@ int board_fit_config_name_match(const char *name)
 }
 #endif
 
-#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
+#if IS_ENABLED(CONFIG_FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
 int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
 {
 	if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
-- 
2.39.1.456.gfc5497dd1b-goog



More information about the U-Boot mailing list