summaryrefslogtreecommitdiffstats
path: root/configs/Mele_I7_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-07-25 09:04:18 -0400
committerTom Rini <trini@konsulko.com>2015-07-25 09:04:18 -0400
commit26473945ad6667183296e7edee2a65edf31bb6f7 (patch)
treeceb27f9307dbc86e20a5a9eb392c786e2fee5025 /configs/Mele_I7_defconfig
parent6f4e050639241218987541f4729172e4e0e2ff31 (diff)
parent7f7409ba6ab937b73f16bac8d83e215db86ace3d (diff)
downloadblackbird-obmc-uboot-26473945ad6667183296e7edee2a65edf31bb6f7.tar.gz
blackbird-obmc-uboot-26473945ad6667183296e7edee2a65edf31bb6f7.zip
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'configs/Mele_I7_defconfig')
-rw-r--r--configs/Mele_I7_defconfig7
1 files changed, 2 insertions, 5 deletions
diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
index 7f083a7504..774a92f381 100644
--- a/configs/Mele_I7_defconfig
+++ b/configs/Mele_I7_defconfig
@@ -7,16 +7,13 @@ CONFIG_USB2_VBUS_PIN=""
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-i7"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
-CONFIG_DM_ETH=y
CONFIG_ETH_DESIGNWARE=y
-CONFIG_DM_SERIAL=y
CONFIG_AXP221_DCDC1_VOLT=3300
CONFIG_AXP221_DLDO1_VOLT=3300
CONFIG_AXP221_DLDO4_VOLT=3300
CONFIG_AXP221_ALDO1_VOLT=3300
-CONFIG_USB=y
-CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
OpenPOWER on IntegriCloud