summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorChris Webb <chris@arachsys.com>2019-07-19 14:23:11 +0100
committerKever Yang <kever.yang@rock-chips.com>2019-07-22 21:52:59 +0800
commit58fcb03e671fbe847a0007171d4d54dad5af8139 (patch)
tree4e6db38dc17173dfc66ee4eb0340199df987803e /arch/arm
parent4dcdc5c159f595e27cbaae55569d514bb692d739 (diff)
rockchip: Fix TPL build without CONFIG_TPL_SERIAL_SUPPORT
If CONFIG_DEBUG_UART is set but CONFIG_TPL_SERIAL_SUPPORT is not, the serial output should be available in SPL and full U-Boot, but not built in TPL. However, the rockchip tpl.c instead fails to compile with undefined references to the debug UART. Instead, initialise the debug UART and print the TPL banner only if both CONFIG_DEBUG_UART and CONFIG_TPL_SERIAL_SUPPORT are set. Signed-off-by: <chris@arachsys.com> Reviewed-by: Kever Yang <Kever.yang@rock-chips.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-rockchip/tpl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index 0ff2a197ed..5df88bddeb 100644
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -44,7 +44,7 @@ void board_init_f(ulong dummy)
struct udevice *dev;
int ret;
-#ifdef CONFIG_DEBUG_UART
+#if defined(CONFIG_DEBUG_UART) && defined(CONFIG_TPL_SERIAL_SUPPORT)
/*
* Debug UART can be used from here if required:
*