X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=configs%2FMele_M9_defconfig;h=067d9bd90cb332943b9b493adfe704630fddfa94;hb=9e39003e7ffa327adaef468840196de2e8820d2f;hp=f46439fa4e8bb91d4d0b90827d82869a6c9b640d;hpb=bdf790fabc8185112b3f699c8a25aab09c50239e;p=people%2Fms%2Fu-boot.git

diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index f46439fa4e..067d9bd90c 100644
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -1,18 +1,21 @@
+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"
-CONFIG_FDTFILE="sun6i-a31-m9.dtb"
-+S:CONFIG_ARM=y
-+S:CONFIG_ARCH_SUNXI=y
-+S:CONFIG_MACH_SUN6I=y
-+S:CONFIG_TARGET_MELE_M9=y
-# 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
-# HDMI power ?
-+S:CONFIG_AXP221_ALDO2_VOLT=1800
-+S:CONFIG_AXP221_ALDO3_VOLT=3000
-# No Vbus gpio for usb1
-+S:CONFIG_USB1_VBUS_PIN=""
+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_CMD_GPIO=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_AXP_DCDC1_VOLT=3300
+CONFIG_AXP_ALDO1_VOLT=3300
+CONFIG_AXP_DLDO1_VOLT=3300
+CONFIG_AXP_DLDO4_VOLT=3300
+CONFIG_SYS_NS16550=y
+CONFIG_USB_EHCI_HCD=y