diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-21 08:01:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-21 08:01:07 -0400 |
| commit | 235c5b8315c6a9eb566fd3d99a098cc6db869fc5 (patch) | |
| tree | 3eb6279dd316fa6b3509ca654502c6b590f56246 /configs | |
| parent | 9c067c873fcfe62affb5009c3a227d44c75938d5 (diff) | |
| parent | 2c62e313b14186d67f5bf26095f36a246cb0c3a4 (diff) | |
| download | u-boot-235c5b8315c6a9eb566fd3d99a098cc6db869fc5.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/odroid-xu3_defconfig | 2 | ||||
| -rw-r--r-- | configs/odroid_defconfig | 3 | ||||
| -rw-r--r-- | configs/origen_defconfig | 1 | ||||
| -rw-r--r-- | configs/s5pc210_universal_defconfig | 1 | ||||
| -rw-r--r-- | configs/trats2_defconfig | 1 | ||||
| -rw-r--r-- | configs/trats_defconfig | 1 |
6 files changed, 7 insertions, 2 deletions
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index fed24ec90d..d040af310a 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -25,7 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_ADC=y CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y -CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_S3C24X0=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_S5P=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index f4e9e9af5b..22e86e28c3 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -38,7 +38,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y -CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_S3C24X0=y +CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index dfb08fb240..573c9e29a7 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y +CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index c342fa96ee..021e6c5102 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -33,6 +33,7 @@ CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_SYS_I2C_S3C24X0=y +CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 8c92f2f408..16ac27fb95 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -37,6 +37,7 @@ CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_S3C24X0=y +CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 09797c3141..0f2445bdf4 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -36,6 +36,7 @@ CONFIG_OF_CONTROL=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_S3C24X0=y +CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y |