| Message ID | 1524112377-13724-3-git-send-email-alex.kiernan@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Fix SPL build without CONFIG_SPL_SERIAL_SUPPORT | expand |
On Thu, Apr 19, 2018 at 04:32:51AM +0000, Alex Kiernan wrote: > If CONFIG_SPL_SERIAL_SUPPORT is disabled then the build fails because > serial_init is undefined. Guard preloader_console_init() appropriately > to fix this. > > Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index db68a9d..f9ab5da 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -196,9 +196,10 @@ u32 spl_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/common/spl/spl.c b/common/spl/spl.c index 61d3071..794dbd0 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -471,6 +471,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) jump_to_image_no_args(&spl_image); } +#ifdef CONFIG_SPL_SERIAL_SUPPORT /* * This requires UART clocks to be enabled. In order for this to work the * caller must ensure that the gd pointer is valid. @@ -491,6 +492,7 @@ void preloader_console_init(void) spl_display_print(); #endif } +#endif /** * spl_relocate_stack_gd() - Relocate stack ready for board_init_r() execution
If CONFIG_SPL_SERIAL_SUPPORT is disabled then the build fails because serial_init is undefined. Guard preloader_console_init() appropriately to fix this. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- Changes in v2: None arch/arm/mach-omap2/boot-common.c | 3 ++- common/spl/spl.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)