Re: [U-Boot] [PATCH] sunxi: Convert sun7i boards to use auto dram configuration
On Wed, 2015-01-21 at 20:54 +0100, Hans de Goede wrote: Currently we've separate detailed dram settings for all sun7i boards, this moves them over to using auto dram configuration so that we can get rid of all the per board dram_foo.c files. This has been tested on a A20-Olinuxino-Lime, A20-Olinuxino_MICRO, Bananapi, Bananapro, Cubieboard2, Cubietruck, Mele_M3 and a Linksprite_pcDuino3. Signed-off-by: Hans de Goede hdego...@redhat.com As with the previous mail -- no config adjustment? with or without: Acked-by: Ian Campbell i...@hellion.org.uk ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] sunxi: Convert sun7i boards to use auto dram configuration
Hi, On 22-01-15 13:07, Ian Campbell wrote: On Thu, 2015-01-22 at 12:12 +0100, Hans de Goede wrote: Hi, On 22-01-15 11:48, Ian Campbell wrote: On Wed, 2015-01-21 at 20:54 +0100, Hans de Goede wrote: Currently we've separate detailed dram settings for all sun7i boards, this moves them over to using auto dram configuration so that we can get rid of all the per board dram_foo.c files. This has been tested on a A20-Olinuxino-Lime, A20-Olinuxino_MICRO, Bananapi, Bananapro, Cubieboard2, Cubietruck, Mele_M3 and a Linksprite_pcDuino3. Signed-off-by: Hans de Goede hdego...@redhat.com As with the previous mail -- no config adjustment? What do you mean with no config adjustment ? Sorry, my mail was acting up so you won't have seen the previous mail (it disappeared into the Ether...) 1421924513.23842.14.ca...@hellion.org.uk is a resend of what I was talking about. Also have you seen the preceding sunxi: Drop qt840a_defconfig patch (send a day earlier or so) My lost reply to this was the previous mail referred to above... Ah I see, yes I do plan to drop the TARGET stuff eventually, my plan is to first add a new Kconfig for GMAC thingie, as well as also convert sun5i and then remove all the TARGET stuff. Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] sunxi: Convert sun7i boards to use auto dram configuration
(my MUA is playing up today, not sure if this went either to you or to the list, so resending, the comments apply equally to Drop qt840a_defconfig too) On Wed, 2015-01-21 at 20:54 +0100, Hans de Goede wrote: Currently we've separate detailed dram settings for all sun7i boards, this moves them over to using auto dram configuration so that we can get rid of all the per board dram_foo.c files. This has been tested on a A20-Olinuxino-Lime, A20-Olinuxino_MICRO, Bananapi, Bananapro, Cubieboard2, Cubietruck, Mele_M3 and a Linksprite_pcDuino3. Did you not want to remove the Kconfig entries and the CONFIG_TARGET_* from the defconfigs too? (at least for those boards which don't have magic things like the BANANA* do) Either way: Acked-by: Ian Campbell i...@hellion.org.uk ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] sunxi: Convert sun7i boards to use auto dram configuration
On Thu, 2015-01-22 at 12:12 +0100, Hans de Goede wrote: Hi, On 22-01-15 11:48, Ian Campbell wrote: On Wed, 2015-01-21 at 20:54 +0100, Hans de Goede wrote: Currently we've separate detailed dram settings for all sun7i boards, this moves them over to using auto dram configuration so that we can get rid of all the per board dram_foo.c files. This has been tested on a A20-Olinuxino-Lime, A20-Olinuxino_MICRO, Bananapi, Bananapro, Cubieboard2, Cubietruck, Mele_M3 and a Linksprite_pcDuino3. Signed-off-by: Hans de Goede hdego...@redhat.com As with the previous mail -- no config adjustment? What do you mean with no config adjustment ? Sorry, my mail was acting up so you won't have seen the previous mail (it disappeared into the Ether...) 1421924513.23842.14.ca...@hellion.org.uk is a resend of what I was talking about. Also have you seen the preceding sunxi: Drop qt840a_defconfig patch (send a day earlier or so) My lost reply to this was the previous mail referred to above... Ian. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] sunxi: Convert sun7i boards to use auto dram configuration
Hi, On 22-01-15 11:48, Ian Campbell wrote: On Wed, 2015-01-21 at 20:54 +0100, Hans de Goede wrote: Currently we've separate detailed dram settings for all sun7i boards, this moves them over to using auto dram configuration so that we can get rid of all the per board dram_foo.c files. This has been tested on a A20-Olinuxino-Lime, A20-Olinuxino_MICRO, Bananapi, Bananapro, Cubieboard2, Cubietruck, Mele_M3 and a Linksprite_pcDuino3. Signed-off-by: Hans de Goede hdego...@redhat.com As with the previous mail -- no config adjustment? What do you mean with no config adjustment ? Also have you seen the preceding sunxi: Drop qt840a_defconfig patch (send a day earlier or so) Regards, Hans ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] sunxi: Convert sun7i boards to use auto dram configuration
Currently we've separate detailed dram settings for all sun7i boards, this
moves them over to using auto dram configuration so that we can get rid of
all the per board dram_foo.c files.
This has been tested on a A20-Olinuxino-Lime, A20-Olinuxino_MICRO, Bananapi,
Bananapro, Cubieboard2, Cubietruck, Mele_M3 and a Linksprite_pcDuino3.
Signed-off-by: Hans de Goede hdego...@redhat.com
---
board/sunxi/Makefile | 12 +---
board/sunxi/dram_a20_olinuxino_l.c| 31 ---
board/sunxi/dram_a20_olinuxino_l2.c | 31 ---
board/sunxi/dram_cubieboard2.c| 31 ---
board/sunxi/dram_cubietruck.c | 31 ---
board/sunxi/dram_linksprite_pcduino3.c| 31 ---
board/sunxi/dram_sun7i_384_1024_iow16.c | 31 ---
configs/A20-OLinuXino-Lime2_defconfig | 3 +++
configs/A20-OLinuXino-Lime_defconfig | 3 +++
configs/A20-OLinuXino_MICRO_defconfig | 3 +++
configs/Bananapi_defconfig| 3 +++
configs/Bananapro_defconfig | 3 +++
configs/Cubieboard2_defconfig | 3 +++
configs/Cubietruck_defconfig | 3 +++
configs/Linksprite_pcDuino3_defconfig | 3 +++
configs/Linksprite_pcDuino3_fdt_defconfig | 3 +++
configs/MSI_Primo73_defconfig | 3 +++
configs/Mele_M3_defconfig | 3 +++
18 files changed, 34 insertions(+), 197 deletions(-)
delete mode 100644 board/sunxi/dram_a20_olinuxino_l.c
delete mode 100644 board/sunxi/dram_a20_olinuxino_l2.c
delete mode 100644 board/sunxi/dram_cubieboard2.c
delete mode 100644 board/sunxi/dram_cubietruck.c
delete mode 100644 board/sunxi/dram_linksprite_pcduino3.c
delete mode 100644 board/sunxi/dram_sun7i_384_1024_iow16.c
diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile
index 0522f3c..71edb83 100644
--- a/board/sunxi/Makefile
+++ b/board/sunxi/Makefile
@@ -12,21 +12,11 @@ obj-y += board.o
obj-$(CONFIG_SUNXI_GMAC) += gmac.o
obj-$(CONFIG_SUNXI_AHCI) += ahci.o
obj-$(CONFIG_MACH_SUN4I) += dram_sun4i_auto.o
+obj-$(CONFIG_MACH_SUN7I) += dram_sun5i_auto.o
obj-$(CONFIG_TARGET_A10S_OLINUXINO_M) += dram_a10s_olinuxino_m.o
obj-$(CONFIG_TARGET_A13_OLINUXINO) += dram_a13_olinuxino.o
obj-$(CONFIG_TARGET_A13_OLINUXINOM)+= dram_a13_oli_micro.o
-obj-$(CONFIG_TARGET_A20_OLINUXINO_L) += dram_a20_olinuxino_l.o
-obj-$(CONFIG_TARGET_A20_OLINUXINO_L2) += dram_a20_olinuxino_l2.o
-obj-$(CONFIG_TARGET_A20_OLINUXINO_M) += dram_sun7i_384_1024_iow16.o
# This is not a typo, uses the same mem settings as the a10s-olinuxino-m
obj-$(CONFIG_TARGET_AUXTEK_T004) += dram_a10s_olinuxino_m.o
-obj-$(CONFIG_TARGET_BANANAPI) += dram_bananapi.o
-obj-$(CONFIG_TARGET_BANANAPRO) += dram_bananapi.o
-obj-$(CONFIG_TARGET_CUBIEBOARD2) += dram_cubieboard2.o
-obj-$(CONFIG_TARGET_CUBIETRUCK)+= dram_cubietruck.o
-obj-$(CONFIG_TARGET_I12_TVBOX) += dram_sun5i_auto.o
-obj-$(CONFIG_TARGET_MELE_M3) += dram_sun7i_384_1024_iow16.o
obj-$(CONFIG_TARGET_MK802_A10S)+= dram_sun5i_auto.o
-obj-$(CONFIG_TARGET_MSI_PRIMO73) += dram_sun7i_384_1024_iow16.o
-obj-$(CONFIG_TARGET_PCDUINO3) += dram_linksprite_pcduino3.o
obj-$(CONFIG_TARGET_R7DONGLE) += dram_r7dongle.o
diff --git a/board/sunxi/dram_a20_olinuxino_l.c
b/board/sunxi/dram_a20_olinuxino_l.c
deleted file mode 100644
index 2c74999..000
--- a/board/sunxi/dram_a20_olinuxino_l.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 = 480,
- .type = 3,
- .rank_num = 1,
- .density = 4096,
- .io_width = 16,
- .bus_width = 16,
- .cas = 9,
- .zq = 0x7f,
- .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_a20_olinuxino_l2.c
b/board/sunxi/dram_a20_olinuxino_l2.c
deleted file mode 100644
index 2115d37..000
--- a/board/sunxi/dram_a20_olinuxino_l2.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 = 480,
- .type = 3,
- .rank_num = 1,
- .density = 4096,
- .io_width = 16,
- .bus_width = 32,
- .cas = 9,
- .zq = 0x7f,
- .odt_en = 0,
- .size = 1024,
- .tpr0 = 0x42d899b7,
- .tpr1 = 0xa090,
- .tpr2 = 0x22a00,
- .tpr3 = 0,
- .tpr4 = 0,
-
