dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

spl: ti: Avoid preloader_console_init if !CONFIG_SPL_SERIAL_SUPPORT

Browse Source 
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>
This commit is contained in:
Alex Kiernan
2018-04-19 04:32:51 +00:00
committed by Tom Rini
parent 30d313688f
commit 117a0e02be
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-omap2/boot-common.c
View File

@@ -196,9 +196,10 @@ u32 spl_boot_mode(const u32 boot_device)
void spl_board_init(void) void spl_board_init(void)
{ {
#ifdef CONFIG_SPL_SERIAL_SUPPORT
/* Prepare console output */ /* Prepare console output */
preloader_console_init(); preloader_console_init();
#endif
#if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT) #if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT)
gpmc_init(); gpmc_init();
#endif #endif

2
common/spl/spl.c
View File

@@ -471,6 +471,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
jump_to_image_no_args(&spl_image); 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 * This requires UART clocks to be enabled. In order for this to work the
* caller must ensure that the gd pointer is valid. * caller must ensure that the gd pointer is valid.
@@ -491,6 +492,7 @@ void preloader_console_init(void)
spl_display_print(); spl_display_print();
#endif #endif
} }
#endif
/** /**
* spl_relocate_stack_gd() - Relocate stack ready for board_init_r() execution * spl_relocate_stack_gd() - Relocate stack ready for board_init_r() execution