Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / configs / Mele_M9_defconfig

diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index ea35024c1bcc0c74375500a4d86fcfbf052fb243..f7bd7fc3004dbe8106c2f68bee0f4fdc6dd8aa23 100644 (file)
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -1,21 +1,19 @@
-CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9"
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
+CONFIG_SPL=y
 CONFIG_MACH_SUN6I=y
-CONFIG_DRAM_CLK=312
 CONFIG_DRAM_ZQ=120
-# The Mele M9 uses 3.3V for general IO
-CONFIG_AXP221_DCDC1_VOLT=3300
-# Ethernet phy power
-CONFIG_AXP221_DLDO1_VOLT=3300
-# USB hub power
-CONFIG_AXP221_DLDO4_VOLT=3300
-# Wifi power
-CONFIG_AXP221_ALDO1_VOLT=3300
-# Vbus gpio for usb1
 CONFIG_USB1_VBUS_PIN="PC27"
-# No Vbus gpio for usb2
 CONFIG_USB2_VBUS_PIN=""
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9"
+CONFIG_PHY_REALTEK=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_MII=y
+CONFIG_SUN7I_GMAC=y
+CONFIG_AXP_DCDC1_VOLT=3300
+CONFIG_AXP_ALDO1_VOLT=3300
+CONFIG_AXP_DLDO1_VOLT=3300
+CONFIG_AXP_DLDO4_VOLT=3300
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y