diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-05 22:47:44 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-09 11:30:49 -0500 |
| commit | 7b84c973b96775576dcff228d865e8570be26c82 (patch) | |
| tree | 4cd32401193940d8f7401ed896f60631c7fa801b | |
| parent | cebdfc22da6eb81793b616e855bc4d6d89c1c7a6 (diff) | |
| download | u-boot-WIP/09Jan2023.zip u-boot-WIP/09Jan2023.tar.gz u-boot-WIP/09Jan2023.tar.bz2 | |
ns16650: Correct CONFIG_SYS_NS16550_MEM32 platformsWIP/09Jan2023
There are currently no platform that are both CONFIG_SYS_NS16550_MEM32
and not (per how the logic was prior to being broken in 0478dac62a9a
("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: 0478dac62a9a ("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
| -rw-r--r-- | include/ns16550.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/ns16550.h b/include/ns16550.h index f45fc8c..243226f 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) \ |