From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peng Fan Date: Wed, 29 May 2019 01:34:38 +0000 Subject: [U-Boot] [v3, 1/5] Move CONFIG_FSL_ESDHC to defconfig In-Reply-To: <20190521085215.6263-2-yangbo.lu@nxp.com> References: <20190521085215.6263-1-yangbo.lu@nxp.com> <20190521085215.6263-2-yangbo.lu@nxp.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de > Subject: [v3, 1/5] Move CONFIG_FSL_ESDHC to defconfig > > Moved CONFIG_FSL_ESDHC from header files to defconfig files. > > Signed-off-by: Yangbo Lu > --- > Changes for v2: > - Rebased. > Changes for v3: > - Rebased. > --- > configs/imx8mq_evk_defconfig | 1 + > configs/imx8qm_mek_defconfig | 1 + > configs/imx8qxp_mek_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/imx8qm_mek.h | 1 - > include/configs/imx8qxp_mek.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 7383124851..534cf96c58 100644 > --- a/configs/imx8mq_evk_defconfig > +++ b/configs/imx8mq_evk_defconfig > @@ -31,6 +31,7 @@ CONFIG_DM_GPIO=y > CONFIG_DM_I2C=y > CONFIG_SYS_I2C_MXC=y > CONFIG_DM_MMC=y > +CONFIG_FSL_ESDHC=y > CONFIG_SUPPORT_EMMC_BOOT=y > CONFIG_DM_ETH=y > CONFIG_PINCTRL=y > diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig > index 1a6ce3abf8..173568c0da 100644 > --- a/configs/imx8qm_mek_defconfig > +++ b/configs/imx8qm_mek_defconfig > @@ -52,6 +52,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/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig > index c4a8cf3881..7021bd5da8 100644 > --- a/configs/imx8qxp_mek_defconfig > +++ b/configs/imx8qxp_mek_defconfig > @@ -55,6 +55,7 @@ CONFIG_I2C_MUX=y > CONFIG_I2C_MUX_PCA954x=y > CONFIG_MISC=y > CONFIG_DM_MMC=y > +CONFIG_FSL_ESDHC=y > CONFIG_SUPPORT_EMMC_BOOT=y > CONFIG_PHYLIB=y > CONFIG_PHY_ADDR_ENABLE=y > diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig > index 0ca83cbfea..9b6ff4a85b 100644 > --- a/configs/kp_imx6q_tpc_defconfig > +++ b/configs/kp_imx6q_tpc_defconfig > @@ -34,6 +34,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 bf98466576..0360d9d4e8 100644 > --- a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig > +++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig > @@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y > CONFIG_SATA_CEVA=y 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 aa3256fb43..08eedec827 100644 > --- a/configs/ls1012afrwy_qspi_defconfig > +++ b/configs/ls1012afrwy_qspi_defconfig > @@ -32,6 +32,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y > CONFIG_SATA_CEVA=y 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 b0fdad6dd0..2c3d8931e7 100644 > --- a/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig > +++ b/configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig > @@ -31,6 +31,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y > CONFIG_SATA_CEVA=y 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 6a70f5881b..19aae5aa1a 100644 > --- a/configs/ls1012afrwy_tfa_defconfig > +++ b/configs/ls1012afrwy_tfa_defconfig > @@ -32,6 +32,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y > CONFIG_SATA_CEVA=y 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 e4fa2df342..16e4136fa9 100644 > --- a/include/configs/imx8mq_evk.h > +++ b/include/configs/imx8mq_evk.h > @@ -216,7 +216,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/imx8qm_mek.h b/include/configs/imx8qm_mek.h > index 2bdf3be654..3679b487e1 100644 > --- a/include/configs/imx8qm_mek.h > +++ b/include/configs/imx8qm_mek.h > @@ -47,7 +47,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/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h > index 261661a978..18cc930de2 100644 > --- a/include/configs/imx8qxp_mek.h > +++ b/include/configs/imx8qxp_mek.h > @@ -46,7 +46,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_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h > index d2ebf92953..dbae276121 100644 > --- a/include/configs/kp_imx6q_tpc.h > +++ b/include/configs/kp_imx6q_tpc.h > @@ -39,7 +39,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 Reviewed-by: Peng Fan > > -- > 2.17.1