diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-17 11:39:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-17 11:39:43 -0500 |
| commit | bfd07670a48d9fbf22646c93e07dcd8cbc8d0864 (patch) | |
| tree | 3ce5c9c53c29c93bd72adfecfc0085b8a9346ad6 /configs | |
| parent | 373ae16c9282cf6dfb39cd6e1b8ad26098635ca2 (diff) | |
| parent | 2cfa35c47b9c9b80c8ff084f55391a03fd575956 (diff) | |
| download | u-boot-bfd07670a48d9fbf22646c93e07dcd8cbc8d0864.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
- Enable eMMC driver for LD11/LD20 SoCs
- Refactoring of SoC init code
- Bug fix of pinctrl driver
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/uniphier_ld11_defconfig | 4 | ||||
| -rw-r--r-- | configs/uniphier_ld20_defconfig | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configs/uniphier_ld11_defconfig b/configs/uniphier_ld11_defconfig index e939124be60..9c77b10e585 100644 --- a/configs/uniphier_ld11_defconfig +++ b/configs/uniphier_ld11_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_ARCH_UNIPHIER_LD11=y CONFIG_MICRO_SUPPORT_CARD=y -# CONFIG_MMC is not set CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld11-ref" # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set @@ -28,6 +27,9 @@ CONFIG_SPL_OF_TRANSLATE=y CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_CADENCE=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index 449093a3fb2..190ebd51ea2 100644 --- a/configs/uniphier_ld20_defconfig +++ b/configs/uniphier_ld20_defconfig @@ -28,6 +28,8 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_CADENCE=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y |