X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configs%2FMele_M9_defconfig;h=1516107d2eeac4a6fa463ff9d07fea2f5804fff3;hb=5dfc9d3766ee74f3711747a5fc9fa763ae82747c;hp=eaf9a7e349b3c765228398ccbbe4f3f34aff807a;hpb=306df2c8241bd363c71a99841630fb5e85d81fae;p=u-boot

diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index eaf9a7e349..1516107d2e 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -1,20 +1,22 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN6I=y
+CONFIG_DRAM_ZQ=120
+CONFIG_USB1_VBUS_PIN="PC27"
+CONFIG_USB2_VBUS_PIN=""
+CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_FDTFILE="sun6i-a31-m9.dtb"
-+S:CONFIG_ARM=y
-+S:CONFIG_ARCH_SUNXI=y
-+S:CONFIG_MACH_SUN6I=y
-+S:CONFIG_DRAM_CLK=312
-+S:CONFIG_DRAM_ZQ=120
-# The Mele M9 uses 3.3V for general IO
-+S:CONFIG_AXP221_DCDC1_VOLT=3300
-# Ethernet phy power
-+S:CONFIG_AXP221_DLDO1_VOLT=3300
-# USB hub power
-+S:CONFIG_AXP221_DLDO4_VOLT=3300
-# Wifi power
-+S:CONFIG_AXP221_ALDO1_VOLT=3300
-# Vbus gpio for usb1
-+S:CONFIG_USB1_VBUS_PIN="PC27"
-# No Vbus gpio for usb2
-+S:CONFIG_USB2_VBUS_PIN=""
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_ISO_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_ETH_DESIGNWARE=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_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y