sunxi: dram: Optionally use standard JEDEC timings for sun[457]i

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

diff --git a/board/sunxi/dram_sun5i_auto.c b/board/sunxi/dram_sun5i_auto.c
index e86b08e67bd9968f39fabe95963185cf6c688d8f..bd9fd4bd27ed587b062d5854a8666d1a902588a8 100644 (file)
--- a/board/sunxi/dram_sun5i_auto.c
+++ b/board/sunxi/dram_sun5i_auto.c
@@ -10,18 +10,22 @@ static struct dram_para dram_para = {
        .density = 0,
        .io_width = 0,
        .bus_width = 0,
-       .cas = 9,
        .zq = CONFIG_DRAM_ZQ,
        .odt_en = 0,
        .size = 0,
+#ifdef CONFIG_DRAM_TIMINGS_VENDOR_MAGIC
+       .cas = 9,
        .tpr0 = 0x42d899b7,
        .tpr1 = 0xa090,
        .tpr2 = 0x22a00,
+       .emr2 = 0x10,
+#else
+#      include "dram_timings_sun4i.h"
+#endif
        .tpr3 = 0,
        .tpr4 = 0,
        .tpr5 = 0,
        .emr1 = CONFIG_DRAM_EMR1,
-       .emr2 = 0x10,
        .emr3 = 0,
 };