From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 06/27] spl: Kconfig: Move SPL_DISPLAY_PRINT to Kconfig
Date: Sun, 18 Sep 2016 13:44:55 -0600 [thread overview]
Message-ID: <1474227917-9256-7-git-send-email-sjg@chromium.org> (raw)
In-Reply-To: <1474227917-9256-1-git-send-email-sjg@chromium.org>
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>
---
arch/arm/cpu/armv7/omap4/Kconfig | 3 +++
arch/arm/cpu/armv7/omap5/Kconfig | 3 +++
common/spl/Kconfig | 9 +++++++++
include/configs/ti_omap4_common.h | 1 -
include/configs/ti_omap5_common.h | 1 -
include/spl.h | 7 +++++++
6 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap4/Kconfig b/arch/arm/cpu/armv7/omap4/Kconfig
index c3dc95f..2091dd7 100644
--- 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 ef68c53..caa420a 100644
--- 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 2a8ddbc..84670b1 100644
--- 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 4115c78..8502c8a 100644
--- 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 cbdf0bc..5623a37 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -154,7 +154,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 742e6c2..b6990b4 100644
--- 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 */
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-09-18 19:44 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-18 19:44 [U-Boot] [PATCH 00/27] spl: Use linker list and parameters for SPL image loading Simon Glass
2016-09-18 19:44 ` [U-Boot] [PATCH 01/27] spl: Move spl_board_load_image() into a generic header Simon Glass
2016-09-18 22:14 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 02/27] spl: Add a parameter to spl_set_header_raw_uboot() Simon Glass
2016-09-18 22:14 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 03/27] spl: Add a parameter to spl_parse_image_header() Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 04/27] spl: Add a parameter to jump_to_image_linux() Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 05/27] spl: Add function comments to spl_start_uboot() Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-18 19:44 ` Simon Glass [this message]
2016-09-18 22:15 ` [U-Boot] [PATCH 06/27] spl: Kconfig: Move SPL_DISPLAY_PRINT to Kconfig Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 07/27] spl: Convert boot_device into a struct Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-18 19:44 ` [U-Boot] [PATCH 08/27] spl: Add a way to declare an SPL image loader Simon Glass
2016-09-18 22:15 ` Tom Rini
2016-09-19 3:22 ` Simon Glass
2016-09-18 19:44 ` [U-Boot] [PATCH 09/27] spl: Convert spl_ram_load_image() to use linker list Simon Glass
2016-09-18 19:44 ` [U-Boot] [PATCH 10/27] spl: Convert spl_mmc_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 11/27] spl: Convert spl_ubi_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 12/27] spl: Convert spl_nand_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 13/27] spl: Convert spl_onenand_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 14/27] spl: Convert spl_nor_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 15/27] spl: Convert spl_ymodem_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 16/27] spl: Convert spl_usb_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 17/27] spl: Convert spl_sata_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 18/27] spl: spi: Move the generic SPI loader into common/spl Simon Glass
2016-09-19 0:30 ` Tom Rini
2016-09-18 19:45 ` [U-Boot] [PATCH 19/27] spl: Convert spl_spi_load_image() to use linker list Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 20/27] spi: Move freescale-specific code into a private header Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 21/27] spl: Convert spl_net_load_image() to use linker list Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 22/27] spl: Convert spl_board_load_image() " Simon Glass
2016-09-18 19:45 ` [U-Boot] [PATCH 23/27] spl: Pass spl_image as a parameter to load_image() methods Simon Glass
2016-09-19 0:30 ` Tom Rini
2016-09-18 19:45 ` [U-Boot] [PATCH 24/27] spl: Update ext functions to take an spl_image parameter Simon Glass
2016-09-19 0:30 ` Tom Rini
2016-09-18 19:45 ` [U-Boot] [PATCH 25/27] spl: Update fat " Simon Glass
2016-09-19 0:30 ` Tom Rini
2016-09-18 19:45 ` [U-Boot] [PATCH 26/27] spl: Update spl_load_simple_fit() to take an spl_image param Simon Glass
2016-09-19 0:31 ` Tom Rini
2016-09-18 19:45 ` [U-Boot] [PATCH 27/27] spl: Make spl_boot_list a local variable Simon Glass
2016-09-19 0:31 ` Tom Rini
2016-09-18 22:14 ` [U-Boot] [PATCH 00/27] spl: Use linker list and parameters for SPL image loading Tom Rini
2016-09-19 0:57 ` Simon Glass
2016-09-19 21:46 ` Tom Rini
2016-09-19 3:18 ` 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=1474227917-9256-7-git-send-email-sjg@chromium.org \
--to=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox