From cab6245c88146a059c9c80f70c7852d68402a187 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 5 Jan 2023 22:47:44 -0500 Subject: [PATCH] ns16650: Correct CONFIG_SYS_NS16550_MEM32 platforms There are currently no platform that are both CONFIG_SYS_NS16550_MEM32 and not (per how the logic was prior to being broken in c91b3b3e07ad ("kbuild: Remove uncmd_spl logic")) enabled in CONFIG_DM_SERIAL. We drop this line out now so that platforms which do use CONFIG_SYS_NS16550_MEM32 and depending on stage may or may not have DM_SERIAL set. Fixes: c91b3b3e07ad ("kbuild: Remove uncmd_spl logic") Reported-by: Quentin Schulz Signed-off-by: Tom Rini Tested-by: Quentin Schulz #on Ringneck PX30, Puma RK3399 --- include/ns16550.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/ns16550.h b/include/ns16550.h index f45fc8cecc..243226fc3d 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -34,12 +34,10 @@ #define CONFIG_SYS_NS16550_REG_SIZE (-1) #endif -#ifdef CONFIG_NS16550_DYNAMIC +#if defined(CONFIG_NS16550_DYNAMIC) || defined(CONFIG_DEBUG_UART) #define UART_REG(x) unsigned char x #else -#if defined(CONFIG_SYS_NS16550_MEM32) && !CONFIG_IS_ENABLED(DM_SERIAL) -#define UART_REG(x) u32 x -#elif !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0) +#if !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0) #error "Please define NS16550 registers size." #elif (CONFIG_SYS_NS16550_REG_SIZE > 0) #define UART_REG(x) \ -- 2.39.5