| Message ID | 20190221075633.18193-1-yangbo.lu@nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot,1/3] Move CONFIG_FSL_ESDHC to defconfig | expand |
Any comments on the patch-set? Thanks a lot. > -----Original Message----- > From: Y.b. Lu <yangbo.lu@nxp.com> > Sent: Thursday, February 21, 2019 3:55 PM > To: u-boot@lists.denx.de > Cc: Jaehoon Chung <jh80.chung@samsung.com>; Prabhakar Kushwaha > <prabhakar.kushwaha@nxp.com>; Peng Fan <peng.fan@nxp.com>; Lukasz > Majewski <lukma@denx.de>; Y.b. Lu <yangbo.lu@nxp.com> > Subject: [PATCH 1/3] Move CONFIG_FSL_ESDHC to defconfig > > Moved CONFIG_FSL_ESDHC from header files to defconfig files. > > Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> > --- > configs/imx8mq_evk_defconfig | 1 + > configs/imx8qxp_mek_defconfig | 1 + > configs/kp_imx53_defconfig | 1 + > configs/kp_imx6q_tpc_defconfig | 1 + > configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 + > configs/ls1012afrwy_qspi_defconfig | 1 + > configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + > configs/ls1012afrwy_tfa_defconfig | 1 + > include/configs/imx8mq_evk.h | 1 - > include/configs/imx8qxp_mek.h | 1 - > include/configs/kp_imx53.h | 1 - > include/configs/kp_imx6q_tpc.h | 1 - > include/configs/ls1012afrwy.h | 1 - > 13 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig > index 53025e45bc..8f6d66b741 100644 > --- a/configs/imx8mq_evk_defconfig > +++ b/configs/imx8mq_evk_defconfig > @@ -27,6 +27,7 @@ CONFIG_DM_GPIO=y > CONFIG_DM_I2C=y > CONFIG_SYS_I2C_MXC=y > CONFIG_DM_MMC=y > +CONFIG_FSL_ESDHC=y > CONFIG_DM_ETH=y > CONFIG_PINCTRL=y > CONFIG_DM_REGULATOR=y > diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig > index a94998b8b5..88da3ac784 100644 > --- a/configs/imx8qxp_mek_defconfig > +++ b/configs/imx8qxp_mek_defconfig > @@ -51,6 +51,7 @@ CONFIG_I2C_MUX=y > CONFIG_I2C_MUX_PCA954x=y > CONFIG_MISC=y > CONFIG_DM_MMC=y > +CONFIG_FSL_ESDHC=y > CONFIG_PHYLIB=y > CONFIG_PHY_ADDR_ENABLE=y > CONFIG_PHY_ATHEROS=y > diff --git a/configs/kp_imx53_defconfig b/configs/kp_imx53_defconfig index > cfe96fcce5..d00c8cde62 100644 > --- a/configs/kp_imx53_defconfig > +++ b/configs/kp_imx53_defconfig > @@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y > CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx53-kp" > CONFIG_ENV_IS_IN_MMC=y > +CONFIG_FSL_ESDHC=y > CONFIG_I2C_SET_DEFAULT_BUS_NUM=y > CONFIG_I2C_DEFAULT_BUS_NUMBER=0x1 > CONFIG_PHYLIB=y > diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig > index cb58ed6678..3f48463c0c 100644 > --- a/configs/kp_imx6q_tpc_defconfig > +++ b/configs/kp_imx6q_tpc_defconfig > @@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y # > CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set > CONFIG_ENV_IS_IN_MMC=y > +CONFIG_FSL_ESDHC=y > CONFIG_PHYLIB=y > CONFIG_PHY_ATHEROS=y > CONFIG_FEC_MXC=y > diff --git a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig > b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig > index c273dc937e..35a606ce23 100644 > --- a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig > +++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig > @@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y > # CONFIG_BLK is not set CONFIG_DM_MMC=y > +CONFIG_FSL_ESDHC=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_WINBOND=y > diff --git a/configs/ls1012afrwy_qspi_defconfig > b/configs/ls1012afrwy_qspi_defconfig > index 85523ba2d3..50068a12d7 100644 > --- a/configs/ls1012afrwy_qspi_defconfig > +++ b/configs/ls1012afrwy_qspi_defconfig > @@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y > # CONFIG_BLK is not set CONFIG_DM_MMC=y > +CONFIG_FSL_ESDHC=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_WINBOND=y > diff --git a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig > b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig > index d9020c5281..1b281c90a2 100644 > --- a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig > +++ b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig > @@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y > # CONFIG_BLK is not set CONFIG_DM_MMC=y > +CONFIG_FSL_ESDHC=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_WINBOND=y > diff --git a/configs/ls1012afrwy_tfa_defconfig > b/configs/ls1012afrwy_tfa_defconfig > index 08b3692f97..060cf47156 100644 > --- a/configs/ls1012afrwy_tfa_defconfig > +++ b/configs/ls1012afrwy_tfa_defconfig > @@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y > # CONFIG_BLK is not set CONFIG_DM_MMC=y > +CONFIG_FSL_ESDHC=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_WINBOND=y > diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h > index f0430224cb..492e89a20c 100644 > --- a/include/configs/imx8mq_evk.h > +++ b/include/configs/imx8mq_evk.h > @@ -220,7 +220,6 @@ > #define CONFIG_IMX_BOOTAUX > > #define CONFIG_CMD_MMC > -#define CONFIG_FSL_ESDHC > #define CONFIG_FSL_USDHC > > #define CONFIG_SYS_FSL_USDHC_NUM 2 > diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h > index 312e30dc6c..c262736d8b 100644 > --- a/include/configs/imx8qxp_mek.h > +++ b/include/configs/imx8qxp_mek.h > @@ -49,7 +49,6 @@ > #undef CONFIG_CMD_CRC32 > #undef CONFIG_BOOTM_NETBSD > > -#define CONFIG_FSL_ESDHC > #define CONFIG_FSL_USDHC > #define CONFIG_SYS_FSL_ESDHC_ADDR 0 > #define USDHC1_BASE_ADDR 0x5B010000 > diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index > 080eec47ca..d0be94bdb9 100644 > --- a/include/configs/kp_imx53.h > +++ b/include/configs/kp_imx53.h > @@ -16,7 +16,6 @@ > #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) > > /* MMC Configs */ > -#define CONFIG_FSL_ESDHC > #define CONFIG_SYS_FSL_ESDHC_ADDR 0 > #define CONFIG_SYS_FSL_ESDHC_NUM 1 > > diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h > index b6b27ee1d5..dec83bdfce 100644 > --- a/include/configs/kp_imx6q_tpc.h > +++ b/include/configs/kp_imx6q_tpc.h > @@ -44,7 +44,6 @@ > #define CONFIG_SYS_I2C_SPEED 100000 > > /* MMC Configs */ > -#define CONFIG_FSL_ESDHC > #define CONFIG_FSL_USDHC > #define CONFIG_SYS_FSL_ESDHC_ADDR 0 > #define CONFIG_SYS_FSL_USDHC_NUM 2 > diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h > index ebb1df41c7..2ee94d68fd 100644 > --- a/include/configs/ls1012afrwy.h > +++ b/include/configs/ls1012afrwy.h > @@ -41,7 +41,6 @@ > > /* MMC */ > #ifdef CONFIG_MMC > -#define CONFIG_FSL_ESDHC > #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 > #endif > > -- > 2.17.1
Hi Y.B., On 01/03/19 04:15, Y.b. Lu wrote: > Any comments on the patch-set? > Thanks a lot. Patch is tin the right direction, it just touch (as it must be) a huge number of boards. I cannot pick it up now, so I will push it into my -next branch. Regards, Stefano > >> -----Original Message----- >> From: Y.b. Lu <yangbo.lu@nxp.com> >> Sent: Thursday, February 21, 2019 3:55 PM >> To: u-boot@lists.denx.de >> Cc: Jaehoon Chung <jh80.chung@samsung.com>; Prabhakar Kushwaha >> <prabhakar.kushwaha@nxp.com>; Peng Fan <peng.fan@nxp.com>; Lukasz >> Majewski <lukma@denx.de>; Y.b. Lu <yangbo.lu@nxp.com> >> Subject: [PATCH 1/3] Move CONFIG_FSL_ESDHC to defconfig >> >> Moved CONFIG_FSL_ESDHC from header files to defconfig files. >> >> Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> >> --- >> configs/imx8mq_evk_defconfig | 1 + >> configs/imx8qxp_mek_defconfig | 1 + >> configs/kp_imx53_defconfig | 1 + >> configs/kp_imx6q_tpc_defconfig | 1 + >> configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 + >> configs/ls1012afrwy_qspi_defconfig | 1 + >> configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + >> configs/ls1012afrwy_tfa_defconfig | 1 + >> include/configs/imx8mq_evk.h | 1 - >> include/configs/imx8qxp_mek.h | 1 - >> include/configs/kp_imx53.h | 1 - >> include/configs/kp_imx6q_tpc.h | 1 - >> include/configs/ls1012afrwy.h | 1 - >> 13 files changed, 8 insertions(+), 5 deletions(-) >> >> diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig >> index 53025e45bc..8f6d66b741 100644 >> --- a/configs/imx8mq_evk_defconfig >> +++ b/configs/imx8mq_evk_defconfig >> @@ -27,6 +27,7 @@ CONFIG_DM_GPIO=y >> CONFIG_DM_I2C=y >> CONFIG_SYS_I2C_MXC=y >> CONFIG_DM_MMC=y >> +CONFIG_FSL_ESDHC=y >> CONFIG_DM_ETH=y >> CONFIG_PINCTRL=y >> CONFIG_DM_REGULATOR=y >> diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig >> index a94998b8b5..88da3ac784 100644 >> --- a/configs/imx8qxp_mek_defconfig >> +++ b/configs/imx8qxp_mek_defconfig >> @@ -51,6 +51,7 @@ CONFIG_I2C_MUX=y >> CONFIG_I2C_MUX_PCA954x=y >> CONFIG_MISC=y >> CONFIG_DM_MMC=y >> +CONFIG_FSL_ESDHC=y >> CONFIG_PHYLIB=y >> CONFIG_PHY_ADDR_ENABLE=y >> CONFIG_PHY_ATHEROS=y >> diff --git a/configs/kp_imx53_defconfig b/configs/kp_imx53_defconfig index >> cfe96fcce5..d00c8cde62 100644 >> --- a/configs/kp_imx53_defconfig >> +++ b/configs/kp_imx53_defconfig >> @@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y >> CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx53-kp" >> CONFIG_ENV_IS_IN_MMC=y >> +CONFIG_FSL_ESDHC=y >> CONFIG_I2C_SET_DEFAULT_BUS_NUM=y >> CONFIG_I2C_DEFAULT_BUS_NUMBER=0x1 >> CONFIG_PHYLIB=y >> diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig >> index cb58ed6678..3f48463c0c 100644 >> --- a/configs/kp_imx6q_tpc_defconfig >> +++ b/configs/kp_imx6q_tpc_defconfig >> @@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y # >> CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set >> CONFIG_ENV_IS_IN_MMC=y >> +CONFIG_FSL_ESDHC=y >> CONFIG_PHYLIB=y >> CONFIG_PHY_ATHEROS=y >> CONFIG_FEC_MXC=y >> diff --git a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig >> b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig >> index c273dc937e..35a606ce23 100644 >> --- a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig >> +++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig >> @@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y >> # CONFIG_BLK is not set CONFIG_DM_MMC=y >> +CONFIG_FSL_ESDHC=y >> CONFIG_DM_SPI_FLASH=y >> CONFIG_SPI_FLASH=y >> CONFIG_SPI_FLASH_WINBOND=y >> diff --git a/configs/ls1012afrwy_qspi_defconfig >> b/configs/ls1012afrwy_qspi_defconfig >> index 85523ba2d3..50068a12d7 100644 >> --- a/configs/ls1012afrwy_qspi_defconfig >> +++ b/configs/ls1012afrwy_qspi_defconfig >> @@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y >> # CONFIG_BLK is not set CONFIG_DM_MMC=y >> +CONFIG_FSL_ESDHC=y >> CONFIG_DM_SPI_FLASH=y >> CONFIG_SPI_FLASH=y >> CONFIG_SPI_FLASH_WINBOND=y >> diff --git a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig >> b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig >> index d9020c5281..1b281c90a2 100644 >> --- a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig >> +++ b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig >> @@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y >> # CONFIG_BLK is not set CONFIG_DM_MMC=y >> +CONFIG_FSL_ESDHC=y >> CONFIG_DM_SPI_FLASH=y >> CONFIG_SPI_FLASH=y >> CONFIG_SPI_FLASH_WINBOND=y >> diff --git a/configs/ls1012afrwy_tfa_defconfig >> b/configs/ls1012afrwy_tfa_defconfig >> index 08b3692f97..060cf47156 100644 >> --- a/configs/ls1012afrwy_tfa_defconfig >> +++ b/configs/ls1012afrwy_tfa_defconfig >> @@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y >> # CONFIG_BLK is not set CONFIG_DM_MMC=y >> +CONFIG_FSL_ESDHC=y >> CONFIG_DM_SPI_FLASH=y >> CONFIG_SPI_FLASH=y >> CONFIG_SPI_FLASH_WINBOND=y >> diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h >> index f0430224cb..492e89a20c 100644 >> --- a/include/configs/imx8mq_evk.h >> +++ b/include/configs/imx8mq_evk.h >> @@ -220,7 +220,6 @@ >> #define CONFIG_IMX_BOOTAUX >> >> #define CONFIG_CMD_MMC >> -#define CONFIG_FSL_ESDHC >> #define CONFIG_FSL_USDHC >> >> #define CONFIG_SYS_FSL_USDHC_NUM 2 >> diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h >> index 312e30dc6c..c262736d8b 100644 >> --- a/include/configs/imx8qxp_mek.h >> +++ b/include/configs/imx8qxp_mek.h >> @@ -49,7 +49,6 @@ >> #undef CONFIG_CMD_CRC32 >> #undef CONFIG_BOOTM_NETBSD >> >> -#define CONFIG_FSL_ESDHC >> #define CONFIG_FSL_USDHC >> #define CONFIG_SYS_FSL_ESDHC_ADDR 0 >> #define USDHC1_BASE_ADDR 0x5B010000 >> diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index >> 080eec47ca..d0be94bdb9 100644 >> --- a/include/configs/kp_imx53.h >> +++ b/include/configs/kp_imx53.h >> @@ -16,7 +16,6 @@ >> #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) >> >> /* MMC Configs */ >> -#define CONFIG_FSL_ESDHC >> #define CONFIG_SYS_FSL_ESDHC_ADDR 0 >> #define CONFIG_SYS_FSL_ESDHC_NUM 1 >> >> diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h >> index b6b27ee1d5..dec83bdfce 100644 >> --- a/include/configs/kp_imx6q_tpc.h >> +++ b/include/configs/kp_imx6q_tpc.h >> @@ -44,7 +44,6 @@ >> #define CONFIG_SYS_I2C_SPEED 100000 >> >> /* MMC Configs */ >> -#define CONFIG_FSL_ESDHC >> #define CONFIG_FSL_USDHC >> #define CONFIG_SYS_FSL_ESDHC_ADDR 0 >> #define CONFIG_SYS_FSL_USDHC_NUM 2 >> diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h >> index ebb1df41c7..2ee94d68fd 100644 >> --- a/include/configs/ls1012afrwy.h >> +++ b/include/configs/ls1012afrwy.h >> @@ -41,7 +41,6 @@ >> >> /* MMC */ >> #ifdef CONFIG_MMC >> -#define CONFIG_FSL_ESDHC >> #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 >> #endif >> >> -- >> 2.17.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot >
Thanks a lot, Stefano. Please let me know if you need me to do anything. Once they are picked up, I will start the work for driver cleaning up. Best regards, Yangbo Lu > -----Original Message----- > From: Stefano Babic <sbabic@denx.de> > Sent: Wednesday, March 13, 2019 2:14 AM > To: Y.b. Lu <yangbo.lu@nxp.com>; u-boot@lists.denx.de > Subject: Re: [U-Boot] [PATCH 1/3] Move CONFIG_FSL_ESDHC to defconfig > > Hi Y.B., > > On 01/03/19 04:15, Y.b. Lu wrote: > > Any comments on the patch-set? > > Thanks a lot. > > Patch is tin the right direction, it just touch (as it must be) a huge number of > boards. I cannot pick it up now, so I will push it into my -next branch. > > Regards, > Stefano > > > > >> -----Original Message----- > >> From: Y.b. Lu <yangbo.lu@nxp.com> > >> Sent: Thursday, February 21, 2019 3:55 PM > >> To: u-boot@lists.denx.de > >> Cc: Jaehoon Chung <jh80.chung@samsung.com>; Prabhakar Kushwaha > >> <prabhakar.kushwaha@nxp.com>; Peng Fan <peng.fan@nxp.com>; Lukasz > >> Majewski <lukma@denx.de>; Y.b. Lu <yangbo.lu@nxp.com> > >> Subject: [PATCH 1/3] Move CONFIG_FSL_ESDHC to defconfig > >> > >> Moved CONFIG_FSL_ESDHC from header files to defconfig files. > >> > >> Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> > >> --- > >> configs/imx8mq_evk_defconfig | 1 + > >> configs/imx8qxp_mek_defconfig | 1 + > >> configs/kp_imx53_defconfig | 1 + > >> configs/kp_imx6q_tpc_defconfig | 1 + > >> configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 + > >> configs/ls1012afrwy_qspi_defconfig | 1 + > >> configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + > >> configs/ls1012afrwy_tfa_defconfig | 1 + > >> include/configs/imx8mq_evk.h | 1 - > >> include/configs/imx8qxp_mek.h | 1 - > >> include/configs/kp_imx53.h | 1 - > >> include/configs/kp_imx6q_tpc.h | 1 - > >> include/configs/ls1012afrwy.h | 1 - > >> 13 files changed, 8 insertions(+), 5 deletions(-) > >> > >> diff --git a/configs/imx8mq_evk_defconfig > >> b/configs/imx8mq_evk_defconfig index 53025e45bc..8f6d66b741 100644 > >> --- a/configs/imx8mq_evk_defconfig > >> +++ b/configs/imx8mq_evk_defconfig > >> @@ -27,6 +27,7 @@ CONFIG_DM_GPIO=y > >> CONFIG_DM_I2C=y > >> CONFIG_SYS_I2C_MXC=y > >> CONFIG_DM_MMC=y > >> +CONFIG_FSL_ESDHC=y > >> CONFIG_DM_ETH=y > >> CONFIG_PINCTRL=y > >> CONFIG_DM_REGULATOR=y > >> diff --git a/configs/imx8qxp_mek_defconfig > >> b/configs/imx8qxp_mek_defconfig index a94998b8b5..88da3ac784 100644 > >> --- a/configs/imx8qxp_mek_defconfig > >> +++ b/configs/imx8qxp_mek_defconfig > >> @@ -51,6 +51,7 @@ CONFIG_I2C_MUX=y > >> CONFIG_I2C_MUX_PCA954x=y > >> CONFIG_MISC=y > >> CONFIG_DM_MMC=y > >> +CONFIG_FSL_ESDHC=y > >> CONFIG_PHYLIB=y > >> CONFIG_PHY_ADDR_ENABLE=y > >> CONFIG_PHY_ATHEROS=y > >> diff --git a/configs/kp_imx53_defconfig b/configs/kp_imx53_defconfig > >> index > >> cfe96fcce5..d00c8cde62 100644 > >> --- a/configs/kp_imx53_defconfig > >> +++ b/configs/kp_imx53_defconfig > >> @@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y > CONFIG_OF_CONTROL=y > >> CONFIG_DEFAULT_DEVICE_TREE="imx53-kp" > >> CONFIG_ENV_IS_IN_MMC=y > >> +CONFIG_FSL_ESDHC=y > >> CONFIG_I2C_SET_DEFAULT_BUS_NUM=y > >> CONFIG_I2C_DEFAULT_BUS_NUMBER=0x1 > >> CONFIG_PHYLIB=y > >> diff --git a/configs/kp_imx6q_tpc_defconfig > >> b/configs/kp_imx6q_tpc_defconfig index cb58ed6678..3f48463c0c 100644 > >> --- a/configs/kp_imx6q_tpc_defconfig > >> +++ b/configs/kp_imx6q_tpc_defconfig > >> @@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y # > CONFIG_ISO_PARTITION is > >> not set # CONFIG_EFI_PARTITION is not set CONFIG_ENV_IS_IN_MMC=y > >> +CONFIG_FSL_ESDHC=y > >> CONFIG_PHYLIB=y > >> CONFIG_PHY_ATHEROS=y > >> CONFIG_FEC_MXC=y > >> diff --git a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig > >> b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig > >> index c273dc937e..35a606ce23 100644 > >> --- a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig > >> +++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig > >> @@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_DM=y # > >> CONFIG_BLK is not set CONFIG_DM_MMC=y > >> +CONFIG_FSL_ESDHC=y > >> CONFIG_DM_SPI_FLASH=y > >> CONFIG_SPI_FLASH=y > >> CONFIG_SPI_FLASH_WINBOND=y > >> diff --git a/configs/ls1012afrwy_qspi_defconfig > >> b/configs/ls1012afrwy_qspi_defconfig > >> index 85523ba2d3..50068a12d7 100644 > >> --- a/configs/ls1012afrwy_qspi_defconfig > >> +++ b/configs/ls1012afrwy_qspi_defconfig > >> @@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_DM=y # > >> CONFIG_BLK is not set CONFIG_DM_MMC=y > >> +CONFIG_FSL_ESDHC=y > >> CONFIG_DM_SPI_FLASH=y > >> CONFIG_SPI_FLASH=y > >> CONFIG_SPI_FLASH_WINBOND=y > >> diff --git a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig > >> b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig > >> index d9020c5281..1b281c90a2 100644 > >> --- a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig > >> +++ b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig > >> @@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_DM=y # > >> CONFIG_BLK is not set CONFIG_DM_MMC=y > >> +CONFIG_FSL_ESDHC=y > >> CONFIG_DM_SPI_FLASH=y > >> CONFIG_SPI_FLASH=y > >> CONFIG_SPI_FLASH_WINBOND=y > >> diff --git a/configs/ls1012afrwy_tfa_defconfig > >> b/configs/ls1012afrwy_tfa_defconfig > >> index 08b3692f97..060cf47156 100644 > >> --- a/configs/ls1012afrwy_tfa_defconfig > >> +++ b/configs/ls1012afrwy_tfa_defconfig > >> @@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_DM=y # > >> CONFIG_BLK is not set CONFIG_DM_MMC=y > >> +CONFIG_FSL_ESDHC=y > >> CONFIG_DM_SPI_FLASH=y > >> CONFIG_SPI_FLASH=y > >> CONFIG_SPI_FLASH_WINBOND=y > >> diff --git a/include/configs/imx8mq_evk.h > >> b/include/configs/imx8mq_evk.h index f0430224cb..492e89a20c 100644 > >> --- a/include/configs/imx8mq_evk.h > >> +++ b/include/configs/imx8mq_evk.h > >> @@ -220,7 +220,6 @@ > >> #define CONFIG_IMX_BOOTAUX > >> > >> #define CONFIG_CMD_MMC > >> -#define CONFIG_FSL_ESDHC > >> #define CONFIG_FSL_USDHC > >> > >> #define CONFIG_SYS_FSL_USDHC_NUM 2 > >> diff --git a/include/configs/imx8qxp_mek.h > >> b/include/configs/imx8qxp_mek.h index 312e30dc6c..c262736d8b 100644 > >> --- a/include/configs/imx8qxp_mek.h > >> +++ b/include/configs/imx8qxp_mek.h > >> @@ -49,7 +49,6 @@ > >> #undef CONFIG_CMD_CRC32 > >> #undef CONFIG_BOOTM_NETBSD > >> > >> -#define CONFIG_FSL_ESDHC > >> #define CONFIG_FSL_USDHC > >> #define CONFIG_SYS_FSL_ESDHC_ADDR 0 > >> #define USDHC1_BASE_ADDR 0x5B010000 > >> diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h > >> index > >> 080eec47ca..d0be94bdb9 100644 > >> --- a/include/configs/kp_imx53.h > >> +++ b/include/configs/kp_imx53.h > >> @@ -16,7 +16,6 @@ > >> #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) > >> > >> /* MMC Configs */ > >> -#define CONFIG_FSL_ESDHC > >> #define CONFIG_SYS_FSL_ESDHC_ADDR 0 > >> #define CONFIG_SYS_FSL_ESDHC_NUM 1 > >> > >> diff --git a/include/configs/kp_imx6q_tpc.h > >> b/include/configs/kp_imx6q_tpc.h index b6b27ee1d5..dec83bdfce 100644 > >> --- a/include/configs/kp_imx6q_tpc.h > >> +++ b/include/configs/kp_imx6q_tpc.h > >> @@ -44,7 +44,6 @@ > >> #define CONFIG_SYS_I2C_SPEED 100000 > >> > >> /* MMC Configs */ > >> -#define CONFIG_FSL_ESDHC > >> #define CONFIG_FSL_USDHC > >> #define CONFIG_SYS_FSL_ESDHC_ADDR 0 > >> #define CONFIG_SYS_FSL_USDHC_NUM 2 > >> diff --git a/include/configs/ls1012afrwy.h > >> b/include/configs/ls1012afrwy.h index ebb1df41c7..2ee94d68fd 100644 > >> --- a/include/configs/ls1012afrwy.h > >> +++ b/include/configs/ls1012afrwy.h > >> @@ -41,7 +41,6 @@ > >> > >> /* MMC */ > >> #ifdef CONFIG_MMC > >> -#define CONFIG_FSL_ESDHC > >> #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 > >> #endif > >> > >> -- > >> 2.17.1 > > > > _______________________________________________ > > U-Boot mailing list > > U-Boot@lists.denx.de > > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flis > > > ts.denx.de%2Flistinfo%2Fu-boot&data=02%7C01%7Cyangbo.lu%40nxp.c > om% > > > 7C248acc8675d842b09c3008d6a7168cab%7C686ea1d3bc2b4c6fa92cd99c5c > 301635% > > > 7C0%7C0%7C636880112635205519&sdata=MsEk0O%2BrC0IqvlY0fHcLD > PCk3AHqa > > DBNxoIMTak3Gwk%3D&reserved=0 > > > > > -- > =================================================================== > == > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de > =================================================================== > ==
diff --git a/configs/imx8mq_evk_defconfig b/configs/imx8mq_evk_defconfig index 53025e45bc..8f6d66b741 100644 --- a/configs/imx8mq_evk_defconfig +++ b/configs/imx8mq_evk_defconfig @@ -27,6 +27,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_DM_ETH=y CONFIG_PINCTRL=y CONFIG_DM_REGULATOR=y diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index a94998b8b5..88da3ac784 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -51,6 +51,7 @@ CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA954x=y CONFIG_MISC=y CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ATHEROS=y diff --git a/configs/kp_imx53_defconfig b/configs/kp_imx53_defconfig index cfe96fcce5..d00c8cde62 100644 --- a/configs/kp_imx53_defconfig +++ b/configs/kp_imx53_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx53-kp" CONFIG_ENV_IS_IN_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y CONFIG_I2C_DEFAULT_BUS_NUMBER=0x1 CONFIG_PHYLIB=y diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig index cb58ed6678..3f48463c0c 100644 --- a/configs/kp_imx6q_tpc_defconfig +++ b/configs/kp_imx6q_tpc_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_ENV_IS_IN_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_PHY_ATHEROS=y CONFIG_FEC_MXC=y diff --git a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig index c273dc937e..35a606ce23 100644 --- a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig @@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y # CONFIG_BLK is not set CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/ls1012afrwy_qspi_defconfig b/configs/ls1012afrwy_qspi_defconfig index 85523ba2d3..50068a12d7 100644 --- a/configs/ls1012afrwy_qspi_defconfig +++ b/configs/ls1012afrwy_qspi_defconfig @@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y # CONFIG_BLK is not set CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig index d9020c5281..1b281c90a2 100644 --- a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig @@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y # CONFIG_BLK is not set CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/ls1012afrwy_tfa_defconfig b/configs/ls1012afrwy_tfa_defconfig index 08b3692f97..060cf47156 100644 --- a/configs/ls1012afrwy_tfa_defconfig +++ b/configs/ls1012afrwy_tfa_defconfig @@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y # CONFIG_BLK is not set CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index f0430224cb..492e89a20c 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -220,7 +220,6 @@ #define CONFIG_IMX_BOOTAUX #define CONFIG_CMD_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 312e30dc6c..c262736d8b 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -49,7 +49,6 @@ #undef CONFIG_CMD_CRC32 #undef CONFIG_BOOTM_NETBSD -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index 080eec47ca..d0be94bdb9 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index b6b27ee1d5..dec83bdfce 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* MMC Configs */ -#define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index ebb1df41c7..2ee94d68fd 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -41,7 +41,6 @@ /* MMC */ #ifdef CONFIG_MMC -#define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif
Moved CONFIG_FSL_ESDHC from header files to defconfig files. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- configs/imx8mq_evk_defconfig | 1 + configs/imx8qxp_mek_defconfig | 1 + configs/kp_imx53_defconfig | 1 + configs/kp_imx6q_tpc_defconfig | 1 + configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_qspi_defconfig | 1 + configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_tfa_defconfig | 1 + include/configs/imx8mq_evk.h | 1 - include/configs/imx8qxp_mek.h | 1 - include/configs/kp_imx53.h | 1 - include/configs/kp_imx6q_tpc.h | 1 - include/configs/ls1012afrwy.h | 1 - 13 files changed, 8 insertions(+), 5 deletions(-)