fdt_support: add missing #ifdef after merge

[karo-tx-uboot.git] / configs / i12-tvbox_defconfig

diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index ff86841f9da69d17886dda77b3078f4aa46b7146..157997f00140be9ae4e5ef22828e2ab43920e047 100644 (file)
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -1,4 +1,9 @@
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,SPL,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_SUN7I=y
+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
+CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN7I=y
+CONFIG_DRAM_CLK=384
+CONFIG_DRAM_ZQ=127
+CONFIG_DRAM_EMR1=4