All these macros really guard show_boot_progress() function, which
is used only if BOOT_PROGRESS is enabled in Kconfig. Fix up the
macro guards.
Signed-off-by: Marek Vasut <ma...@denx.de>
Cc: Simon Glass <s...@chromium.org>
---
board/Seagate/dockstar/dockstar.c | 2 +-
board/Seagate/goflexhome/goflexhome.c | 2 +-
board/bosch/shc/board.c | 2 +-
board/buffalo/lsxl/lsxl.c | 2 +-
board/k+p/kp_imx53/kp_imx53.c | 2 +-
board/st/stv0991/stv0991.c | 2 +-
include/bootstage.h | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/board/Seagate/dockstar/dockstar.c
b/board/Seagate/dockstar/dockstar.c
index fb691931580..819fc685565 100644
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -140,7 +140,7 @@ void reset_phy(void)
}
#endif /* CONFIG_RESET_PHY_R */
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
#define GREEN_LED (1 << 14)
#define ORANGE_LED (1 << 15)
#define BOTH_LEDS (GREEN_LED | ORANGE_LED)
diff --git a/board/Seagate/goflexhome/goflexhome.c
b/board/Seagate/goflexhome/goflexhome.c
index 52be64fb8c2..e99335d5339 100644
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -175,7 +175,7 @@ void reset_phy(void)
}
#endif /* CONFIG_RESET_PHY_R */
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
#define GREEN_LED (1 << 14)
#define ORANGE_LED (1 << 15)
#define BOTH_LEDS (GREEN_LED | ORANGE_LED)
diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index a7a9775fdf4..33edf412871 100644
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -480,7 +480,7 @@ int board_eth_init(struct bd_info *bis)
}
#endif
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
static void bosch_check_reset_pin(void)
{
if (readl(GPIO1_BASE + OMAP_GPIO_IRQSTATUS_SET_0) & RESET_MASK) {
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index 738b6bc25ce..3544a779968 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -271,7 +271,7 @@ int misc_init_r(void)
}
#endif
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
void show_boot_progress(int progress)
{
if (progress > 0)
diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c
index 7c3a695cb25..81f1191633e 100644
--- a/board/k+p/kp_imx53/kp_imx53.c
+++ b/board/k+p/kp_imx53/kp_imx53.c
@@ -155,7 +155,7 @@ int board_late_init(void)
return ret;
}
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
#define GPIO_DR 0x0
#define GPIO_GDIR 0x4
#define GPIO_ALT1 0x1
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index 57ca9f659c1..7f1b31b654e 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -37,7 +37,7 @@ U_BOOT_DRVINFO(stv09911_serials) = {
};
#endif
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
void show_boot_progress(int progress)
{
printf("%i\n", progress);
diff --git a/include/bootstage.h b/include/bootstage.h
index 8d1989ac0e5..63d338c932e 100644
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -233,7 +233,7 @@ void show_boot_progress(int val);
#endif
#if !defined(USE_HOSTCC)
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
#define ENABLE_BOOTSTAGE
#endif
#endif
--
2.33.0
