projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Move some CPU functions out of common.h
[oweals/u-boot.git]
/
board
/
sunxi
/
dram_sun4i_auto.c
diff --git
a/board/sunxi/dram_sun4i_auto.c
b/board/sunxi/dram_sun4i_auto.c
index 826bacf94ab1bc88b75f5aa5635e8725a5a0d780..7d4409b51e9882ca3707154f4c8f4939f43880af 100644
(file)
--- a/
board/sunxi/dram_sun4i_auto.c
+++ b/
board/sunxi/dram_sun4i_auto.c
@@
-8,19
+8,25
@@
static struct dram_para dram_para = {
.density = 0,
.io_width = 0,
.bus_width = 0,
.density = 0,
.io_width = 0,
.bus_width = 0,
- .cas = 6,
.zq = CONFIG_DRAM_ZQ,
.zq = CONFIG_DRAM_ZQ,
- .odt_en =
0
,
+ .odt_en =
IS_ENABLED(CONFIG_DRAM_ODT_EN)
,
.size = 0,
.size = 0,
+#ifdef CONFIG_DRAM_TIMINGS_VENDOR_MAGIC
+ .cas = 6,
.tpr0 = 0x30926692,
.tpr1 = 0x1090,
.tpr2 = 0x1a0c8,
.tpr0 = 0x30926692,
.tpr1 = 0x1090,
.tpr2 = 0x1a0c8,
- .tpr3 = 0,
+ .emr2 = 0,
+#else
+# include "dram_timings_sun4i.h"
+ .active_windowing = 1,
+#endif
+ .tpr3 = CONFIG_DRAM_TPR3,
.tpr4 = 0,
.tpr5 = 0,
.emr1 = CONFIG_DRAM_EMR1,
.tpr4 = 0,
.tpr5 = 0,
.emr1 = CONFIG_DRAM_EMR1,
- .emr2 = 0,
.emr3 = 0,
.emr3 = 0,
+ .dqs_gating_delay = CONFIG_DRAM_DQS_GATING_DELAY,
};
unsigned long sunxi_dram_init(void)
};
unsigned long sunxi_dram_init(void)