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").

Signed-off-by: Pali Rohár <pali@kernel.org>

diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart.c b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
index d116d46812d56630e29d2a81991dfee8d04dfa42..1ba012ca45d6b76398689c49e360f830e27dec93 100644 (file)
--- a/arch/arm/mach-uniphier/debug-uart/debug-uart.c
+++ b/arch/arm/mach-uniphier/debug-uart/debug-uart.c
@@ -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()) {

diff --git a/arch/x86/cpu/apollolake/cpu_common.c b/arch/x86/cpu/apollolake/cpu_common.c
index 5d7d26b140fca3b2811442f709f2a09084b1a68c..9a5502617bf553b3d5878cad4aa72b75f5d63041 100644 (file)
--- a/arch/x86/cpu/apollolake/cpu_common.c
+++ b/arch/x86/cpu/apollolake/cpu_common.c
@@ -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
 }
 

diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index 2b483dab8e122547266d8e89247a1d50cd7a9cd0..1054837d434d398b9e6054d49f3f385875edb62b 100644 (file)
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -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
 

diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 4435fcf56b9a329d0e594180b4273b1669d8b035..9e39da7dd24619ca84a9e899dc200e5d69a7b43f 100644 (file)
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -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(&regs->control);

diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index b18be6e245490ab65cdc6c707a6594e13d2bc977..35920480841a8beffa5ea6a26bb2bdc9476e18c9 100644 (file)
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -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(&regs->status);

diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index bd14f3e78192edcb48d4a7dc5b3b12f724f6cfb6..1fb9ee5cc94a34a47ade95a8667b684446550539 100644 (file)
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -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)))
                ;

diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index da06bef97c77a0ac9838a84d70fc93ca69f59d89..4f9163497626f9cfea1a2c4c350c8311c355da36 100644 (file)
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -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 {

diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index 8f3e4dd44f15352447ba1f695d3024d7c747bfac..b2d95bdbe18df60561c7130a39fc27a31cdc6df4 100644 (file)
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -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, &regs->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(&regs->status) & UART_TXEMPTY))
                ;

diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c
index f08e91ff3ba4525aeb281731aad4eab645b13a16..2359656a239a5b39f8499d6d2eff2fefa2b11288 100644 (file)
--- a/drivers/serial/serial_bcm6345.c
+++ b/drivers/serial/serial_bcm6345.c
@@ -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);

diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c
index 876a4baa9fc6bbc70e6c7147aab3c29447539995..b449e55a6506fb5a92fd6ef1bc2441a985fd5dcb 100644 (file)
--- a/drivers/serial/serial_linflexuart.c
+++ b/drivers/serial/serial_linflexuart.c
@@ -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);

diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c
index d69ec221e4567800cbe95b1075b3d61260475c00..c5ed3ede45edd166c5fa815b40f5f11dd796d4ac 100644 (file)
--- a/drivers/serial/serial_meson.c
+++ b/drivers/serial/serial_meson.c
@@ -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(&regs->status) & AML_UART_TX_FULL)
                ;

diff --git a/drivers/serial/serial_msm_geni.c b/drivers/serial/serial_msm_geni.c
index 3e255a99dccaf12df0a120fce04778f16d3eda96..3943ca43e49e8068493f4689ccacc2a1463f5a07 100644 (file)
--- a/drivers/serial/serial_msm_geni.c
+++ b/drivers/serial/serial_msm_geni.c
@@ -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);

diff --git a/drivers/serial/serial_mt7620.c b/drivers/serial/serial_mt7620.c
index 76ecc2b38ce6e7c8e63aa9178a36e3f61bcdc529..5c5264bc962927589f3c6813f8747fa094d3680c 100644 (file)
--- a/drivers/serial/serial_mt7620.c
+++ b/drivers/serial/serial_mt7620.c
@@ -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(&regs->lsr) & UART_LSR_THRE))
                ;

diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c
index 4145d9fdb3d3daa1ff225f9015a68a6f757b0d30..a84f39b3fa2ea1396b6a425590a54a93885ff113 100644 (file)
--- a/drivers/serial/serial_mtk.c
+++ b/drivers/serial/serial_mtk.c
@@ -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(&regs->lsr) & UART_LSR_THRE))
                ;

diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c
index 3e673bde57b824d1af4e5f5bedb3617c3c43c110..0fcd7e88acee604c64d56a77d6d192b40cf54e59 100644 (file)
--- a/drivers/serial/serial_mvebu_a3700.c
+++ b/drivers/serial/serial_mvebu_a3700.c
@@ -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)
                ;

diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index e4970a169bd838b0a9c6c9a6806ed62a212891a0..70a0e5e9197d8b5f560a87dbfcda1a13dbce5cb9 100644 (file)
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -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();

diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c
index ee938f67632b5f3e41b93361fd3ee0133f0f26d2..e9ff61a0bac582e4b6d459c9c10d05a0834c47de 100644 (file)
--- a/drivers/serial/serial_omap.c
+++ b/drivers/serial/serial_omap.c
@@ -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))
                ;

diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c
index ccdda9f03344b4b46d4f1c1377e183d4f6c1a46c..3c5d37ce0ab72c8acb61b5681433499e84cc10a3 100644 (file)
--- a/drivers/serial/serial_pic32.c
+++ b/drivers/serial/serial_pic32.c
@@ -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

diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c
index 67caa063c9a38f93f6399d442462efe25924d9ca..9b0d16f1645b2260c5893c0987c326e163f4f5fa 100644 (file)
--- a/drivers/serial/serial_pl01x.c
+++ b/drivers/serial/serial_pl01x.c
@@ -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)
                ;

diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c
index de420d2d94533664a703cfbb7df2bae29f1d9c5f..4b3947e7f6b52a62d64be7d1e29b4f6497791b68 100644 (file)
--- a/drivers/serial/serial_s5p.c
+++ b/drivers/serial/serial_s5p.c
@@ -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);

diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c
index 794f9c924bc415dd1babcc5ac02a05f0f51e2c74..4af1ff5060a93eaee51db681ca0e260c2db8d1cf 100644 (file)
--- a/drivers/serial/serial_sifive.c
+++ b/drivers/serial/serial_sifive.c
@@ -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();

diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index f6cb708c370fe9aad610d107102839d667927204..2ba92bf9c4842739310fc8e0296da3486fb19855 100644 (file)
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -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)

diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c
index 9780a44d09ee14ad37f432357105659f7c30b5f3..b6197da97cc1e4aeb8b2fcb076573996f705ab98 100644 (file)
--- a/drivers/serial/serial_xuartlite.c
+++ b/drivers/serial/serial_xuartlite.c
@@ -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(&regs->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(&regs->status) & SR_TX_FIFO_FULL)
                ;

diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 6bb003dc1558f43db0a7308455de35179137f061..83adfb5fb98ab1ad53a70c1cd2319c3146bbb52b 100644 (file)
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -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();