-CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS"
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
CONFIG_ARM=y
-CONFIG_TARGET_SUN6I=y
-CONFIG_FDTFILE="sun6i-a31-colombus.dtb"
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN6I=y
+CONFIG_DRAM_CLK=240
+CONFIG_DRAM_ZQ=251
+# Wifi power
+CONFIG_AXP221_ALDO1_VOLT=3300
+# No Vbus gpio for usb1
+CONFIG_USB1_VBUS_PIN=""
+CONFIG_ETH_DESIGNWARE=y