bootstage: Add SPL support

Allow usage of the bootstage facilities in SPL.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 01dece5769c875403fd1719293064ddca3cf64a5..86f53e78d24379f7dd524bd28fb893d8d871f51b 100644 (file)
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -178,7 +178,7 @@ int default_print_cpuinfo(void)
        return 0;
 }
 
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
 void show_boot_progress(int val)
 {
        outb(val, POST_PORT);

diff --git a/board/siemens/iot2050/board.c b/board/siemens/iot2050/board.c
index b2110978ae053353c2abcf9e8696dfe1f245feb0..16ae2ffc174538ac0d19a7aee6509b207f54c9b6 100644 (file)
--- a/board/siemens/iot2050/board.c
+++ b/board/siemens/iot2050/board.c
@@ -250,7 +250,7 @@ void spl_board_init(void)
 {
 }
 
-#if CONFIG_IS_ENABLED(LED) && CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(LED) && CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
 /*
  * Indicate any error or (accidental?) entering of CLI via the red status LED.
  */

diff --git a/common/Kconfig.boot b/common/Kconfig.boot
index c948d58094c7e995b21d6ffff375afd02e2fb7b2..a8d4be23a9752626917db707d2dad1256df31431 100644 (file)
--- a/common/Kconfig.boot
+++ b/common/Kconfig.boot
@@ -703,6 +703,15 @@ config SHOW_BOOT_PROGRESS
          -150  common/cmd_nand.c       Incorrect FIT image format
          151   common/cmd_nand.c       FIT image format OK
 
+config SPL_SHOW_BOOT_PROGRESS
+       bool "Show boot progress in a board-specific manner"
+       depends on SPL
+       help
+         Defining this option allows to add some board-specific code (calling
+         a user-provided function show_boot_progress(int) that enables you to
+         show the system's boot progress on some display (for example, some
+         LEDs) on your board. For details see SHOW_BOOT_PROGRESS.
+
 endmenu
 
 menu "Boot media"

diff --git a/common/init/board_init.c b/common/init/board_init.c
index 0965b96fa3ad64a71c386feea03e9816618ab149..eab5ee139536afee605c77506f3748f70b422d22 100644 (file)
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -166,7 +166,7 @@ void board_init_f_init_reserve(ulong base)
                board_init_f_init_stack_protection();
 }
 
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
 /*
  * Board-specific Platform code can reimplement show_boot_progress () if needed
  */

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 0c08da06e8f628c6171bd3b029a07f6b018bec07..99cde6609cf40cef296a76c4165beccedbdc0436 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -61,7 +61,7 @@ binman_sym_declare(ulong, spl, size);
 /* Define board data structure */
 static struct bd_info bdata __attribute__ ((section(".data")));
 
-#if CONFIG_IS_ENABLED(BOOTSTAGE)
+#if CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
 /*
  * Board-specific Platform code can reimplement show_boot_progress () if needed
  */

diff --git a/include/bootstage.h b/include/bootstage.h
index f837a387c8c75fa4df4968c6557f511720f734e8..8d1989ac0e5364e8b3eefc62e2e0d3562745d233 100644 (file)
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -220,7 +220,7 @@ enum bootstage_id {
  */
 ulong timer_get_boot_us(void);
 
-#if defined(USE_HOSTCC) || !CONFIG_IS_ENABLED(BOOTSTAGE)
+#if defined(USE_HOSTCC) || !CONFIG_IS_ENABLED(SHOW_BOOT_PROGRESS)
 #define show_boot_progress(val) do {} while (0)
 #else
 /**