ns16650: Correct CONFIG_SYS_NS16550_MEM32 platforms
PATCH 1/1 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 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.
--- include/ns16550.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
include/ns16550.h +2 -4
@@ -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) \
Signature · 1 line
2.25.1
Hi Tom,
Quoted 24 lines · Tom Rini
There are currently no platform that are both
CONFIG_SYS_NS16550_MEM32and not (per how the logic was prior to being broken in0478dac62a9a("kbuild: Removeuncmd_spllogic")) enabled inCONFIG_DM_SERIAL. We drop this line out now so that platforms which do useCONFIG_SYS_NS16550_MEM32and depending on stage may or may not haveDM_SERIALset.Fixes 0478dac62a9a ("kbuild: Remove uncmd_spl logic")Reported-by Quentin Schulz <[email protected]>Signed-off-by Tom Rini <[email protected]>--- include/ns16550.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)include/ns16550.h +0
-1@@ -34,12 +34,10 @@#define CONFIG_SYS_NS16550_REG_SIZE (-1)#endif -#ifdef CONFIG_NS16550_DYNAMIC
include/ns16550.h line 43
Quoted 10 lines
include/ns16550.h +2
-3+#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) \
This means though that we assume all ns16550 implementations have their register value stored in a byte only, either LSB or MSB of a 1-4 byte-wide register (which can (sometimes) be configured with CONFIG_SYS_NS16550_REG_SIZE).
In any case,
I really appreciate you taking the time to debug and suggest a patch, thanks a ton.
Cheers,
Quentin
Quoted 11 lines · Tom Rini
There are currently no platform that are both
CONFIG_SYS_NS16550_MEM32and not (per how the logic was prior to being broken in0478dac62a9a("kbuild: Removeuncmd_spllogic")) enabled inCONFIG_DM_SERIAL. We drop this line out now so that platforms which do useCONFIG_SYS_NS16550_MEM32and depending on stage may or may not haveDM_SERIALset.Fixes 0478dac62a9a ("kbuild: Remove uncmd_spl logic")Reported-by Quentin Schulz <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom