summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-01-30 12:24:32 -0500
committerTom Rini <trini@konsulko.com>2019-01-30 12:24:32 -0500
commit552452f80caf1e1069e547b6605987427e93111b (patch)
tree2411445059fb8750ad6439be089399840cc3ba95 /configs
parent748ad078eefea2ee5a3c8e53ca46e9e93c2fc7f1 (diff)
parenta7cca5793774ee139b75a704d6efaa4d29f09f93 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- Enable DM_MMC support
Diffstat (limited to 'configs')
-rw-r--r--configs/Linksprite_pcDuino3_defconfig1
-rw-r--r--configs/amarula_a64_relic_defconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 9156f132d1f..18f658e96b1 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -14,7 +14,6 @@ CONFIG_SPL_I2C_SUPPORT=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
CONFIG_SCSI_AHCI=y
-CONFIG_DM_MMC=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_MII=y
CONFIG_SUN7I_GMAC=y
diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig
index f5857cfbb37..2e6011fa457 100644
--- a/configs/amarula_a64_relic_defconfig
+++ b/configs/amarula_a64_relic_defconfig
@@ -11,5 +11,7 @@ CONFIG_NR_DRAM_BANKS=1
# CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y