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>
master
Simon Glass 8 years ago committed by Tom Rini
parent f59961e343
commit a807ab3303
  1. 3
      arch/arm/cpu/armv7/omap4/Kconfig
  2. 3
      arch/arm/cpu/armv7/omap5/Kconfig
  3. 9
      common/spl/Kconfig
  4. 1
      include/configs/ti_omap4_common.h
  5. 1
      include/configs/ti_omap5_common.h
  6. 7
      include/spl.h

@ -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

@ -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

@ -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

@ -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))

@ -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))

@ -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 */

Loading…
Cancel
Save