All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Cc: Marek Vasut <marex@denx.de>, Simon Glass <sjg@chromium.org>
Subject: [PATCH 2/3] bootstage: Fix up remaining bootstage config misuse
Date: Wed,  3 Nov 2021 15:20:29 +0100	[thread overview]
Message-ID: <20211103142030.14752-2-marex@denx.de> (raw)
In-Reply-To: <20211103142030.14752-1-marex@denx.de>

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 <marex@denx.de>
Cc: Simon Glass <sjg@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


  reply	other threads:[~2021-11-03 14:20 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-03 14:20 [PATCH 1/3] bootstage: Update SPL support Kconfig description Marek Vasut
2021-11-03 14:20 ` Marek Vasut [this message]
2021-11-05  2:02   ` [PATCH 2/3] bootstage: Fix up remaining bootstage config misuse Simon Glass
2021-11-13 21:32     ` Simon Glass
2021-11-03 14:20 ` [PATCH 3/3] bootstage: Enable SPL bootstage in sandbox_spl config Marek Vasut
2021-11-05  2:02   ` Simon Glass
2021-12-19 23:21     ` Marek Vasut
2021-11-05  2:02 ` [PATCH 1/3] bootstage: Update SPL support Kconfig description Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211103142030.14752-2-marex@denx.de \
    --to=marex@denx.de \
    --cc=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.