| Message ID | 20190521085215.6263-2-yangbo.lu@nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | Peng Fan |
| Headers | show |
| Series | Split fsl_esdhc driver for i.MX | expand |
> 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 <yangbo.lu@nxp.com> > --- > 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 <peng.fan@nxp.com> > > -- > 2.17.1
> -----Original Message----- > From: Y.b. Lu > Sent: Tuesday, May 21, 2019 4:52 PM > To: u-boot@lists.denx.de > Cc: Stefano Babic <sbabic@denx.de>; Fabio Estevam <festevam@gmail.com>; > dl-uboot-imx <uboot-imx@nxp.com>; Albert Aribaud > <albert.u.boot@aribaud.net>; Eddy Petrișor <eddy.petrisor@gmail.com>; > Akshay Bhat <akshaybhat@timesys.com>; Ken Lin > <Ken.Lin@advantech.com.tw>; Heiko Schocher <hs@denx.de>; Christian > Gmeiner <christian.gmeiner@gmail.com>; Stefan Roese <sr@denx.de>; Patrick > Bruenn <p.bruenn@beckhoff.com>; Troy Kisky > <troy.kisky@boundarydevices.com>; Uri Mashiach > <uri.mashiach@compulab.co.il>; Nikita Kiryanov <nikita@compulab.co.il>; > Otavio Salvador <otavio@ossystems.com.br>; Andreas Geisreiter > <ageisreiter@dh-electronics.de>; Ludwig Zenz <lzenz@dh-electronics.de>; Eric > Bénard <eric@eukrea.com>; Peng Fan <peng.fan@nxp.com>; Jason Liu > <jason.hui.liu@nxp.com>; Ye Li <ye.li@nxp.com>; Adrian Alonso > <adrian.alonso@nxp.com>; Alison Wang <alison.wang@nxp.com>; > tharvey@gateworks.com; Ian Ray <ian.ray@ge.com>; Marcin Niestroj > <m.niestroj@grinn-global.com>; Andrej Rosano <andrej@inversepath.com>; > Marek Vasut <marex@denx.de>; Lukasz Majewski <lukma@denx.de>; Adam > Ford <aford173@gmail.com>; Olaf Mandel <o.mandel@menlosystems.com>; > Martyn Welch <martyn.welch@collabora.com>; Ingo Schroeck > <open-source@samtec.de>; Boris Brezillon > <boris.brezillon@free-electrons.com>; Soeren Moch <smoch@web.de>; > Richard Hu <richard.hu@technexion.com>; Vanessa Maegima > <vanessa.maegima@nxp.com>; Max Krummenacher > <max.krummenacher@toradex.com>; Stefan Agner > <stefan.agner@toradex.com>; Markus Niebel <Markus.Niebel@tq-group.com>; > Breno Matheus Lima <breno.lima@nxp.com>; Francesco Montefoschi > <francesco.montefoschi@udoo.org>; Parthiban Nallathambi > <parthitce@gmail.com>; Albert ARIBAUD <albert.aribaud@3adev.fr>; Jagan Teki > <jagan@amarulasolutions.com>; Raffaele RECALCATI > <raffaele.recalcati@bticino.it>; Simone CIANNI <simone.cianni@bticino.it>; > Bhaskar Upadhaya <bhaskar.upadhaya@nxp.com>; Vinitha V Pillai > <vinitha.pillai@nxp.com>; Prabhakar Kushwaha > <prabhakar.kushwaha@nxp.com>; Rajesh Bhagat <rajesh.bhagat@nxp.com>; > Antti Mäentausta <antti.maentausta@ge.com>; Sébastien Szymanski > <sebastien.szymanski@armadeus.com>; Lucile Quirion > <lucile.quirion@savoirfairelinux.com>; Alexey Brodkin > <abrodkin@synopsys.com>; Trevor Woerner <trevor@toganlabs.com>; Anatolij > Gustschin <agust@denx.de>; Denis Zalevskiy <denis.zalevskiy@ge.com>; Fabien > Lahoudere <fabien.lahoudere@collabora.com>; Joe Hershberger > <joe.hershberger@ni.com>; Simon Goldschmidt > <simon.k.r.goldschmidt@gmail.com>; James Byrne > <james.byrne@origamienergy.com>; Angelo Dureghello <angelo@sysam.it>; Y.b. > Lu <yangbo.lu@nxp.com> > 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 <yangbo.lu@nxp.com> > --- > 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(-) Acked-by: Jason Liu <Jason.hui.liu@nxp.com> > > -- > 2.17.1
On Tue, 21 May 2019 08:51:42 +0000 "Y.b. Lu" <yangbo.lu@nxp.com> wrote: > Moved CONFIG_FSL_ESDHC from header files to defconfig files. > > Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> > --- > Changes for v2: > - Rebased. > Changes for v3: > - Rebased. Reviewed-by: Lukasz Majewski <lukma@denx.de> > --- > 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 > Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
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
Moved CONFIG_FSL_ESDHC from header files to defconfig files. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- 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(-)