summaryrefslogtreecommitdiffstats
path: root/configs/Cubieboard2_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-05-04 17:50:20 -0400
committerTom Rini <trini@konsulko.com>2015-05-04 17:50:20 -0400
commit622da1c36aee9c39075f2109848228a5737925c0 (patch)
treee08cd8d033fd09e415d603bab26691d776365adb /configs/Cubieboard2_defconfig
parent281239ad9dc2a695a53ab34dda44cdbe31c69122 (diff)
parentfd01ae1384a67c354eb53fc8a4c1e0d519014ae8 (diff)
downloadtalos-obmc-uboot-622da1c36aee9c39075f2109848228a5737925c0.tar.gz
talos-obmc-uboot-622da1c36aee9c39075f2109848228a5737925c0.zip
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'configs/Cubieboard2_defconfig')
-rw-r--r--configs/Cubieboard2_defconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index 7f65c1d472..092d6b0995 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -1,6 +1,6 @@
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
CONFIG_MMC0_CD_PIN="PH1"
CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y
@@ -9,5 +9,3 @@ CONFIG_DRAM_CLK=480
CONFIG_DRAM_ZQ=127
CONFIG_DRAM_EMR1=4
CONFIG_ETH_DESIGNWARE=y
-CONFIG_NETDEVICES=y
-CONFIG_NET=y
OpenPOWER on IntegriCloud