| Message ID | 20220503041429.30969-1-peng.fan@oss.nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [V2] imx: drop CONFIG_MXC_UART_BASE | expand |
On 03.05.22 06:14, Peng Fan (OSS) wrote: > From: Peng Fan <peng.fan@nxp.com> > > Since these boards has CONFIG_DM_SERIAL and/or CONFIG_SPL_DM_SERIAL, > the legacy macro no need to be defined. > > Reviewed-by: Heiko Schocher <hs@denx.de> > Reviewed-by: Fabio Estevam <festevam@denx.de> > Signed-off-by: Peng Fan <peng.fan@nxp.com> For tbs2910: Acked-by: Soeren Moch <smoch@web.de> Thanks, Soeren > --- > > V2: > Add R-b > Drop comments > add imx8mn_bsh_smm_s2_common.h > > include/configs/aristainetos2.h | 2 -- > include/configs/imx8mm_evk.h | 1 - > include/configs/imx8mn_bsh_smm_s2_common.h | 2 -- > include/configs/imx8mn_evk.h | 1 - > include/configs/imx8mp_evk.h | 1 - > include/configs/mx7dsabresd.h | 1 - > include/configs/somlabs_visionsom_6ull.h | 1 - > include/configs/tbs2910.h | 3 --- > include/configs/verdin-imx8mm.h | 3 --- > include/configs/verdin-imx8mp.h | 3 --- > 10 files changed, 18 deletions(-) > > diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h > index 8ee97f1d4e3..27adae5d6bf 100644 > --- a/include/configs/aristainetos2.h > +++ b/include/configs/aristainetos2.h > @@ -14,10 +14,8 @@ > #define CONFIG_HOSTNAME "aristainetos2" > > #if (CONFIG_SYS_BOARD_VERSION == 5) > -#define CONFIG_MXC_UART_BASE UART2_BASE > #define CONSOLE_DEV "ttymxc1" > #elif (CONFIG_SYS_BOARD_VERSION == 6) > -#define CONFIG_MXC_UART_BASE UART1_BASE > #define CONSOLE_DEV "ttymxc0" > #endif > > diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h > index 42b78485cfc..7dd66527c3d 100644 > --- a/include/configs/imx8mm_evk.h > +++ b/include/configs/imx8mm_evk.h > @@ -68,7 +68,6 @@ > #define PHYS_SDRAM 0x40000000 > #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ > > -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR > > /* Monitor Command Prompt */ > #define CONFIG_SYS_CBSIZE 2048 > diff --git a/include/configs/imx8mn_bsh_smm_s2_common.h b/include/configs/imx8mn_bsh_smm_s2_common.h > index 6387576c2da..57be38d9433 100644 > --- a/include/configs/imx8mn_bsh_smm_s2_common.h > +++ b/include/configs/imx8mn_bsh_smm_s2_common.h > @@ -45,8 +45,6 @@ > #define CONFIG_SYS_SDRAM_BASE 0x40000000 > #define PHYS_SDRAM 0x40000000 > > -#define CONFIG_MXC_UART_BASE UART4_BASE_ADDR > - > /* Monitor Command Prompt */ > #define CONFIG_SYS_CBSIZE SZ_2K > #define CONFIG_SYS_MAXARGS 64 > diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h > index 034132225c6..b20e0a5553d 100644 > --- a/include/configs/imx8mn_evk.h > +++ b/include/configs/imx8mn_evk.h > @@ -75,7 +75,6 @@ > #define PHYS_SDRAM 0x40000000 > #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ > > -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR > > /* Monitor Command Prompt */ > #define CONFIG_SYS_CBSIZE 2048 > diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h > index cc8d65cb54e..cbdd490a300 100644 > --- a/include/configs/imx8mp_evk.h > +++ b/include/configs/imx8mp_evk.h > @@ -80,7 +80,6 @@ > #define PHYS_SDRAM_2 0x100000000 > #define PHYS_SDRAM_2_SIZE 0xC0000000 /* 3 GB */ > > -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR > > /* Monitor Command Prompt */ > #define CONFIG_SYS_CBSIZE 2048 > diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h > index aaad232f0e4..62e62c6701f 100644 > --- a/include/configs/mx7dsabresd.h > +++ b/include/configs/mx7dsabresd.h > @@ -12,7 +12,6 @@ > > #define PHYS_SDRAM_SIZE SZ_1G > > -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR > > #ifdef CONFIG_IMX_BOOTAUX > /* Set to QSPI1 A flash at default */ > diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h > index d4761296c75..e6aad386efe 100644 > --- a/include/configs/somlabs_visionsom_6ull.h > +++ b/include/configs/somlabs_visionsom_6ull.h > @@ -16,7 +16,6 @@ > /* SPL options */ > #include "imx6_spl.h" > > -#define CONFIG_MXC_UART_BASE UART1_BASE > > /* MMC Configs */ > #ifdef CONFIG_FSL_USDHC > diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h > index b7a94812f35..5d8cb34ad9a 100644 > --- a/include/configs/tbs2910.h > +++ b/include/configs/tbs2910.h > @@ -24,9 +24,6 @@ > > #define CONFIG_SYS_BOOTMAPSZ 0x10000000 > > -/* Serial console */ > -#define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ > - > /* Framebuffer */ > #define CONFIG_IMX_HDMI > #define CONFIG_IMX_VIDEO_SKIP > diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h > index da3dc95f9ee..e0f0347fcf4 100644 > --- a/include/configs/verdin-imx8mm.h > +++ b/include/configs/verdin-imx8mm.h > @@ -83,9 +83,6 @@ > #define PHYS_SDRAM 0x40000000 > #define PHYS_SDRAM_SIZE SZ_2G /* 2GB DDR */ > > -/* UART */ > -#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR > - > /* Monitor Command Prompt */ > #define CONFIG_SYS_CBSIZE SZ_2K > #define CONFIG_SYS_MAXARGS 64 > diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h > index 7b7407752c1..370bcb4e46f 100644 > --- a/include/configs/verdin-imx8mp.h > +++ b/include/configs/verdin-imx8mp.h > @@ -100,9 +100,6 @@ > #define PHYS_SDRAM_2 0x100000000 > #define PHYS_SDRAM_2_SIZE (SZ_4G + SZ_1G) > > -/* UART */ > -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR > - > /* Monitor Command Prompt */ > #define CONFIG_SYS_CBSIZE SZ_2K > #define CONFIG_SYS_MAXARGS 64
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 8ee97f1d4e3..27adae5d6bf 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -14,10 +14,8 @@ #define CONFIG_HOSTNAME "aristainetos2" #if (CONFIG_SYS_BOARD_VERSION == 5) -#define CONFIG_MXC_UART_BASE UART2_BASE #define CONSOLE_DEV "ttymxc1" #elif (CONFIG_SYS_BOARD_VERSION == 6) -#define CONFIG_MXC_UART_BASE UART1_BASE #define CONSOLE_DEV "ttymxc0" #endif diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 42b78485cfc..7dd66527c3d 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -68,7 +68,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 diff --git a/include/configs/imx8mn_bsh_smm_s2_common.h b/include/configs/imx8mn_bsh_smm_s2_common.h index 6387576c2da..57be38d9433 100644 --- a/include/configs/imx8mn_bsh_smm_s2_common.h +++ b/include/configs/imx8mn_bsh_smm_s2_common.h @@ -45,8 +45,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 -#define CONFIG_MXC_UART_BASE UART4_BASE_ADDR - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 034132225c6..b20e0a5553d 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -75,7 +75,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index cc8d65cb54e..cbdd490a300 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -80,7 +80,6 @@ #define PHYS_SDRAM_2 0x100000000 #define PHYS_SDRAM_2_SIZE 0xC0000000 /* 3 GB */ -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index aaad232f0e4..62e62c6701f 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -12,7 +12,6 @@ #define PHYS_SDRAM_SIZE SZ_1G -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR #ifdef CONFIG_IMX_BOOTAUX /* Set to QSPI1 A flash at default */ diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index d4761296c75..e6aad386efe 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -16,7 +16,6 @@ /* SPL options */ #include "imx6_spl.h" -#define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ #ifdef CONFIG_FSL_USDHC diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index b7a94812f35..5d8cb34ad9a 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_BOOTMAPSZ 0x10000000 -/* Serial console */ -#define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ - /* Framebuffer */ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index da3dc95f9ee..e0f0347fcf4 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -83,9 +83,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE SZ_2G /* 2GB DDR */ -/* UART */ -#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 7b7407752c1..370bcb4e46f 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -100,9 +100,6 @@ #define PHYS_SDRAM_2 0x100000000 #define PHYS_SDRAM_2_SIZE (SZ_4G + SZ_1G) -/* UART */ -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64