[PATCH] serial: pl011: Enable DEBUG_UART_PL011 in SPL

[PATCH] serial: pl011: Enable DEBUG_UART_PL011 in SPL

[Chen Baozi]

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>
---
 drivers/serial/serial_pl01x.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 17b26aed81..f00663a814 100644
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -404,8 +404,11 @@ 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;
+#if defined(CONFIG_DEBUG_UART_PL011)
+	enum pl01x_type type = TYPE_PL011;
+#else
+	enum pl01x_type type = TYPE_PL010;
+#endif
 
 	pl01x_generic_serial_init(regs, type);
 	pl01x_generic_setbrg(regs, type,
-- 
2.28.0

Re: [PATCH] serial: pl011: Enable DEBUG_UART_PL011 in SPL

[Simon Glass]

Hi,

On Sun, 18 Jul 2021 at 02:46, Chen Baozi <chenbaozi@phytium.com.cn> wrote:
>
> 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>
> ---
>  drivers/serial/serial_pl01x.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
> index 17b26aed81..f00663a814 100644
> --- a/drivers/serial/serial_pl01x.c
> +++ b/drivers/serial/serial_pl01x.c
> @@ -404,8 +404,11 @@ 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;
> +#if defined(CONFIG_DEBUG_UART_PL011)

Please can you use if() ? Patman should warn you about that.

> +       enum pl01x_type type = TYPE_PL011;
> +#else
> +       enum pl01x_type type = TYPE_PL010;
> +#endif
>
>         pl01x_generic_serial_init(regs, type);
>         pl01x_generic_setbrg(regs, type,
> --
> 2.28.0
>

Regards,
Simon