summaryrefslogtreecommitdiff
path: root/drivers/serial
diff options
context:
space:
mode:
authorChen Baozi <chenbaozi@phytium.com.cn>2021-07-21 09:11:26 +0300
committerTom Rini <trini@konsulko.com>2021-07-24 15:57:53 +0300
commit91a043896dfb8544db00496bee08bcf59e449dc9 (patch)
treee84e326d3b8553b10bc3e6b9df655a8b17d06429 /drivers/serial
parentbc7b38450baa4efe71bb14ea8aab9e8d206073fd (diff)
downloadu-boot-91a043896dfb8544db00496bee08bcf59e449dc9.tar.xz
serial: pl011: Enable DEBUG_UART_PL011 in SPL
Commit b81406db51a6 ("arm: serial: Add debug UART capability to the pl01x driver") add supports to use pl01x as a debug UART. However, due to CONFIG_IS_ENABLED macro requires CONFIG_SPL_* prefix, the _debug_uart_init() would not choose TYPE_PL011 in SPL build. This patch fixes the bug by judging CONFIG_DEBUG_UART_PL011 explicitly. Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/serial_pl01x.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 8ff19acf33..67caa063c9 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -404,8 +404,12 @@ static void _debug_uart_init(void)
{
#ifndef CONFIG_DEBUG_UART_SKIP_INIT
struct pl01x_regs *regs = (struct pl01x_regs *)CONFIG_DEBUG_UART_BASE;
- enum pl01x_type type = CONFIG_IS_ENABLED(DEBUG_UART_PL011) ?
- TYPE_PL011 : TYPE_PL010;
+ enum pl01x_type type;
+
+ if (IS_ENABLED(CONFIG_DEBUG_UART_PL011))
+ type = TYPE_PL011;
+ else
+ type = TYPE_PL010;
pl01x_generic_serial_init(regs, type);
pl01x_generic_setbrg(regs, type,