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

[u-boot] / configs / A10s-OLinuXino-M_defconfig

diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index e2bebf827cc5520294f4961bac6dc5eae1f999a4..9498a6d7523552bc6a21dbcd4bde2e5299e7e458 100644 (file)
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=432
 CONFIG_MMC0_CD_PIN="PG1"
@@ -9,10 +9,12 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=1
 CONFIG_USB1_VBUS_PIN="PB10"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC"
-CONFIG_SPL=y
-# CONFIG_CMD_IMLS is not set
+CONFIG_SPL_I2C_SUPPORT=y
 # CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SUN4I_EMAC=y
 CONFIG_AXP152_POWER=y
+CONFIG_CONS_INDEX=2
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y