Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 60742bfb53178ae1b80242a8028d3d91479d092d

Authored by Yangbo Lu
Committed by Peng Fan
1 parent bdf97b5d39
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>
Tested-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Martyn Welch <martyn.welch@collabora.com>
Acked-by: Jason Liu <Jason.hui.liu@nxp.com>

Showing 22 changed files with 14 additions and 14 deletions Side-by-side Diff

configs/apalis-imx8qm_defconfig
Diff comments   View file @ 60742bf
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_SYS_I2C_IMX_LPI2C=y
36 36 CONFIG_MISC=y
37 37 CONFIG_DM_MMC=y
  38 +CONFIG_FSL_ESDHC=y
38 39 CONFIG_PHYLIB=y
39 40 CONFIG_PHY_ADDR_ENABLE=y
40 41 CONFIG_PHY_MICREL=y
configs/colibri-imx8qxp_defconfig
Diff comments   View file @ 60742bf
... ... @@ -34,6 +34,7 @@
34 34 CONFIG_SYS_I2C_IMX_LPI2C=y
35 35 CONFIG_MISC=y
36 36 CONFIG_DM_MMC=y
  37 +CONFIG_FSL_ESDHC=y
37 38 CONFIG_PHYLIB=y
38 39 CONFIG_PHY_ADDR_ENABLE=y
39 40 CONFIG_PHY_MICREL=y
configs/imx8mq_evk_defconfig
Diff comments   View file @ 60742bf
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_DM_I2C=y
31 31 CONFIG_SYS_I2C_MXC=y
32 32 CONFIG_DM_MMC=y
  33 +CONFIG_FSL_ESDHC=y
33 34 CONFIG_SUPPORT_EMMC_BOOT=y
34 35 CONFIG_DM_ETH=y
35 36 CONFIG_PINCTRL=y
configs/imx8qm_mek_defconfig
Diff comments   View file @ 60742bf
... ... @@ -51,6 +51,7 @@
51 51 CONFIG_I2C_MUX_PCA954x=y
52 52 CONFIG_MISC=y
53 53 CONFIG_DM_MMC=y
  54 +CONFIG_FSL_ESDHC=y
54 55 CONFIG_PHYLIB=y
55 56 CONFIG_PHY_ADDR_ENABLE=y
56 57 CONFIG_PHY_ATHEROS=y
configs/imx8qxp_mek_defconfig
Diff comments   View file @ 60742bf
... ... @@ -55,6 +55,7 @@
55 55 CONFIG_I2C_MUX_PCA954x=y
56 56 CONFIG_MISC=y
57 57 CONFIG_DM_MMC=y
  58 +CONFIG_FSL_ESDHC=y
58 59 CONFIG_SUPPORT_EMMC_BOOT=y
59 60 CONFIG_PHYLIB=y
60 61 CONFIG_PHY_ADDR_ENABLE=y
configs/kp_imx6q_tpc_defconfig
Diff comments   View file @ 60742bf
... ... @@ -34,6 +34,7 @@
34 34 # CONFIG_ISO_PARTITION is not set
35 35 # CONFIG_EFI_PARTITION is not set
36 36 CONFIG_ENV_IS_IN_MMC=y
  37 +CONFIG_FSL_ESDHC=y
37 38 CONFIG_PHYLIB=y
38 39 CONFIG_PHY_ATHEROS=y
39 40 CONFIG_FEC_MXC=y
configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
Diff comments   View file @ 60742bf
... ... @@ -31,6 +31,7 @@
31 31 CONFIG_DM=y
32 32 CONFIG_SATA_CEVA=y
33 33 CONFIG_DM_MMC=y
  34 +CONFIG_FSL_ESDHC=y
34 35 CONFIG_DM_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH=y
36 37 # CONFIG_SPI_FLASH_BAR is not set
configs/ls1012afrwy_qspi_defconfig
Diff comments   View file @ 60742bf
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_DM=y
33 33 CONFIG_SATA_CEVA=y
34 34 CONFIG_DM_MMC=y
  35 +CONFIG_FSL_ESDHC=y
35 36 CONFIG_DM_SPI_FLASH=y
36 37 CONFIG_SPI_FLASH=y
37 38 CONFIG_SPI_FLASH_WINBOND=y
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
Diff comments   View file @ 60742bf
... ... @@ -31,6 +31,7 @@
31 31 CONFIG_DM=y
32 32 CONFIG_SATA_CEVA=y
33 33 CONFIG_DM_MMC=y
  34 +CONFIG_FSL_ESDHC=y
34 35 CONFIG_DM_SPI_FLASH=y
35 36 CONFIG_SPI_FLASH=y
36 37 # CONFIG_SPI_FLASH_BAR is not set
configs/ls1012afrwy_tfa_defconfig
Diff comments   View file @ 60742bf
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_DM=y
33 33 CONFIG_SATA_CEVA=y
34 34 CONFIG_DM_MMC=y
  35 +CONFIG_FSL_ESDHC=y
35 36 CONFIG_DM_SPI_FLASH=y
36 37 CONFIG_SPI_FLASH=y
37 38 # CONFIG_SPI_FLASH_BAR is not set
configs/ls1028aqds_tfa_SECURE_BOOT_defconfig
Diff comments   View file @ 60742bf
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_SCSI_AHCI=y
33 33 CONFIG_SATA_CEVA=y
34 34 CONFIG_DM_MMC=y
  35 +CONFIG_FSL_ESDHC=y
35 36 CONFIG_DM_SPI_FLASH=y
36 37 CONFIG_SPI_FLASH=y
37 38 CONFIG_SPI_FLASH_SPANSION=y
configs/ls1028aqds_tfa_defconfig
Diff comments   View file @ 60742bf
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_SATA_CEVA=y
36 36 CONFIG_FSL_CAAM=y
37 37 CONFIG_DM_MMC=y
  38 +CONFIG_FSL_ESDHC=y
38 39 CONFIG_DM_SPI_FLASH=y
39 40 CONFIG_SPI_FLASH=y
40 41 CONFIG_SPI_FLASH_SPANSION=y
configs/ls1028ardb_tfa_SECURE_BOOT_defconfig
Diff comments   View file @ 60742bf
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_SCSI_AHCI=y
33 33 CONFIG_SATA_CEVA=y
34 34 CONFIG_DM_MMC=y
  35 +CONFIG_FSL_ESDHC=y
35 36 CONFIG_DM_SPI_FLASH=y
36 37 CONFIG_SPI_FLASH=y
37 38 CONFIG_SPI_FLASH_SPANSION=y
configs/ls1028ardb_tfa_defconfig
Diff comments   View file @ 60742bf
... ... @@ -35,6 +35,7 @@
35 35 CONFIG_SATA_CEVA=y
36 36 CONFIG_FSL_CAAM=y
37 37 CONFIG_DM_MMC=y
  38 +CONFIG_FSL_ESDHC=y
38 39 CONFIG_DM_SPI_FLASH=y
39 40 CONFIG_SPI_FLASH=y
40 41 CONFIG_SPI_FLASH_SPANSION=y
include/configs/apalis-imx8.h
Diff comments   View file @ 60742bf
... ... @@ -15,7 +15,6 @@
15 15  
16 16 #undef CONFIG_BOOTM_NETBSD
17 17  
18   -#define CONFIG_FSL_ESDHC
19 18 #define CONFIG_FSL_USDHC
20 19 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
21 20 #define USDHC1_BASE_ADDR 0x5b010000
include/configs/colibri-imx8x.h
Diff comments   View file @ 60742bf
... ... @@ -15,7 +15,6 @@
15 15  
16 16 #undef CONFIG_BOOTM_NETBSD
17 17  
18   -#define CONFIG_FSL_ESDHC
19 18 #define CONFIG_FSL_USDHC
20 19 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
21 20 #define USDHC1_BASE_ADDR 0x5b010000
include/configs/imx8mq_evk.h
Diff comments   View file @ 60742bf
... ... @@ -216,7 +216,6 @@
216 216 #define CONFIG_IMX_BOOTAUX
217 217  
218 218 #define CONFIG_CMD_MMC
219   -#define CONFIG_FSL_ESDHC
220 219 #define CONFIG_FSL_USDHC
221 220  
222 221 #define CONFIG_SYS_FSL_USDHC_NUM 2
include/configs/imx8qm_mek.h
Diff comments   View file @ 60742bf
... ... @@ -47,7 +47,6 @@
47 47 #undef CONFIG_CMD_CRC32
48 48 #undef CONFIG_BOOTM_NETBSD
49 49  
50   -#define CONFIG_FSL_ESDHC
51 50 #define CONFIG_FSL_USDHC
52 51 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
53 52 #define USDHC1_BASE_ADDR 0x5B010000
include/configs/imx8qxp_mek.h
Diff comments   View file @ 60742bf
... ... @@ -46,7 +46,6 @@
46 46 #undef CONFIG_CMD_CRC32
47 47 #undef CONFIG_BOOTM_NETBSD
48 48  
49   -#define CONFIG_FSL_ESDHC
50 49 #define CONFIG_FSL_USDHC
51 50 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
52 51 #define USDHC1_BASE_ADDR 0x5B010000
include/configs/kp_imx6q_tpc.h
Diff comments   View file @ 60742bf
... ... @@ -39,7 +39,6 @@
39 39 #define CONFIG_SYS_I2C_SPEED 100000
40 40  
41 41 /* MMC Configs */
42   -#define CONFIG_FSL_ESDHC
43 42 #define CONFIG_FSL_USDHC
44 43 #define CONFIG_SYS_FSL_ESDHC_ADDR 0
45 44 #define CONFIG_SYS_FSL_USDHC_NUM 2
include/configs/ls1012afrwy.h
Diff comments   View file @ 60742bf
... ... @@ -41,7 +41,6 @@
41 41  
42 42 /* MMC */
43 43 #ifdef CONFIG_MMC
44   -#define CONFIG_FSL_ESDHC
45 44 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
46 45 #endif
47 46  
include/configs/ls1028a_common.h
Diff comments   View file @ 60742bf
... ... @@ -164,7 +164,6 @@
164 164  
165 165 /* MMC */
166 166 #ifdef CONFIG_MMC
167   -#define CONFIG_FSL_ESDHC
168 167 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
169 168 #endif
170 169  
... ... @@ -177,12 +176,6 @@
177 176 #define CONFIG_ENV_SECT_SIZE 0x40000
178 177  
179 178 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
180   -
181   -/* MMC */
182   -#ifdef CONFIG_MMC
183   -#define CONFIG_FSL_ESDHC
184   -#define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
185   -#endif
186 179  
187 180 /* I2C bus multiplexer */
188 181 #define I2C_MUX_PCA_ADDR_PRI 0x77 /* Primary Mux*/