leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ns16650: Correct CONFIG_SYS_NS16550_MEM32 platforms

Browse Source 
There are currently no platform that are both CONFIG_SYS_NS16550_MEM32
and not (per how the logic was prior to being broken in 0478dac62a
("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: 0478dac62a ("kbuild: Remove uncmd_spl logic")
Reported-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Tested-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> #on Ringneck PX30, Puma RK3399
This commit is contained in:
Tom Rini 2023-01-05 22:47:44 -05:00
parent cebdfc22da
commit 7b84c973b9
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ns16550.h
View File

@ -34,12 +34,10 @@
#define CONFIG_SYS_NS16550_REG_SIZE (-1) #define CONFIG_SYS_NS16550_REG_SIZE (-1)
#endif #endif
#ifdef CONFIG_NS16550_DYNAMIC #if defined(CONFIG_NS16550_DYNAMIC) || defined(CONFIG_DEBUG_UART)
#define UART_REG(x) unsigned char x #define UART_REG(x) unsigned char x
#else #else
#if defined(CONFIG_SYS_NS16550_MEM32) && !CONFIG_IS_ENABLED(DM_SERIAL) #if !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0)
#define UART_REG(x) u32 x
#elif !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0)
#error "Please define NS16550 registers size." #error "Please define NS16550 registers size."
#elif (CONFIG_SYS_NS16550_REG_SIZE > 0) #elif (CONFIG_SYS_NS16550_REG_SIZE > 0)
#define UART_REG(x) \ #define UART_REG(x) \