Signed-off-by: Tom Rini trini@konsulko.com --- board/ge/b1x5v2/spl.c | 4 ++-- drivers/serial/serial_mxc.c | 6 +++--- include/configs/apalis_imx6.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/display5.h | 2 +- include/configs/el6x_common.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/ge_b1x5v2.h | 4 ++-- include/configs/gw_ventana.h | 2 +- include/configs/imx6-engicam.h | 4 ++-- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx6ulz_smm_m2.h | 2 +- include/configs/imx7-cm.h | 2 +- include/configs/imx8mm_data_modul_edm_sbc.h | 2 +- include/configs/imx8mp_dhcom_pdk2.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mq_cm.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/kontron-sl-mx6ul.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/librem5.h | 10 +++++----- include/configs/liteboard.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/msc_sm2s_imx8mp.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53cx9020.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6memcal.h | 6 +++--- include/configs/mx6sabreauto.h | 2 +- include/configs/mx6sabresd.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sllevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx6ullevk.h | 2 +- include/configs/mys_6ulx.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/novena.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/pcl063.h | 2 +- include/configs/pcl063_ull.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/tqma6_mba6.h | 2 +- include/configs/tqma6_wru4.h | 2 +- include/configs/udoo.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/xpress.h | 2 +- scripts/config_whitelist.txt | 2 +- 63 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/board/ge/b1x5v2/spl.c b/board/ge/b1x5v2/spl.c index 52c80f792d3c..460d3be1d834 100644 --- 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 82c0d84628d5..8bcbbf2bbfcb 100644 --- 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 8db2909c96b2..b1355d637538 100644 --- 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 cde7d3c891ab..b7920c7b3057 100644 --- 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 47b76c9371e8..90ebec4a94ca 100644 --- 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 2f30322bb4f8..5f098fab940e 100644 --- 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 c2ed9c7c56af..fb619105a760 100644 --- 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 1fbdebb64511..e9c36cdb80e9 100644 --- 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 191c8fb8ab46..9a6fb72377c1 100644 --- 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
/* I2C Configs */ #define CFG_I2C_MULTI_BUS diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index a5e2dc063a74..6913a91c4c19 100644 --- 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 8f03c2ff3c0d..9b772d2bd367 100644 --- 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 9dc1d7394afd..703d63bd20bc 100644 --- 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 e71f10a24fa1..3713ba4dbceb 100644 --- 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 4208ba95915e..786b70fe064d 100644 --- 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 121b34ae96db..f9544cd430ca 100644 --- 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 162b0b8a69bb..db08e43f0d86 100644 --- 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 c95038eaa537..9da98d0af277 100644 --- 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 438e79df3cc1..87262a97877e 100644 --- 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 0723d27ab703..f7d2b660c1f3 100644 --- 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 b8fdedefa21f..d022faaa91a4 100644 --- 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 e4e24b522fdb..495ca313db28 100644 --- 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 f7ae1b47d063..828bd6723727 100644 --- 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 4b46321e8512..a7a51907f5c9 100644 --- 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 6d0c45311183..bfde15e6240f 100644 --- 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 e57ae20a74ea..523cb5a07fd0 100644 --- 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 #define CFG_HOSTNAME "kontron-mx6ul"
#ifdef CONFIG_USB_EHCI_HCD diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index 5a3c9f76a431..bf590efb4348 100644 --- 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 1818a57e49c5..4725be264a9b 100644 --- a/include/configs/librem5.h +++ b/include/configs/librem5.h @@ -32,23 +32,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 0b8781d7bf34..63e5dbfab775 100644 --- 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 88be79462e66..2ffee5b2e930 100644 --- 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 9b2777339a10..9b4a1ab7f62f 100644 --- 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 1cd0b3cf7374..c1c1fd5a7843 100644 --- 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 740e357e00e9..123b7a533b17 100644 --- 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 baffe65c3697..1a3ec6e0cdb8 100644 --- 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 0ac93d6e0432..d87f9e942c51 100644 --- 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 d4af96b51ea4..871d52c343f5 100644 --- 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 f6d3b2eeb9cf..b664962a26a5 100644 --- 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 888da7ce365f..274c14bbd383 100644 --- 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 78a554d0ccba..af9978e02c89 100644 --- 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 4fbd06783a6d..f6d9ac20821f 100644 --- 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 cf4871cbae39..aec3e51bff87 100644 --- 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 3399cdd16fa8..3d0f6e452d65 100644 --- 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 c99d99abc179..8c39e6d6cf4d 100644 --- 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 5e3695ecc971..3f8a90b626d1 100644 --- 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 58d1a744ae99..2c3cd32cefa7 100644 --- 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 43261824d3cf..0c0235b42984 100644 --- 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 811688ae82af..fabd82d6c9c6 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -13,7 +13,7 @@
#define CONFIG_USBD_HS
-#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 af99ba4f193c..dd82c04440ec 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -53,7 +53,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 664d4f11c867..ae5e566d3fb0 100644 --- 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 146f87e9ce33..e8c48cf83652 100644 --- 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 0890c115700c..bd04268a3ef3 100644 --- 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 e1f7b7003194..a1d0dd93c526 100644 --- 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 6148a343117d..4064a34f191b 100644 --- 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 7fc6211ff732..dbeaeea77f7d 100644 --- 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 37ade717ae99..4b602ea03022 100644 --- 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 a5f14dc42679..b5871424bc64 100644 --- 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 34c9b6a2f97c..e06fc7fe1559 100644 --- 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 f0092eff1494..d85cf7808c7e 100644 --- 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 5d7d734daa2d..842abb7b7a22 100644 --- 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 b2153b441142..854875adc4b7 100644 --- 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 cdd2eeef0ac9..7954ed9910c7 100644 --- 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 1e765439fabe..8853bcd7be28 100644 --- 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 ce6ca175363b..602fd4595e77 100644 --- 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 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e041df9b887a..2f3241289842 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -137,7 +137,7 @@ CFG_MXC_GPT_HCLK CFG_MXC_NAND_HWECC CFG_MXC_NAND_IP_REGS_BASE CFG_MXC_NAND_REGS_BASE -CONFIG_MXC_UART_BASE +CFG_MXC_UART_BASE CONFIG_MXC_USB_FLAGS CONFIG_MXC_USB_PORT CONFIG_MXC_USB_PORTSC