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

[people/ms/u-boot.git] / configs / Cubieboard_defconfig

diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index eafa09d9952ba8a0f8f0a0893ecee0550ee1f888..4efc6e147e88c0b4f8d263f531db5f1c49ee22c9 100644 (file)
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -1,6 +1,9 @@
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
 CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
-+S:CONFIG_TARGET_SUN4I=y
++S:CONFIG_MACH_SUN4I=y
++S:CONFIG_DRAM_CLK=480
++S:CONFIG_DRAM_ZQ=123
++S:CONFIG_DRAM_EMR1=0