serial: Replace CONFIG_DEBUG_UART_BASE by CONFIG_VAL(DEBUG_UART_BASE)
Subsystems (10)
PATCH 1/1 serial: Replace CONFIG_DEBUG_UART_BASE by CONFIG_VAL(DEBUG_UART_BASE)
CONFIG_VAL(DEBUG_UART_BASE) expands to CONFIG_DEBUG_UART_BASE or CONFIG_SPL_DEBUG_UART_BASE or CONFIG_TPL_DEBUG_UART_BASE and allows boards to set different values for SPL, TPL and U-Boot Proper.
For ns16550 driver this support is there since commit d293759d55cc ("serial: ns16550: Add support for SPL_DEBUG_UART_BASE").
---
CI test passed on https://github.com/u-boot/u-boot/pull/177
--- arch/arm/mach-uniphier/debug-uart/debug-uart.c | 4 ++-- arch/x86/cpu/apollolake/cpu_common.c | 2 +- board/eets/pdu001/board.c | 2 +- drivers/serial/altera_jtag_uart.c | 2 +- drivers/serial/altera_uart.c | 4 ++-- drivers/serial/atmel_usart.c | 4 ++-- drivers/serial/serial_ar933x.c | 4 ++-- drivers/serial/serial_arc.c | 4 ++-- drivers/serial/serial_bcm6345.c | 4 ++-- drivers/serial/serial_linflexuart.c | 4 ++-- drivers/serial/serial_meson.c | 2 +- drivers/serial/serial_msm_geni.c | 6 +++--- drivers/serial/serial_mt7620.c | 4 ++-- drivers/serial/serial_mtk.c | 4 ++-- drivers/serial/serial_mvebu_a3700.c | 4 ++-- drivers/serial/serial_mxc.c | 4 ++-- drivers/serial/serial_omap.c | 4 ++-- drivers/serial/serial_pic32.c | 4 ++-- drivers/serial/serial_pl01x.c | 4 ++-- drivers/serial/serial_s5p.c | 4 ++-- drivers/serial/serial_sifive.c | 4 ++-- drivers/serial/serial_stm32.c | 4 ++-- drivers/serial/serial_xuartlite.c | 4 ++-- drivers/serial/serial_zynq.c | 4 ++-- 24 files changed, 45 insertions(+), 45 deletions(-)
arch/arm/mach-uniphier/debug-uart/debug-uart.c +2 -2
@@ -18,7 +18,7 @@static void _debug_uart_putc (int c) { -void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE ; +void __iomem *base = (void __iomem *)CONFIG_VAL (DEBUG_UART_BASE );while (!(readl (base +UNIPHIER_UART_LSR ) &UART_LSR_THRE )) ;
@@ -57,7 +57,7 @@ void sg_set_iectrl(unsigned int pin)void _debug_uart_init (void ) {#ifdef CONFIG_SPL_BUILD -void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE ; +void __iomem *base = (void __iomem *)CONFIG_VAL (DEBUG_UART_BASE );unsigned int divisor;switch (uniphier_get_soc_id ()) {
arch/x86/cpu/apollolake/cpu_common.c +1 -1
@@ -72,7 +72,7 @@ static void pch_uart_init(void) }#ifdef CONFIG_DEBUG_UART -apl_uart_init (PCH_DEV_UART ,CONFIG_DEBUG_UART_BASE ); +apl_uart_init (PCH_DEV_UART ,CONFIG_VAL (DEBUG_UART_BASE ));#endif }
board/eets/pdu001/board.c +1 -1
@@ -273,7 +273,7 @@ void board_debug_uart_init(void)setup_early_clocks ();/* done by pin controller driver if not debugging */ - enable_uart_pin_mux(CONFIG_DEBUG_UART_BASE); + enable_uart_pin_mux(CONFIG_VAL(DEBUG_UART_BASE)); }#endif
drivers/serial/altera_jtag_uart.c +1 -1
@@ -134,7 +134,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -struct altera_jtaguart_regs *regs = (void *)CONFIG_DEBUG_UART_BASE ; +struct altera_jtaguart_regs *regs = (void *)CONFIG_VAL (DEBUG_UART_BASE );while (1 ) {u32 st =readl (®s->control);
drivers/serial/altera_uart.c +2 -2
@@ -123,7 +123,7 @@ U_BOOT_DRIVER(altera_uart) = {static inline void _debug_uart_init (void ) { -struct altera_uart_regs *regs = (void *)CONFIG_DEBUG_UART_BASE ; +struct altera_uart_regs *regs = (void *)CONFIG_VAL (DEBUG_UART_BASE );u32 div; div = (CONFIG_DEBUG_UART_CLOCK /CONFIG_BAUDRATE ) -1 ;
@@ -132,7 +132,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -struct altera_uart_regs *regs = (void *)CONFIG_DEBUG_UART_BASE ; +struct altera_uart_regs *regs = (void *)CONFIG_VAL (DEBUG_UART_BASE );while (1 ) {u32 st =readl (®s->status);
drivers/serial/atmel_usart.c +2 -2
@@ -319,14 +319,14 @@ U_BOOT_DRIVER(serial_atmel) = {#ifdef CONFIG_DEBUG_UART_ATMEL static inline void _debug_uart_init (void ) { -atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_DEBUG_UART_BASE ; +atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_VAL (DEBUG_UART_BASE );_atmel_serial_init (usart,CONFIG_DEBUG_UART_CLOCK ,CONFIG_BAUDRATE ); }static inline void _debug_uart_putc (int ch) { -atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_DEBUG_UART_BASE ; +atmel_usart3_t *usart = (atmel_usart3_t *)CONFIG_VAL (DEBUG_UART_BASE );while (!(readl (&usart->csr) &USART3_BIT (TXRDY ))) ;
drivers/serial/serial_ar933x.c +2 -2
@@ -199,7 +199,7 @@ U_BOOT_DRIVER(serial_ar933x) = {static inline void _debug_uart_init (void ) { -void __iomem *regs = (void *)CONFIG_DEBUG_UART_BASE ; +void __iomem *regs = (void *)CONFIG_VAL (DEBUG_UART_BASE );u32 val, scale, step;/*
@@ -227,7 +227,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int c) { -void __iomem *regs = (void *)CONFIG_DEBUG_UART_BASE ; +void __iomem *regs = (void *)CONFIG_VAL (DEBUG_UART_BASE );u32 data; do {
drivers/serial/serial_arc.c +2 -2
@@ -137,7 +137,7 @@ U_BOOT_DRIVER(serial_arc) = {static inline void _debug_uart_init (void ) { -struct arc_serial_regs *regs = (struct arc_serial_regs *)CONFIG_DEBUG_UART_BASE ; +struct arc_serial_regs *regs = (struct arc_serial_regs *)CONFIG_VAL (DEBUG_UART_BASE );int arc_console_baud =CONFIG_DEBUG_UART_CLOCK / (CONFIG_BAUDRATE *4 ) -1 ;writeb (arc_console_baud &0xff , ®s->baudl);
@@ -146,7 +146,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int c) { -struct arc_serial_regs *regs = (struct arc_serial_regs *)CONFIG_DEBUG_UART_BASE ; +struct arc_serial_regs *regs = (struct arc_serial_regs *)CONFIG_VAL (DEBUG_UART_BASE );while (!(readb (®s->status) &UART_TXEMPTY )) ;
drivers/serial/serial_bcm6345.c +2 -2
@@ -269,7 +269,7 @@ U_BOOT_DRIVER(bcm6345_serial) = {#ifdef CONFIG_DEBUG_UART_BCM6345 static inline void _debug_uart_init (void ) { -void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE ; +void __iomem *base = (void __iomem *)CONFIG_VAL (DEBUG_UART_BASE );bcm6345_serial_init (base,CONFIG_DEBUG_UART_CLOCK ,CONFIG_BAUDRATE ); }
@@ -285,7 +285,7 @@ static inline void wait_xfered(void __iomem *base)static inline void _debug_uart_putc (int ch) { -void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE ; +void __iomem *base = (void __iomem *)CONFIG_VAL (DEBUG_UART_BASE );wait_xfered (base);writel (ch, base +UART_FIFO_REG );
drivers/serial/serial_linflexuart.c +2 -2
@@ -201,14 +201,14 @@ U_BOOT_DRIVER(serial_linflex) = {static inline void _debug_uart_init (void ) { -struct linflex_fsl *base = (struct linflex_fsl *)CONFIG_DEBUG_UART_BASE ; +struct linflex_fsl *base = (struct linflex_fsl *)CONFIG_VAL (DEBUG_UART_BASE );linflex_serial_init_internal (base); }static inline void _debug_uart_putc (int ch) { -struct linflex_fsl *base = (struct linflex_fsl *)CONFIG_DEBUG_UART_BASE ; +struct linflex_fsl *base = (struct linflex_fsl *)CONFIG_VAL (DEBUG_UART_BASE );/* XXX: Is this OK? Should this use the non-DM version? */ _linflex_serial_putc (base, ch);
drivers/serial/serial_meson.c +1 -1
@@ -182,7 +182,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -struct meson_uart *regs = (struct meson_uart *)CONFIG_DEBUG_UART_BASE ; +struct meson_uart *regs = (struct meson_uart *)CONFIG_VAL (DEBUG_UART_BASE );while (readl (®s->status) &AML_UART_TX_FULL ) ;
drivers/serial/serial_msm_geni.c +3 -3
@@ -569,7 +569,7 @@ U_BOOT_DRIVER(serial_msm_geni) = {#ifdef CONFIG_DEBUG_UART_MSM_GENI static struct msm_serial_data init_serial_data = { - .base =CONFIG_DEBUG_UART_BASE + .base =CONFIG_VAL (DEBUG_UART_BASE ) };/* Serial dumb device, to reuse driver code */
@@ -587,7 +587,7 @@ static struct udevice init_dev = {static inline void _debug_uart_init (void ) { -phys_addr_t base =CONFIG_DEBUG_UART_BASE ; +phys_addr_t base =CONFIG_VAL (DEBUG_UART_BASE );geni_serial_init (&init_dev);geni_serial_baud (base,CLK_DIV ,CONFIG_BAUDRATE );
@@ -596,7 +596,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -phys_addr_t base =CONFIG_DEBUG_UART_BASE ; +phys_addr_t base =CONFIG_VAL (DEBUG_UART_BASE );writel (DEF_TX_WM , base +SE_GENI_TX_WATERMARK_REG );qcom_geni_serial_setup_tx (base,1 );
drivers/serial/serial_mt7620.c +2 -2
@@ -220,7 +220,7 @@ static inline void _debug_uart_init(void) {struct mt7620_serial_plat plat; - plat.regs = (void *)CONFIG_DEBUG_UART_BASE ; + plat.regs = (void *)CONFIG_VAL (DEBUG_UART_BASE ); plat.clock =CONFIG_DEBUG_UART_CLOCK ;writel (0 , &plat.regs->ier);
@@ -233,7 +233,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) {struct mt7620_serial_regs __iomem *regs = - (void *)CONFIG_DEBUG_UART_BASE ; + (void *)CONFIG_VAL (DEBUG_UART_BASE );while (!(readl (®s->lsr) &UART_LSR_THRE )) ;
drivers/serial/serial_mtk.c +2 -2
@@ -426,7 +426,7 @@ static inline void _debug_uart_init(void) {struct mtk_serial_priv priv; - priv.regs = (void *)CONFIG_DEBUG_UART_BASE ; + priv.regs = (void *)CONFIG_VAL (DEBUG_UART_BASE ); priv.clock =CONFIG_DEBUG_UART_CLOCK ;writel (0 , &priv.regs->ier);
@@ -439,7 +439,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) {struct mtk_serial_regs __iomem *regs = - (void *)CONFIG_DEBUG_UART_BASE ; + (void *)CONFIG_VAL (DEBUG_UART_BASE );while (!(readl (®s->lsr) &UART_LSR_THRE )) ;
drivers/serial/serial_mvebu_a3700.c +2 -2
@@ -321,7 +321,7 @@ U_BOOT_DRIVER(serial_mvebu) = {static inline void _debug_uart_init (void ) { -void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE ; +void __iomem *base = (void __iomem *)CONFIG_VAL (DEBUG_UART_BASE );u32 parent_rate, divider;/* reset FIFOs */
@@ -349,7 +349,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE ; +void __iomem *base = (void __iomem *)CONFIG_VAL (DEBUG_UART_BASE );while (readl (base +UART_STATUS_REG ) &UART_STATUS_TXFIFO_FULL ) ;
drivers/serial/serial_mxc.c +2 -2
@@ -372,7 +372,7 @@ U_BOOT_DRIVER(serial_mxc) = {static inline void _debug_uart_init (void ) { -struct mxc_uart *base = (struct mxc_uart *)CONFIG_DEBUG_UART_BASE ; +struct mxc_uart *base = (struct mxc_uart *)CONFIG_VAL (DEBUG_UART_BASE );_mxc_serial_init (base, false); _mxc_serial_setbrg(base, CONFIG_DEBUG_UART_CLOCK,
@@ -381,7 +381,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -struct mxc_uart *base = (struct mxc_uart *)CONFIG_DEBUG_UART_BASE ; +struct mxc_uart *base = (struct mxc_uart *)CONFIG_VAL (DEBUG_UART_BASE );while (!(readl (&base->ts) &UTS_TXEMPTY ))WATCHDOG_RESET ();
drivers/serial/serial_omap.c +2 -2
@@ -66,7 +66,7 @@ static inline int serial_in_shift(void *addr, int shift)static inline void _debug_uart_init (void ) { -struct ns16550 *com_port = (struct ns16550 *)CONFIG_DEBUG_UART_BASE ; +struct ns16550 *com_port = (struct ns16550 *)CONFIG_VAL (DEBUG_UART_BASE );int baud_divisor; baud_divisor = ns16550_calc_divisor(com_port, CONFIG_DEBUG_UART_CLOCK,
@@ -85,7 +85,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -struct ns16550 *com_port = (struct ns16550 *)CONFIG_DEBUG_UART_BASE ; +struct ns16550 *com_port = (struct ns16550 *)CONFIG_VAL (DEBUG_UART_BASE );while (!(serial_din (&com_port->lsr) &UART_LSR_THRE )) ;
drivers/serial/serial_pic32.c +2 -2
@@ -187,14 +187,14 @@ U_BOOT_DRIVER(pic32_serial) = {static inline void _debug_uart_init (void ) { -void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE ; +void __iomem *base = (void __iomem *)CONFIG_VAL (DEBUG_UART_BASE );pic32_serial_init (base,CONFIG_DEBUG_UART_CLOCK ,CONFIG_BAUDRATE ); }static inline void _debug_uart_putc (int ch) { -writel (ch,CONFIG_DEBUG_UART_BASE +U_TXR ); +writel (ch,CONFIG_VAL (DEBUG_UART_BASE ) +U_TXR ); }DEBUG_UART_FUNCS
drivers/serial/serial_pl01x.c +2 -2
@@ -403,7 +403,7 @@ U_BOOT_DRIVER(serial_pl01x) = {static void _debug_uart_init (void ) {#ifndef CONFIG_DEBUG_UART_SKIP_INIT -struct pl01x_regs *regs = (struct pl01x_regs *)CONFIG_DEBUG_UART_BASE ; +struct pl01x_regs *regs = (struct pl01x_regs *)CONFIG_VAL (DEBUG_UART_BASE );enum pl01x_type type;if (IS_ENABLED (CONFIG_DEBUG_UART_PL011 ))
@@ -419,7 +419,7 @@ static void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -struct pl01x_regs *regs = (struct pl01x_regs *)CONFIG_DEBUG_UART_BASE ; +struct pl01x_regs *regs = (struct pl01x_regs *)CONFIG_VAL (DEBUG_UART_BASE );while (pl01x_putc (regs, ch) == -EAGAIN ) ;
drivers/serial/serial_s5p.c +2 -2
@@ -276,7 +276,7 @@ static inline void _debug_uart_init(void)if (IS_ENABLED (CONFIG_DEBUG_UART_SKIP_INIT ))return ; -struct s5p_uart *uart = (struct s5p_uart *)CONFIG_DEBUG_UART_BASE ; +struct s5p_uart *uart = (struct s5p_uart *)CONFIG_VAL (DEBUG_UART_BASE );s5p_serial_init (uart);#if CONFIG_IS_ENABLED (ARCH_APPLE )
@@ -288,7 +288,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -struct s5p_uart *uart = (struct s5p_uart *)CONFIG_DEBUG_UART_BASE ; +struct s5p_uart *uart = (struct s5p_uart *)CONFIG_VAL (DEBUG_UART_BASE );#if CONFIG_IS_ENABLED (ARCH_APPLE )while (readl (&uart->ufstat) &S5L_TX_FIFO_FULL );
drivers/serial/serial_sifive.c +2 -2
@@ -212,7 +212,7 @@ U_BOOT_DRIVER(serial_sifive) = {static inline void _debug_uart_init (void ) {struct uart_sifive *regs = - (struct uart_sifive *)CONFIG_DEBUG_UART_BASE ; + (struct uart_sifive *)CONFIG_VAL (DEBUG_UART_BASE );_sifive_serial_setbrg (regs,CONFIG_DEBUG_UART_CLOCK ,CONFIG_BAUDRATE );
@@ -222,7 +222,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) {struct uart_sifive *regs = - (struct uart_sifive *)CONFIG_DEBUG_UART_BASE ; + (struct uart_sifive *)CONFIG_VAL (DEBUG_UART_BASE );while (_sifive_serial_putc (regs, ch) == -EAGAIN )WATCHDOG_RESET ();
drivers/serial/serial_stm32.c +2 -2
@@ -270,7 +270,7 @@ static inline struct stm32_uart_info *_debug_uart_info(void)static inline void _debug_uart_init (void ) { -fdt_addr_t base =CONFIG_DEBUG_UART_BASE ; +fdt_addr_t base =CONFIG_VAL (DEBUG_UART_BASE );struct stm32_uart_info *uart_info =_debug_uart_info ();_stm32_serial_init (base, uart_info);
@@ -281,7 +281,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int c) { -fdt_addr_t base =CONFIG_DEBUG_UART_BASE ; +fdt_addr_t base =CONFIG_VAL (DEBUG_UART_BASE );struct stm32_uart_info *uart_info =_debug_uart_info ();while (_stm32_serial_putc (base, uart_info, c) == -EAGAIN )
drivers/serial/serial_xuartlite.c +2 -2
@@ -143,7 +143,7 @@ U_BOOT_DRIVER(serial_uartlite) = {static inline void _debug_uart_init (void ) { -struct uartlite *regs = (struct uartlite *)CONFIG_DEBUG_UART_BASE ; +struct uartlite *regs = (struct uartlite *)CONFIG_VAL (DEBUG_UART_BASE );int ret;uart_out32 (®s->control,0 );
@@ -159,7 +159,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -struct uartlite *regs = (struct uartlite *)CONFIG_DEBUG_UART_BASE ; +struct uartlite *regs = (struct uartlite *)CONFIG_VAL (DEBUG_UART_BASE );while (uart_in32 (®s->status) &SR_TX_FIFO_FULL ) ;
drivers/serial/serial_zynq.c +2 -2
@@ -295,7 +295,7 @@ U_BOOT_DRIVER(serial_zynq) = {#ifdef CONFIG_DEBUG_UART_ZYNQ static inline void _debug_uart_init (void ) { -struct uart_zynq *regs = (struct uart_zynq *)CONFIG_DEBUG_UART_BASE ; +struct uart_zynq *regs = (struct uart_zynq *)CONFIG_VAL (DEBUG_UART_BASE );_uart_zynq_serial_init (regs); _uart_zynq_serial_setbrg(regs, CONFIG_DEBUG_UART_CLOCK,
@@ -304,7 +304,7 @@ static inline void _debug_uart_init(void)static inline void _debug_uart_putc (int ch) { -struct uart_zynq *regs = (struct uart_zynq *)CONFIG_DEBUG_UART_BASE ; +struct uart_zynq *regs = (struct uart_zynq *)CONFIG_VAL (DEBUG_UART_BASE );while (_uart_zynq_serial_putc (regs, ch) == -EAGAIN )WATCHDOG_RESET ();
Signature · 1 line
2.20.1
Quoted 8 lines · Pali Rohár
CONFIG_VAL(DEBUG_UART_BASE)expands toCONFIG_DEBUG_UART_BASEorCONFIG_SPL_DEBUG_UART_BASEorCONFIG_TPL_DEBUG_UART_BASEand allows boards to set different values for SPL, TPL and U-Boot Proper.For ns16550 driver this support is there since commit
d293759d55cc("serial: ns16550: Add support forSPL_DEBUG_UART_BASE").Signed-off-by Pali Rohár <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom