X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=configs%2FMele_I7_defconfig;h=0d1c90e2f68298851d03d75f78a39a43ffecece8;hb=4d7100a61d6fe0652dd0e8b7b3cc31ad37483d64;hp=e2c63c597a7636d96a9ae9550206a0242d22a22f;hpb=44857532cfdfaa0514b02de8f9c3b96392d572b8;p=people%2Fms%2Fu-boot.git

diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig
index e2c63c597a..0d1c90e2f6 100644
--- a/configs/Mele_I7_defconfig
+++ b/configs/Mele_I7_defconfig
@@ -1,26 +1,20 @@
-# The Mele I7 is a Allwinner based Android TV box.
-#
-# It features a A31 SOC, 1G RAM, 8GB NAND, HDMI out, A/V out,
-# SPDIF, IrDA, 3 USB A, 1 USB micro OTG and Wireless LAN.
-#
-# For more details see: http://linux-sunxi.org/Mele_I7
+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-i7"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
-CONFIG_FDTFILE="sun6i-a31-i7.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 I7 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_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
+CONFIG_HUSH_PARSER=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+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_USB_EHCI_HCD=y