Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit a807ab33035fe2e9b63aac2e7475525ca8d90adc

Authored by Simon Glass
Committed by Tom Rini
1 parent f59961e343
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 6 changed files with 22 additions and 2 deletions Side-by-side Diff

arch/arm/cpu/armv7/omap4/Kconfig
Diff comments   View file @ a807ab3
... ... @@ -33,6 +33,9 @@
33 33 config SPL_SERIAL_SUPPORT
34 34 default y
35 35  
  36 +config SPL_DISPLAY_PRINT
  37 + default y
  38 +
36 39 choice
37 40 prompt "OMAP4 board select"
38 41 optional
arch/arm/cpu/armv7/omap5/Kconfig
Diff comments   View file @ a807ab3
... ... @@ -33,6 +33,9 @@
33 33 config SPL_SERIAL_SUPPORT
34 34 default y
35 35  
  36 +config SPL_DISPLAY_PRINT
  37 + default y
  38 +
36 39 choice
37 40 prompt "OMAP5 board select"
38 41 optional
... ... @@ -61,6 +61,15 @@
61 61 location is used. Normally we put the device tree at the end of BSS
62 62 but with this option enabled, it goes at _image_binary_end.
63 63  
  64 +config SPL_DISPLAY_PRINT
  65 + depends on SPL
  66 + bool "Display a board-specific message in SPL"
  67 + help
  68 + If this option is enabled, U-Boot will call the function
  69 + spl_display_print() immediately after displaying the SPL console
  70 + banner ("U-Boot SPL ..."). This function should be provided by
  71 + the board.
  72 +
64 73 config TPL
65 74 bool
66 75 depends on SPL && SUPPORT_TPL
include/configs/ti_omap4_common.h
Diff comments   View file @ a807ab3
... ... @@ -151,7 +151,6 @@
151 151 * So moving TEXT_BASE down to non-HS limit.
152 152 */
153 153 #define CONFIG_SPL_TEXT_BASE 0x40300000
154   -#define CONFIG_SPL_DISPLAY_PRINT
155 154 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
156 155 #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \
157 156 (128 << 20))
include/configs/ti_omap5_common.h
Diff comments   View file @ a807ab3
... ... @@ -160,7 +160,6 @@
160 160 #define CONFIG_SPL_TEXT_BASE 0x40300000
161 161 #endif
162 162  
163   -#define CONFIG_SPL_DISPLAY_PRINT
164 163 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
165 164 #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \
166 165 (128 << 20))
... ... @@ -122,6 +122,13 @@
122 122 */
123 123 int spl_start_uboot(void);
124 124  
  125 +/**
  126 + * spl_display_print() - Display a board-specific message in SPL
  127 + *
  128 + * If CONFIG_SPL_DISPLAY_PRINT is enabled, U-Boot will call this function
  129 + * immediately after displaying the SPL console banner ("U-Boot SPL ...").
  130 + * This function should be provided by the board.
  131 + */
125 132 void spl_display_print(void);
126 133  
127 134 /* NAND SPL functions */