diff options
author | Samuel Holland <samuel@sholland.org> | 2020-05-08 02:08:10 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-05-15 21:47:35 +0300 |
commit | 3988be5fd4369402c410336553bc0ca1920dbe6f (patch) | |
tree | 65e74e9f00c3258c8a716c616370e9a5d1c0a660 /arch | |
parent | 48069ff84fe5e5e0ad733bef4718e02600b518c4 (diff) | |
download | u-boot-3988be5fd4369402c410336553bc0ca1920dbe6f.tar.xz |
spl: Always define preloader_console_init
A large number of boards call preloader_console_init unconditionally.
Currently, they fail to build with CONFIG_SPL_SERIAL=n, because the
function is undefined in that case. To fix the build, always define
preloader_console_init, but make it no-op when CONFIG_SPL_SERIAL=n.
For the few boards that did check for CONFIG_SPL_SERIAL before calling
preloader_console_init, remove the checks, since the function can now
be called unconditionally.
Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/boot-common.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-uniphier/spl_board_init.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 7538523724..d57382aabe 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -194,10 +194,9 @@ u32 spl_mmc_boot_mode(const u32 boot_device) void spl_board_init(void) { -#ifdef CONFIG_SPL_SERIAL_SUPPORT /* Prepare console output */ preloader_console_init(); -#endif + #if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT) gpmc_init(); #endif diff --git a/arch/arm/mach-uniphier/spl_board_init.c b/arch/arm/mach-uniphier/spl_board_init.c index c7262d70a5..48764a1870 100644 --- a/arch/arm/mach-uniphier/spl_board_init.c +++ b/arch/arm/mach-uniphier/spl_board_init.c @@ -112,9 +112,7 @@ void spl_board_init(void) initdata->early_clk_init(); -#ifdef CONFIG_SPL_SERIAL_SUPPORT preloader_console_init(); -#endif ret = initdata->dpll_init(bd); if (ret) { |