spl: Kconfig: Move SPL_DISPLAY_PRINT to Kconfig

Move this option to Kconfig and tidy up existing uses. Also add a function
comment to the header file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/armv7/omap4/Kconfig b/arch/arm/cpu/armv7/omap4/Kconfig
index c3dc95fab0d5aaf176c0e0c2dae80ad54ca97bca..2091dd78151239517c0e88ce995c9a9f8b00c4f1 100644 (file)
--- a/arch/arm/cpu/armv7/omap4/Kconfig
+++ b/arch/arm/cpu/armv7/omap4/Kconfig
@@ -33,6 +33,9 @@ config SPL_POWER_SUPPORT
 config SPL_SERIAL_SUPPORT
        default y
 
+config SPL_DISPLAY_PRINT
+       default y
+
 choice
        prompt "OMAP4 board select"
        optional

diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig
index a947ba4d98c735c6daecc355a14709d2fb28f5cf..22259dcc5cf749b8746a81c2d827dcc4c17e179b 100644 (file)
--- a/arch/arm/cpu/armv7/omap5/Kconfig
+++ b/arch/arm/cpu/armv7/omap5/Kconfig
@@ -33,6 +33,9 @@ config SPL_POWER_SUPPORT
 config SPL_SERIAL_SUPPORT
        default y
 
+config SPL_DISPLAY_PRINT
+       default y
+
 choice
        prompt "OMAP5 board select"
        optional

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 2a8ddbc76b9f0208bbd0cbdb93640412af8e4e53..84670b1c596b206d04c74e8485d9cc2db0ac580c 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -61,6 +61,15 @@ config SPL_SEPARATE_BSS
          location is used. Normally we put the device tree at the end of BSS
          but with this option enabled, it goes at _image_binary_end.
 
+config SPL_DISPLAY_PRINT
+       depends on SPL
+       bool "Display a board-specific message in SPL"
+       help
+         If this option is enabled, U-Boot will call the function
+         spl_display_print() immediately after displaying the SPL console
+         banner ("U-Boot SPL ..."). This function should be provided by
+         the board.
+
 config TPL
        bool
        depends on SPL && SUPPORT_TPL

diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 4115c78e94a8c89cf05083356ec2b710395d3185..8502c8ac7f5d8c806618f91217347a45099bc688 100644 (file)
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -151,7 +151,6 @@
  * So moving TEXT_BASE down to non-HS limit.
  */
 #define CONFIG_SPL_TEXT_BASE           0x40300000
-#define CONFIG_SPL_DISPLAY_PRINT
 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
 #define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
                                         (128 << 20))

diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index a483850d190763d62b2678add9bb2e96d33decb2..9229599b6708a41f1ec1fd198c5f871cbed341b7 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -160,7 +160,6 @@
 #define CONFIG_SPL_TEXT_BASE   0x40300000
 #endif
 
-#define CONFIG_SPL_DISPLAY_PRINT
 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
 #define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
                                         (128 << 20))

diff --git a/include/spl.h b/include/spl.h
index 16f1ef449c1e5d4401f607b911070aa59d962c7d..f7009553b9884d1c07512842c89af272578bb413 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -122,6 +122,13 @@ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image,
  */
 int spl_start_uboot(void);
 
+/**
+ * spl_display_print() - Display a board-specific message in SPL
+ *
+ * If CONFIG_SPL_DISPLAY_PRINT is enabled, U-Boot will call this function
+ * immediately after displaying the SPL console banner ("U-Boot SPL ...").
+ * This function should be provided by the board.
+ */
 void spl_display_print(void);
 
 /* NAND SPL functions */