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

[oweals/u-boot.git] / board / sunxi / dram_sun5i_auto.c

diff --git a/board/sunxi/dram_sun5i_auto.c b/board/sunxi/dram_sun5i_auto.c
index e52d54c32e4304e3892a68f4267be6727a3cbbfe..596a2060725d313ee7e176a4e09a8202f6ebded6 100644 (file)
--- a/board/sunxi/dram_sun5i_auto.c
+++ b/board/sunxi/dram_sun5i_auto.c
@@ -2,6 +2,7 @@
 
 #include <common.h>
 #include <asm/arch/dram.h>
+#include <linux/kconfig.h>
 
 static struct dram_para dram_para = {
        .clock = CONFIG_DRAM_CLK,
@@ -12,7 +13,7 @@ static struct dram_para dram_para = {
        .io_width = 0,
        .bus_width = 0,
        .zq = CONFIG_DRAM_ZQ,
-       .odt_en = CONFIG_DRAM_ODT_EN,
+       .odt_en = IS_ENABLED(CONFIG_DRAM_ODT_EN),
        .size = 0,
 #ifdef CONFIG_DRAM_TIMINGS_VENDOR_MAGIC
        .cas = 9,
@@ -24,7 +25,7 @@ static struct dram_para dram_para = {
 #      include "dram_timings_sun4i.h"
        .active_windowing = 1,
 #endif
-       .tpr3 = 0,
+       .tpr3 = CONFIG_DRAM_TPR3,
        .tpr4 = 0,
        .tpr5 = 0,
        .emr1 = CONFIG_DRAM_EMR1,