Incoming StarFive support also uses ns16550 compatibles as UART IP. Make reuse easier by making the two most likely parameters to change SoC-specific (base address and baud clock frequency) and move the rest behind the new CONFIG_DEBUG_LL_NS16550.
Signed-off-by: Ahmad Fatoum <[email protected]> --- arch/riscv/include/asm/debug_ll.h | 7 +++++-- common/Kconfig | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/debug_ll.h b/arch/riscv/include/asm/debug_ll.h index 6904460af98f..13609d25c559 100644 --- a/arch/riscv/include/asm/debug_ll.h +++ b/arch/riscv/include/asm/debug_ll.h @@ -12,13 +12,16 @@ #include <linux/kconfig.h> -#ifdef CONFIG_DEBUG_ERIZO +#ifdef CONFIG_DEBUG_LL_NS16550 +#if defined CONFIG_DEBUG_ERIZO #define DEBUG_LL_UART_ADDR 0x90000000 +#define DEBUG_LL_UART_CLK (24000000 / 16) +#endif + #define DEBUG_LL_UART_SHIFT 2 #define DEBUG_LL_UART_IOSIZE32 -#define DEBUG_LL_UART_CLK (24000000 / 16) #define DEBUG_LL_UART_BPS CONFIG_BAUDRATE #define DEBUG_LL_UART_DIVISOR (DEBUG_LL_UART_CLK / DEBUG_LL_UART_BPS) diff --git a/common/Kconfig b/common/Kconfig index 8b8f80bbb3ba..98be9b58abce 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1376,6 +1376,7 @@ config DEBUG_RPI3_MINI_UART config DEBUG_ERIZO bool "Erizo ns16550 port" depends on SOC_ERIZO + select DEBUG_LL_NS16550 config DEBUG_SIFIVE bool "SiFive serial0 port" @@ -1383,6 +1384,11 @@ config DEBUG_SIFIVE endchoice +config DEBUG_LL_NS16550 + bool + help + Selected by RISC-V platforms that use ns16550 for debug_ll + config DEBUG_IMX_UART_PORT int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \ DEBUG_IMX21_UART || \ -- 2.29.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
