aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2018-04-19 04:32:51 +0000
committerTom Rini <trini@konsulko.com>2018-04-28 18:32:22 -0400
commit117a0e02bed75defbe02d23b13dbe0ae12a27d94 (patch)
tree6ef1250f1c6395ee5b74e6e745705637d3aaa542
parent30d313688f7aa722a420a4d6a5ef02573178355b (diff)
downloadu-boot-117a0e02bed75defbe02d23b13dbe0ae12a27d94.zip
u-boot-117a0e02bed75defbe02d23b13dbe0ae12a27d94.tar.gz
u-boot-117a0e02bed75defbe02d23b13dbe0ae12a27d94.tar.bz2
spl: ti: Avoid preloader_console_init if !CONFIG_SPL_SERIAL_SUPPORT
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>
-rw-r--r--arch/arm/mach-omap2/boot-common.c3
-rw-r--r--common/spl/spl.c2
2 files changed, 4 insertions, 1 deletions
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