From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Thu, 19 Apr 2018 04:32:53 +0000 (+0000)
Subject: spl: ti: Avoid serial calls when serial support is disabled
X-Git-Tag: v2018.05-rc3~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d4bb3b376223c72b49c3a2bdcce896557d997e6b;p=oweals%2Fu-boot.git

spl: ti: Avoid serial calls when serial support is disabled

If CONFIG_SPL_SERIAL_SUPPORT is not set, then the build will fail:

board/ti/am335x/built-in.o: In function `spl_start_uboot':
board/ti/am335x/board.c:247: undefined reference to `serial_tstc'
board/ti/am335x/board.c:247: undefined reference to `serial_getc'

Avoid the calls to the serial functions in that case.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index c33bf58ddc..896b9b63bb 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -243,9 +243,11 @@ static struct emif_regs ddr3_icev2_emif_reg_data = {
 #ifdef CONFIG_SPL_OS_BOOT
 int spl_start_uboot(void)
 {
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
 	/* break into full u-boot on 'c' */
 	if (serial_tstc() && serial_getc() == 'c')
 		return 1;
+#endif
 
 #ifdef CONFIG_SPL_ENV_SUPPORT
 	env_init();