diff mbox

[U-Boot] sun7i: Add support for Olimex A20-OLinuXino-LIME

Message ID 1408513027-3350-1-git-send-email-naobsd@gmail.com
State Changes Requested
Delegated to: Ian Campbell
Headers show

Commit Message

FUKAUMI Naoki Aug. 20, 2014, 5:37 a.m. UTC
This patch adds support for Olimex A20-OLinuXino-LIME board.

Signed-off-by: FUKAUMI Naoki <naobsd@gmail.com>
---
 board/sunxi/Makefile                 |  1 +
 board/sunxi/dram_a20_olinuxino_l.c   | 31 +++++++++++++++++++++++++++++++
 configs/A20-OLinuXino-Lime_defconfig |  5 +++++
 3 files changed, 37 insertions(+)
 create mode 100644 board/sunxi/dram_a20_olinuxino_l.c
 create mode 100644 configs/A20-OLinuXino-Lime_defconfig

Comments

Ian Campbell Aug. 21, 2014, 8:06 p.m. UTC | #1
On Wed, 2014-08-20 at 14:37 +0900, FUKAUMI Naoki wrote:
> This patch adds support for Olimex A20-OLinuXino-LIME board.
> 
> Signed-off-by: FUKAUMI Naoki <naobsd@gmail.com>

I think this looks like a pretty straight import from the linux-sunxi
u-boot fork, massaged for changes from upstream, is that right?

Looks good but please also add an entry to board/sunxi/MAINTAINERS.
You'll most likely want to base it on u-boot-sunxi.git next or master to
avoid conflicts.

Ian.
Hans de Goede Aug. 22, 2014, 7:38 p.m. UTC | #2
Hi,

The A20-OLinuXino-LIME is already supported by the
u-boot-arm tree:
http://git.denx.de/?p=u-boot/u-boot-arm.git;a=summary

We're waiting for the u-boot arm maintainer to send
a pull-req for things to get added to u-boot master.

Regards,

Hans



On 08/20/2014 07:37 AM, FUKAUMI Naoki wrote:
> This patch adds support for Olimex A20-OLinuXino-LIME board.
> 
> Signed-off-by: FUKAUMI Naoki <naobsd@gmail.com>
> ---
>  board/sunxi/Makefile                 |  1 +
>  board/sunxi/dram_a20_olinuxino_l.c   | 31 +++++++++++++++++++++++++++++++
>  configs/A20-OLinuXino-Lime_defconfig |  5 +++++
>  3 files changed, 37 insertions(+)
>  create mode 100644 board/sunxi/dram_a20_olinuxino_l.c
>  create mode 100644 configs/A20-OLinuXino-Lime_defconfig
> 
> diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile
> index cf001e7..56073a0 100644
> --- a/board/sunxi/Makefile
> +++ b/board/sunxi/Makefile
> @@ -15,6 +15,7 @@ obj-$(CONFIG_A10_OLINUXINO_L)	+= dram_a10_olinuxino_l.o
>  obj-$(CONFIG_A10S_OLINUXINO_M)	+= dram_a10s_olinuxino_m.o
>  obj-$(CONFIG_A13_OLINUXINO)	+= dram_a13_olinuxino.o
>  obj-$(CONFIG_A13_OLINUXINOM)	+= dram_a13_oli_micro.o
> +obj-$(CONFIG_A20_OLINUXINO_L)	+= dram_a20_olinuxino_l.o
>  obj-$(CONFIG_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_AUXTEK_T004)	+= dram_a10s_olinuxino_m.o
> diff --git a/board/sunxi/dram_a20_olinuxino_l.c b/board/sunxi/dram_a20_olinuxino_l.c
> new file mode 100644
> index 0000000..2c74999
> --- /dev/null
> +++ b/board/sunxi/dram_a20_olinuxino_l.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 = 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/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
> new file mode 100644
> index 0000000..b06377a
> --- /dev/null
> +++ b/configs/A20-OLinuXino-Lime_defconfig
> @@ -0,0 +1,5 @@
> +CONFIG_SPL=y
> +CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
> +CONFIG_FTDFILE="sun7i-a20-olinuxino-lime.dtb"
> ++S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUN7I=y
>
FUKAUMI Naoki Aug. 24, 2014, 1:05 p.m. UTC | #3
hi

On Sat, Aug 23, 2014 at 4:38 AM, Hans de Goede <hdegoede@redhat.com> wrote:
> The A20-OLinuXino-LIME is already supported by the
> u-boot-arm tree:
> http://git.denx.de/?p=u-boot/u-boot-arm.git;a=summary

I cannot find any file for A20-OLinuXino-LIME under configs/* and
board/sunxi/* in u-boot-arm/master.

(btw, I tested my patch with u-boot-sunxi/master)

Regards,
FUKAUMI Naoki Aug. 24, 2014, 1:24 p.m. UTC | #4
hi

On Fri, Aug 22, 2014 at 5:06 AM, Ian Campbell <ijc@hellion.org.uk> wrote:
> On Wed, 2014-08-20 at 14:37 +0900, FUKAUMI Naoki wrote:
>> This patch adds support for Olimex A20-OLinuXino-LIME board.
>>
>> Signed-off-by: FUKAUMI Naoki <naobsd@gmail.com>
>
> I think this looks like a pretty straight import from the linux-sunxi
> u-boot fork, massaged for changes from upstream, is that right?

yes. dram_a20_olinuxino_l.c is copied from linux-sunxi/u-boot-sunxi.

> Looks good but please also add an entry to board/sunxi/MAINTAINERS.

I see, but sorry, who should maintain this board?

> You'll most likely want to base it on u-boot-sunxi.git next or master to
> avoid conflicts.

yes, I used u-boot-sunxi/master as a base.

Regards,
Ian Campbell Aug. 24, 2014, 4:57 p.m. UTC | #5
On Sun, 2014-08-24 at 22:05 +0900, Naoki FUKAUMI wrote:
> hi
> 
> On Sat, Aug 23, 2014 at 4:38 AM, Hans de Goede <hdegoede@redhat.com> wrote:
> > The A20-OLinuXino-LIME is already supported by the
> > u-boot-arm tree:
> > http://git.denx.de/?p=u-boot/u-boot-arm.git;a=summary
> 
> I cannot find any file for A20-OLinuXino-LIME under configs/* and
> board/sunxi/* in u-boot-arm/master.

FWIW I see ./configs/A10-OLinuXino-Lime_defconfig but not the A20
variant, perhaps Hans had confused the two.

> (btw, I tested my patch with u-boot-sunxi/master)

There's some additional stuff in /next. Nothing looks like it should
interfere with your patch but testing the new dram stuff which is in
there on one more platform surely couldn't hurt.

Ian.
Ian Campbell Aug. 24, 2014, 5:01 p.m. UTC | #6
On Sun, 2014-08-24 at 22:24 +0900, Naoki FUKAUMI wrote:
> > Looks good but please also add an entry to board/sunxi/MAINTAINERS.
> 
> I see, but sorry, who should maintain this board?

You, I hope! I'm not sure what u-boot policy generally is here, but
personally I would much prefer to have a named person who owns the
hardware listed so that I can ask for testing when I think something
might affect that board.

Ian.
Hans de Goede Aug. 25, 2014, 8:28 a.m. UTC | #7
Hi,

On 08/24/2014 06:57 PM, Ian Campbell wrote:
> On Sun, 2014-08-24 at 22:05 +0900, Naoki FUKAUMI wrote:
>> hi
>>
>> On Sat, Aug 23, 2014 at 4:38 AM, Hans de Goede <hdegoede@redhat.com> wrote:
>>> The A20-OLinuXino-LIME is already supported by the
>>> u-boot-arm tree:
>>> http://git.denx.de/?p=u-boot/u-boot-arm.git;a=summary
>>
>> I cannot find any file for A20-OLinuXino-LIME under configs/* and
>> board/sunxi/* in u-boot-arm/master.
> 
> FWIW I see ./configs/A10-OLinuXino-Lime_defconfig but not the A20
> variant, perhaps Hans had confused the two.

Ah right, my bad I did not even know there was an A20 based lime out,
interesting!

Regards,

Hans
FUKAUMI Naoki Aug. 26, 2014, 11:42 a.m. UTC | #8
hi

On Mon, Aug 25, 2014 at 2:01 AM, Ian Campbell <ijc@hellion.org.uk> wrote:
> On Sun, 2014-08-24 at 22:24 +0900, Naoki FUKAUMI wrote:
>> > Looks good but please also add an entry to board/sunxi/MAINTAINERS.
>>
>> I see, but sorry, who should maintain this board?
>
> You, I hope! I'm not sure what u-boot policy generally is here, but
> personally I would much prefer to have a named person who owns the
> hardware listed so that I can ask for testing when I think something
> might affect that board.

I see. I'll make new patch.
diff mbox

Patch

diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile
index cf001e7..56073a0 100644
--- a/board/sunxi/Makefile
+++ b/board/sunxi/Makefile
@@ -15,6 +15,7 @@  obj-$(CONFIG_A10_OLINUXINO_L)	+= dram_a10_olinuxino_l.o
 obj-$(CONFIG_A10S_OLINUXINO_M)	+= dram_a10s_olinuxino_m.o
 obj-$(CONFIG_A13_OLINUXINO)	+= dram_a13_olinuxino.o
 obj-$(CONFIG_A13_OLINUXINOM)	+= dram_a13_oli_micro.o
+obj-$(CONFIG_A20_OLINUXINO_L)	+= dram_a20_olinuxino_l.o
 obj-$(CONFIG_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_AUXTEK_T004)	+= dram_a10s_olinuxino_m.o
diff --git a/board/sunxi/dram_a20_olinuxino_l.c b/board/sunxi/dram_a20_olinuxino_l.c
new file mode 100644
index 0000000..2c74999
--- /dev/null
+++ b/board/sunxi/dram_a20_olinuxino_l.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 = 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/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
new file mode 100644
index 0000000..b06377a
--- /dev/null
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -0,0 +1,5 @@ 
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
+CONFIG_FTDFILE="sun7i-a20-olinuxino-lime.dtb"
++S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUN7I=y