global: Migrate CONFIG_MXC_UART_BASE to CFG

Perform a simple rename of CONFIG_MXC_UART_BASE to CFG_MXC_UART_BASE

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/ge/b1x5v2/spl.c b/board/ge/b1x5v2/spl.c
index 52c80f792d3c1022c5fbc7e85cdfa64979c0ca46..460d3be1d8346f768c365dc47b4a9d7a193ae48b 100644 (file)
--- a/board/ge/b1x5v2/spl.c
+++ b/board/ge/b1x5v2/spl.c
@@ -565,9 +565,9 @@ void board_init_f(ulong dummy)
        timer_init();
 
        /* iomux */
-       if (CONFIG_MXC_UART_BASE == UART2_BASE)
+       if (CFG_MXC_UART_BASE == UART2_BASE)
                SETUP_IOMUX_PADS(uart2_pads);
-       else if (CONFIG_MXC_UART_BASE == UART3_BASE)
+       else if (CFG_MXC_UART_BASE == UART3_BASE)
                SETUP_IOMUX_PADS(uart3_pads);
 
        /* UART clocks enabled and gd valid - init serial console */

diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index 82c0d84628d531b962b3c25e43e242291f8eb4df..8bcbbf2bbfcba9ce52bf57ba012ff60e3455d800 100644 (file)
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -194,11 +194,11 @@ static void _mxc_serial_setbrg(struct mxc_uart *base, unsigned long clk,
 
 #if !CONFIG_IS_ENABLED(DM_SERIAL)
 
-#ifndef CONFIG_MXC_UART_BASE
-#error "define CONFIG_MXC_UART_BASE to use the MXC UART driver"
+#ifndef CFG_MXC_UART_BASE
+#error "define CFG_MXC_UART_BASE to use the MXC UART driver"
 #endif
 
-#define mxc_base       ((struct mxc_uart *)CONFIG_MXC_UART_BASE)
+#define mxc_base       ((struct mxc_uart *)CFG_MXC_UART_BASE)
 
 static void mxc_serial_setbrg(void)
 {

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index d46159076f2c05bc28acf36596eb39563dca9291..2fb4cfa5e9a119b6175be3aa621fc9b410697f16 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -15,7 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index cde7d3c891ab5fe0d6655ddbb12b6e06691c8482..b7920c7b3057447d4044052913ca193e069a25ee 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 /* Network */
 #define CFG_FEC_MXC_PHYADDR          0

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 47b76c9371e804e04780af5e2173dec8d03fb8fb..90ebec4a94ca18e94e36983273478ecf933029ea 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -26,7 +26,7 @@
 #define CFG_SYS_INIT_RAM_SIZE  IRAM_SIZE
 
 /* Serial console */
-#define CONFIG_MXC_UART_BASE           UART4_BASE
+#define CFG_MXC_UART_BASE              UART4_BASE
 
 /* Environment */
 

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index bf2a9bbaaff1810e143d208ce927d4c0050f6972..3c67aab04c1c461ad627144859e5d7025fa776a1 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -15,7 +15,7 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index c2ed9c7c56af3b2183f169cc927ea9d679e70186..fb619105a7601e2adb6e6b43c7f3c733aa808045 100644 (file)
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -28,7 +28,7 @@
 #define MMC_ROOTFS_PART                        2
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 6aef15c658c0cc26b1b4f138a87da4365ad06fd5..348be5a6ec64deb8f750c5dc9bc87eccf638315b 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -28,7 +28,7 @@
 #define CFG_SYS_FSL_USDHC_NUM  3
 
 /* UART */
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB

diff --git a/include/configs/display5.h b/include/configs/display5.h
index 70ad88c90750561a0113b8ea3a2ecac12162a185..cd1544be039fee555e57aed12814ff3d4c855a13 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -34,7 +34,7 @@
 #define CFG_SYS_SPI_ARGS_OFFS        0x140000
 #define CFG_SYS_SPI_ARGS_SIZE        0x10000
 
-#define CONFIG_MXC_UART_BASE           UART5_BASE
+#define CFG_MXC_UART_BASE              UART5_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index a5e2dc063a74267d5678c57ab292a9be1987a399..6913a91c4c194e1a367a350e88df91bf5e6c3870 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -21,7 +21,7 @@
 
 /* Commands */
 
-#define CONFIG_MXC_UART_BASE   UART2_BASE
+#define CFG_MXC_UART_BASE      UART2_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS                                               \
        "board=EL6Q\0"                                                          \

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index c1748fc26025b8b0382a120e6d01fad09a38ab80..81a92c9bb971ac3c5614270003ce14ee695d9dc8 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -12,7 +12,7 @@
 #ifndef __RIOTBOARD_CONFIG_H
 #define __RIOTBOARD_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE           UART2_BASE
+#define CFG_MXC_UART_BASE              UART2_BASE
 #define CONSOLE_DEV            "ttymxc1"
 
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)

diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 0523ff9a64b8b12149ac957cf4adb1ef0974769d..529b8fc53e5779616dd2a82e71c9be2d73724e81 100644 (file)
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -13,9 +13,9 @@
 #include "mx6_common.h"
 
 /* UART */
-#define CONFIG_MXC_UART_BASE           UART3_BASE
+#define CFG_MXC_UART_BASE              UART3_BASE
 
-#if CONFIG_MXC_UART_BASE == UART2_BASE
+#if CFG_MXC_UART_BASE == UART2_BASE
 /* UART2 requires CONFIG_DEBUG_UART_BASE=0x21e8000 */
 #define CONSOLE_DEVICE "ttymxc1" /* System on Module debug connector */
 #else

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 5a78c68e2fcc4ff541c817d1b614c9308db0e102..c6ace9d65eb3d7e68d1b4ca781fec3791232b9e3 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -16,7 +16,7 @@
 #include "mx6_common.h"
 
 /* Serial */
-#define CONFIG_MXC_UART_BASE          UART2_BASE
+#define CFG_MXC_UART_BASE             UART2_BASE
 
 /* NAND */
 

diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 4208ba95915e562b3a719466853161ca86ff47a0..786b70fe064d9b16a1559a7c7ccb17aaf3ab552f 100644 (file)
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -116,9 +116,9 @@
 /* UART */
 #ifdef CONFIG_MXC_UART
 # ifdef CONFIG_MX6UL
-#  define CONFIG_MXC_UART_BASE         UART1_BASE
+#  define CFG_MXC_UART_BASE            UART1_BASE
 # else
-#  define CONFIG_MXC_UART_BASE         UART4_BASE
+#  define CFG_MXC_UART_BASE            UART4_BASE
 # endif
 #endif
 

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 121b34ae96dbd06bf31c8574d61a962aca97341c..f9544cd430caf5814eac8b5d54d9581e0284758d 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -8,7 +8,7 @@
 #ifndef __IMX6LOGIC_CONFIG_H
 #define __IMX6LOGIC_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CFG_MXC_UART_BASE   UART1_BASE
 #define CONSOLE_DEV            "ttymxc0"
 
 #include "mx6_common.h"

diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 162b0b8a69bb70eb0d5b135e7d37f2c0d407510e..db08e43f0d864f9ddada020b6e21c2efafb4bda2 100644 (file)
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -35,7 +35,7 @@
 #include <config_distro_bootcmd.h>
 
 /* UART */
-#define CONFIG_MXC_UART_BASE           UART3_BASE
+#define CFG_MXC_UART_BASE              UART3_BASE
 
 /* MMC */
 

diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h
index c95038eaa537caf3670a5e9db3b0c714fb26926c..9da98d0af27795e3f6c52d58eb2befbf4e3595c8 100644 (file)
--- a/include/configs/imx6ulz_smm_m2.h
+++ b/include/configs/imx6ulz_smm_m2.h
@@ -12,7 +12,7 @@
 #include <linux/sizes.h>
 #include <linux/stringify.h>
 
-#define CONFIG_MXC_UART_BASE           UART4_BASE
+#define CFG_MXC_UART_BASE              UART4_BASE
 
 #ifndef CONFIG_SPL_BUILD
 

diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 66cf5b463fc212d64c5df1e3d5ec4f7134275208..84fb1bfb7598af915a28e7bf9bf0cb5c0dab1b29 100644 (file)
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 #undef CFG_EXTRA_ENV_SETTINGS
 

diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h
index 0723d27ab7033f05522fadd9a320ce57c37e27c5..f7d2b660c1f33fac5b882ea3c3e4222504ab9ee9 100644 (file)
--- a/include/configs/imx8mm_data_modul_edm_sbc.h
+++ b/include/configs/imx8mm_data_modul_edm_sbc.h
@@ -25,7 +25,7 @@
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x40000000 /* Minimum 1 GiB DDR */
 
-#define CONFIG_MXC_UART_BASE           UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART3_BASE_ADDR
 
 /* PHY needs a longer autonegotiation timeout after reset */
 #define PHY_ANEG_TIMEOUT               20000

diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h
index b8fdedefa21f6e58f4c7e7995a2bfd577062957d..d022faaa91a48aec7341af9b7f00389a1ad8d8ba 100644 (file)
--- a/include/configs/imx8mp_dhcom_pdk2.h
+++ b/include/configs/imx8mp_dhcom_pdk2.h
@@ -18,7 +18,7 @@
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x20000000 /* Minimum 512 MiB DDR */
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART1_BASE_ADDR
 
 /* PHY needs a longer autonegotiation timeout after reset */
 #define PHY_ANEG_TIMEOUT               20000

diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index e4e24b522fdb7b2f897e67906f2b22649e4d2b11..495ca313db2872a8ee73296c443446d44cbabf08 100644 (file)
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -148,7 +148,7 @@
 #define PHYS_SDRAM_2_SIZE              0x80000000      /* 2 GB */
 #endif
 
-#define CONFIG_MXC_UART_BASE           UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART3_BASE_ADDR
 
 #define CFG_SYS_FSL_USDHC_NUM  2
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h
index f7ae1b47d0635627114c4701055cb5ee7ef0daa0..828bd67237271159d3d9427d1a574b350e577737 100644 (file)
--- a/include/configs/imx8mq_cm.h
+++ b/include/configs/imx8mq_cm.h
@@ -54,7 +54,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                                        0x40000000 /* 1 GB DDR */
 
-#define CONFIG_MXC_UART_BASE           UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE              UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM          2
 #define CFG_SYS_FSL_ESDHC_ADDR       0

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 4b46321e851265d53394b7aca1bbd71b1d16e41f..a7a51907f5c9e98b92ee75d1891d36dd00961bfa 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -59,7 +59,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                        0xC0000000 /* 3GB DDR */
 
-#define CONFIG_MXC_UART_BASE           UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE              UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM  2
 #define CFG_SYS_FSL_ESDHC_ADDR       0

diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 6d0c4531118336e71c8dad3902e5eec5a69db4c2..bfde15e6240f6d61f2601103a2535c2af7cab32d 100644 (file)
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -92,7 +92,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                        0x40000000 /* 1GB DDR */
 
-#define CONFIG_MXC_UART_BASE           UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE              UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM  2
 #define CFG_SYS_FSL_ESDHC_ADDR       0

diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index e3ae91089ffa96f198faef557e28a6b514734ef0..4354f3945e8367660cb963dfa9cf9140cb1c075a 100644 (file)
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -22,7 +22,7 @@
 #define CFG_SYS_UBOOT_BASE             CONFIG_TEXT_BASE
 
 /* Board and environment settings */
-#define CONFIG_MXC_UART_BASE           UART4_BASE
+#define CFG_MXC_UART_BASE              UART4_BASE
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index 5a3c9f76a431fe7b411142847be46e444ee3969f..bf590efb4348e4c4a3769514c82cdb0dcf5c8b67 100644 (file)
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -67,7 +67,7 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                        0xC0000000 /* 3GB DDR */
 
-#define CONFIG_MXC_UART_BASE           UART_BASE_ADDR(3)
+#define CFG_MXC_UART_BASE              UART_BASE_ADDR(3)
 
 #define CFG_SYS_FSL_USDHC_NUM  2
 #define CFG_SYS_FSL_ESDHC_ADDR       0

diff --git a/include/configs/librem5.h b/include/configs/librem5.h
index 7417f8582a4cf629882888d194960cd376dbc826..9e4d373e56d5cc804bbdc3fc7e493c4ef4c38ff8 100644 (file)
--- a/include/configs/librem5.h
+++ b/include/configs/librem5.h
@@ -30,23 +30,23 @@
 #define CONSOLE_ON_UART1
 
 #ifdef CONSOLE_ON_UART1
-#define CONFIG_MXC_UART_BASE           UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART1_BASE_ADDR
 #define CONSOLE_UART_CLK               0
 #define CONSOLE                "ttymxc0"
 #elif defined(CONSOLE_ON_UART2)
-#define CONFIG_MXC_UART_BASE           UART2_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART2_BASE_ADDR
 #define CONSOLE_UART_CLK               1
 #define CONSOLE                "ttymxc1"
 #elif defined(CONSOLE_ON_UART3)
-#define CONFIG_MXC_UART_BASE           UART3_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART3_BASE_ADDR
 #define CONSOLE_UART_CLK               2
 #define CONSOLE                "ttymxc2"
 #elif defined(CONSOLE_ON_UART4)
-#define CONFIG_MXC_UART_BASE           UART4_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART4_BASE_ADDR
 #define CONSOLE_UART_CLK               3
 #define CONSOLE                "ttymxc3"
 #else
-#define CONFIG_MXC_UART_BASE           UART1_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART1_BASE_ADDR
 #define CONSOLE_UART_CLK               0
 #define CONSOLE                "ttymxc0"
 #endif

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 0b8781d7bf3422f33b023208b03ed3dac6c73cf6..63e5dbfab7750b362b648680ba853c899b4f4e0b 100644 (file)
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -13,7 +13,7 @@
 #include <linux/stringify.h>
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index ee19c8936b9ad60643ce60e959313ebc9f36c29f..9aac5677fb75039659590932fa18b81822b76d37 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -31,7 +31,7 @@
 /*
  * Serial Driver
  */
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /*
  * MMC Driver

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 6cc49378fedc55c6e2f6a4a660640868f9b78ba2..b64bf93bcb748e52d8f6ffbf729bef90b9c1826c 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -17,7 +17,7 @@
  * mode from SD card (SD2)
  */
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_USDHC_NUM  2

diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h
index 1cd0b3cf737445e7fe118abc8d2c3720442ec6eb..c1c1fd5a78434cfb24ef0ea3cfb28d043016049f 100644 (file)
--- a/include/configs/msc_sm2s_imx8mp.h
+++ b/include/configs/msc_sm2s_imx8mp.h
@@ -55,7 +55,7 @@
 #define PHYS_SDRAM_2                   0xc0000000
 #define PHYS_SDRAM_2_SIZE              0x0
 
-#define CONFIG_MXC_UART_BASE           UART2_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART2_BASE_ADDR
 
 #define CFG_SYS_FSL_USDHC_NUM  2
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 740e357e00e980eb97c94dcdb7bbc5621a924f9c..123b7a533b17622c18ab0bc4e9241948eeeb2108 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -18,7 +18,7 @@
  * Hardware drivers
  */
 
-#define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CFG_MXC_UART_BASE      UART1_BASE
 
 /* PMIC Controller */
 #define CFG_FSL_PMIC_BUS       0

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index baffe65c3697d4ec667058b10958640b11264e3b..1a3ec6e0cdb8f653403b99820d7ff144488c977e 100644 (file)
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -14,7 +14,7 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_MXC_UART_BASE UART2_BASE
+#define CFG_MXC_UART_BASE UART2_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 0ac93d6e0432af0f06e039f7803fb880c1064aba..d87f9e942c51a052e635178ab8e2e41b459f03cd 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -11,7 +11,7 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CFG_MXC_UART_BASE      UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index d4af96b51ea4a8b6fb91228fb39fa2600e4b5346..871d52c343f53115f2be4abb2842c925be53c9e4 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -19,7 +19,7 @@
 
 /* Command definition */
 
-#define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CFG_MXC_UART_BASE      UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
        "som_rev=undefined\0" \

diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index f6d3b2eeb9cf6cca36ab0f9a5387a32bd4099228..b664962a26a50784e31dd3ede7fe4b1aba6593f0 100644 (file)
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -14,12 +14,12 @@
 
 #ifdef CONFIG_SERIAL_CONSOLE_UART1
 #if defined(CONFIG_MX6SL)
-#define CONFIG_MXC_UART_BASE           UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART1_IPS_BASE_ADDR
 #else
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 #endif
 #elif defined(CONFIG_SERIAL_CONSOLE_UART2)
-#define CONFIG_MXC_UART_BASE           UART2_BASE
+#define CFG_MXC_UART_BASE              UART2_BASE
 #else
 #error please define serial console (CONFIG_SERIAL_CONSOLE_UARTx)
 #endif

diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 888da7ce365f2fead5ebf00bc6ddcb14a45cbefb..274c14bbd3830c9d2e008ab348b5457c1f58a935 100644 (file)
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -8,7 +8,7 @@
 #ifndef __MX6SABREAUTO_CONFIG_H
 #define __MX6SABREAUTO_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE   UART4_BASE
+#define CFG_MXC_UART_BASE      UART4_BASE
 #define CONSOLE_DEV            "ttymxc3"
 
 /* USB Configs */

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 78a554d0ccba63d7aac8525205430b31d2311790..af9978e02c8939df238d6991358d1fd737885dbc 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -8,7 +8,7 @@
 #ifndef __MX6SABRESD_CONFIG_H
 #define __MX6SABRESD_CONFIG_H
 
-#define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CFG_MXC_UART_BASE      UART1_BASE
 #define CONSOLE_DEV            "ttymxc0"
 
 #include "mx6sabre_common.h"

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 4fbd06783a6de3496fb8411dc67306e64f7151f8..f6d9ac20821f8128b59e6412cce2ee7a244dcf8d 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE           UART1_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART1_IPS_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index cf4871cbae3968e2f93a6b3f59bfa83ce327be98..aec3e51bff8768877855f7ea8c6f00fc35ad5285 100644 (file)
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
        "epdc_waveform=epdc_splash.bin\0" \

diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 3399cdd16fa83f92b75ab5e7e4cafe0bdb30e462..3d0f6e452d65bb88eadf2689bf6fda4a188905d9 100644 (file)
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 #define CFG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index c99d99abc17934aed0698c00763ff366f2186834..8c39e6d6cf4dc8114c293934760a8695150dcda0 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -12,7 +12,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 #ifdef CONFIG_IMX_BOOTAUX
 

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 5e3695ecc971c7dc2065014142ef023104c5d510..3f8a90b626d10771c68c89d173262973d7671e42 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -15,7 +15,7 @@
 
 #define is_mx6ul_9x9_evk()     CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK)
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC

diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 58d1a744ae990ae860892eff6a9ae24a02fd81e9..2c3cd32cefa70b24a2ed6fd529bddd498f021e57 100644 (file)
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -16,7 +16,7 @@
 
 #define PHYS_SDRAM_SIZE        SZ_512M
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC

diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index 43261824d3cffd561440646a7e0998b9a0939b3b..0c0235b42984eab3bfd3a20555dad8017eac40bc 100644 (file)
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_FSL_USDHC_NUM  1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index aca15be64b11b57c74d0b3bb5404ec9cae5432fc..5625771bad14f397f2bb80318d97d6d8d41e56c7 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -11,7 +11,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE          UART2_BASE
+#define CFG_MXC_UART_BASE             UART2_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      0

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 3ffb44ab72524fb909fdd6dec942d7996b376b1b..7243549b68d819defec84e228d8fe5b6a8b86b45 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -49,7 +49,7 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
 
 /* UART */
-#define CONFIG_MXC_UART_BASE           UART2_BASE
+#define CFG_MXC_UART_BASE              UART2_BASE
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB

diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 4b47e4fbb37ae8d51b4d037f36ee9c92205c8cb6..24d7b0c26e860e7c1b5090e79ff227a99c46969e 100644 (file)
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_FSL_USDHC_NUM  1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index 146f87e9ce3397cc2f98deac03f37d87f5cace2a..e8c48cf83652d2b292cd6ce1e4ebdcff1f881499 100644 (file)
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -22,7 +22,7 @@
 #define CFG_SYS_FSL_USDHC_NUM  1
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 

diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index 0890c115700cb1ee828098901f52f68c8d3ad2cd..bd04268a3ef39891a0c3f3a68adad26d18d8770d 100644 (file)
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -22,7 +22,7 @@
 #define MMC_ROOTFS_PART                2
 
 /* Console configs */
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configs */
 

diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index e1f7b7003194c38188676bc7f2b14cfb614f4935..a1d0dd93c5268df109ccd3728c2e3e45b1b797f6 100644 (file)
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 1cb8fa63e72116e82367e37fdd3bf7c4fa4480eb..64e0a5564810faefe854240dc3c75b47c72934bb 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -17,7 +17,7 @@
 
 #define CFG_FEC_MXC_PHYADDR            0x1
 
-#define CONFIG_MXC_UART_BASE           UART6_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART6_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 7fc6211ff73253a41dcd1190e66d26384b666ccc..dbeaeea77f7de5c6293c156ba511b6724c447eb5 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -10,7 +10,7 @@
 
 #include "mx7_common.h"
 
-#define CONFIG_MXC_UART_BASE           UART5_IPS_BASE_ADDR
+#define CFG_MXC_UART_BASE              UART5_IPS_BASE_ADDR
 
 /* MMC Config */
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 37ade717ae996ba12095f6e106ddec40408207b0..4b602ea030222c3eb5fdbfe994edd7fafbfa80b5 100644 (file)
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -71,7 +71,7 @@
 #define PHYS_SDRAM                     0x40000000
 #define PHYS_SDRAM_SIZE                        0x80000000      /* 2 GiB DDR */
 
-#define CONFIG_MXC_UART_BASE           UART_BASE_ADDR(1)
+#define CFG_MXC_UART_BASE              UART_BASE_ADDR(1)
 
 #define CFG_SYS_FSL_USDHC_NUM  2
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index a5f14dc4267969cc214b45c2bb9370731c63e01d..b5871424bc64c006bc4a34d14c1d28cc2ba385d1 100644 (file)
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -11,7 +11,7 @@
 
 #define CFG_FEC_MXC_PHYADDR            0x03
 
-#define CONFIG_MXC_UART_BASE           UART2_BASE
+#define CFG_MXC_UART_BASE              UART2_BASE
 #define CONSOLE_DEV            "ttymxc1"
 
 #endif /* __CONFIG_TQMA6_MBA6_H */

diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 34c9b6a2f97ce0d4f4f83ffbe1678ec5a0c429ca..e06fc7fe1559fc0b54d4169b907000b62cd64083 100644 (file)
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -10,7 +10,7 @@
 #define CFG_FEC_MXC_PHYADDR            0x01
 
 /* UART */
-#define CONFIG_MXC_UART_BASE           UART4_BASE
+#define CFG_MXC_UART_BASE              UART4_BASE
 #define CONSOLE_DEV            "ttymxc3"
 
 /* Watchdog */

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index f0092eff14948073397ffe7d21d19d6057b8c332..d85cf7808c7eefc446cc5fd9c121b81cffe498fc 100644 (file)
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE           UART2_BASE
+#define CFG_MXC_UART_BASE              UART2_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 5d7d734daa2d57dadfc439b0a7ed2f5396196681..842abb7b7a22a73bc8ad68dc0f2f794572d24b4b 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -16,7 +16,7 @@
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
 
 /* Command definition */
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* Linux only */
 #define CFG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 11706148f1e20d44824734bfcc496e1c1325e190..00b45cc3d2ad3b0c89505bebf6b3b6f25fb553ae 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -17,7 +17,7 @@
 /* U-Boot general configurations */
 
 /* UART */
-#define CONFIG_MXC_UART_BASE   UART1_BASE
+#define CFG_MXC_UART_BASE      UART1_BASE
 
 /* SD/MMC */
 #define CFG_SYS_FSL_ESDHC_ADDR 0

diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index cdd2eeef0ac998ecf9d448bf744a5672f1957f9e..7954ed9910c779793dd1d6a63b054510330b40d9 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -50,7 +50,7 @@
 #endif
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 #endif
 
 #endif                         /* __CONFIG_H */

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 1e765439fabe6f5868820134a1fcbee5940a02a7..8853bcd7be284e9e531717185a120ae184ef4ada 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -10,7 +10,7 @@
 
 #include "mx6_common.h"
 
-#define CONFIG_MXC_UART_BASE           UART1_BASE
+#define CFG_MXC_UART_BASE              UART1_BASE
 
 /* MMC Configuration */
 #define CFG_SYS_FSL_USDHC_NUM  2

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 96996ac1f0f24c41d5b2688850b0e63d2ae80e29..c8ae047e62c368748dab88f8fefd4b34e0570bb3 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -10,7 +10,7 @@
 #include "mx6_common.h"
 #include <asm/mach-imx/gpio.h>
 
-#define CONFIG_MXC_UART_BASE           MX6UL_UART7_BASE_ADDR
+#define CFG_MXC_UART_BASE              MX6UL_UART7_BASE_ADDR
 
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR