Signed-off-by: Paul Kocialkowski <[email protected]>
---
board/sunxi/Makefile | 8 +++----
board/sunxi/dram_a10s_olinuxino_m.c | 31 -------------------------
board/sunxi/dram_sun5i_432_512_busw16_iow16.c | 31 +++++++++++++++++++++++++
boards.cfg | 1 +
4 files changed, 36 insertions(+), 35 deletions(-)
delete mode 100644 board/sunxi/dram_a10s_olinuxino_m.c
create mode 100644 board/sunxi/dram_sun5i_432_512_busw16_iow16.c
diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile
index 28b0f6a..75a323e 100644
--- a/board/sunxi/Makefile
+++ b/board/sunxi/Makefile
@@ -12,7 +12,7 @@ obj-y += board.o
obj-$(CONFIG_SUNXI_GMAC) += gmac.o
obj-$(CONFIG_A10_MID_1GB) += dram_sun4i_360_1024_iow16.o
obj-$(CONFIG_A10_OLINUXINO_L) += dram_a10_olinuxino_l.o
-obj-$(CONFIG_A10S_OLINUXINO_M) += dram_a10s_olinuxino_m.o
+obj-$(CONFIG_A10S_OLINUXINO_M) += dram_sun5i_432_512_busw16_iow16.o
obj-$(CONFIG_A13_OLINUXINO) += dram_a13_olinuxino.o
obj-$(CONFIG_A13_OLINUXINOM) += dram_a13_oli_micro.o
obj-$(CONFIG_A13_MID) += dram_sun5i_408_512_busw16_iow8.o
@@ -21,9 +21,9 @@ obj-$(CONFIG_A20_OLINUXINO_L2) +=
dram_a20_olinuxino_l2.o
obj-$(CONFIG_A20_OLINUXINO_M) += dram_sun7i_384_1024_iow16.o
obj-$(CONFIG_A20_SOM) += dram_sun7i_384_1024_iow16.o
obj-$(CONFIG_AINOL_AW1) += dram_ainol_aw1.o
+obj-$(CONFIG_AMPE_A76) += dram_sun5i_432_512_busw16_iow16.o
obj-$(CONFIG_AUXTEK_T003) += dram_auxtek_t003.o
-# This is not a typo, uses the same mem settings as the a10s-olinuxino-m
-obj-$(CONFIG_AUXTEK_T004) += dram_a10s_olinuxino_m.o
+obj-$(CONFIG_AUXTEK_T004) += dram_sun5i_432_512_busw16_iow16.o
obj-$(CONFIG_BA10_TV_BOX) += dram_sun4i_384_1024_iow8.o
obj-$(CONFIG_COBY_MID7042) += dram_sun4i_408_1024_iow16.o
obj-$(CONFIG_COBY_MID8042) += dram_sun4i_360_1024_iow16.o
@@ -49,7 +49,7 @@ obj-$(CONFIG_A7HD) += dram_sun4i_360_1024_iow8.o
obj-$(CONFIG_I12_TVBOX) += dram_sun7i_384_1024_iow16.o
obj-$(CONFIG_ICOU_FATTY_I) += dram_icou_fatty_i.o
obj-$(CONFIG_INTERRA3) += dram_mk802ii_a20.o
-obj-$(CONFIG_INET_86VZ) += dram_a10s_olinuxino_m.o
+obj-$(CONFIG_INET_86VZ) += dram_sun5i_432_512_busw16_iow16.o
obj-$(CONFIG_INET97F_II) += dram_sun4i_408_512.o
obj-$(CONFIG_INET_K70HC) += dram_inet_k70hc.o
obj-$(CONFIG_ITEADA10) += dram_cubieboard.o
diff --git a/board/sunxi/dram_a10s_olinuxino_m.c
b/board/sunxi/dram_a10s_olinuxino_m.c
deleted file mode 100644
index 8900539..0000000
--- a/board/sunxi/dram_a10s_olinuxino_m.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* this file is generated, don't edit it yourself */
-
-#include <common.h>
-#include <asm/arch/dram.h>
-
-static struct dram_para dram_para = {
- .clock = 432,
- .type = 3,
- .rank_num = 1,
- .density = 4096,
- .io_width = 16,
- .bus_width = 16,
- .cas = 9,
- .zq = 123,
- .odt_en = 0,
- .size = 512,
- .tpr0 = 0x42d899b7,
- .tpr1 = 0xa090,
- .tpr2 = 0x22a00,
- .tpr3 = 0,
- .tpr4 = 0,
- .tpr5 = 0,
- .emr1 = 0x4,
- .emr2 = 0x10,
- .emr3 = 0,
-};
-
-unsigned long sunxi_dram_init(void)
-{
- return dramc_init(&dram_para);
-}
diff --git a/board/sunxi/dram_sun5i_432_512_busw16_iow16.c
b/board/sunxi/dram_sun5i_432_512_busw16_iow16.c
new file mode 100644
index 0000000..8900539
--- /dev/null
+++ b/board/sunxi/dram_sun5i_432_512_busw16_iow16.c
@@ -0,0 +1,31 @@
+/* this file is generated, don't edit it yourself */
+
+#include <common.h>
+#include <asm/arch/dram.h>
+
+static struct dram_para dram_para = {
+ .clock = 432,
+ .type = 3,
+ .rank_num = 1,
+ .density = 4096,
+ .io_width = 16,
+ .bus_width = 16,
+ .cas = 9,
+ .zq = 123,
+ .odt_en = 0,
+ .size = 512,
+ .tpr0 = 0x42d899b7,
+ .tpr1 = 0xa090,
+ .tpr2 = 0x22a00,
+ .tpr3 = 0,
+ .tpr4 = 0,
+ .tpr5 = 0,
+ .emr1 = 0x4,
+ .emr2 = 0x10,
+ .emr3 = 0,
+};
+
+unsigned long sunxi_dram_init(void)
+{
+ return dramc_init(&dram_para);
+}
diff --git a/boards.cfg b/boards.cfg
index 1124f74..e7db3b2 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -387,6 +387,7 @@ Active arm armv7 sunxi -
sunxi
Active arm armv7 sunxi - sunxi
A20-OLinuXino_MICRO_FEL
sun7i:A20_OLINUXINO_M,CONS_INDEX=1,STATUSLED=226,SPL_FEL,SUNXI_EMAC
-
Active arm armv7 sunxi - sunxi
A20-SOM
sun7i:A20_SOM,SPL,SUNXI_GMAC,RGMII,STATUSLED1=245,FAST_MBUS
-
Active arm armv7 sunxi - sunxi
Ainol_AW1 sun7i:AINOL_AW1,SPL
-
+Active arm armv7 sunxi - sunxi
Ampe_A76 sun5i:AMPE_A76,SPL,CONS_INDEX=2
-
Active arm armv7 sunxi - sunxi
Auxtek-T003
sun5i:AUXTEK_T003,SPL,AXP152_POWER,STATUSLED=34
-
Active arm armv7 sunxi - sunxi
Auxtek-T004
sun5i:AUXTEK_T004,SPL,AXP152_POWER,STATUSLED=34
-
Active arm armv7 sunxi - sunxi
ba10_tv_box sun4i:BA10_TV_BOX,SPL,SUNXI_EMAC
-
--
1.7.9.5
--
You received this message because you are subscribed to the Google Groups
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
