Message ID | 1406653068-16536-1-git-send-email-hdegoede@redhat.com |
---|---|
State | Accepted |
Delegated to: | Hans de Goede |
Headers | show |
On Tue, 2014-07-29 at 18:57 +0200, Hans de Goede wrote: > The Banana Pi is an A20 based development board using Raspberry Pi compatible > IO headers. It comes with 1 GB RAM, 1 Gb ethernet, 2x USB host, sata, hdmi > and stereo audio out + various expenansion headers: "expansion" > http://www.bananapi.org/ > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Hello Hans, i tried to test your patch, but unfortunately i cannot apply it to a freshly cloned u-boot: Applying: sun7i: Add bananapi board error: patch failed: board/sunxi/Makefile:19 error: board/sunxi/Makefile: patch does not apply error: patch failed: boards.cfg:386 error: boards.cfg: patch does not apply Patch failed at 0001 sun7i: Add bananapi board The copy of the patch that failed is found in: /home/petermaierh/work/u-boot/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". any ideas ? best regards, hannes On 2014-07-29 18:57, Hans de Goede wrote: > The Banana Pi is an A20 based development board using Raspberry Pi compatible > IO headers. It comes with 1 GB RAM, 1 Gb ethernet, 2x USB host, sata, hdmi > and stereo audio out + various expenansion headers: > > http://www.bananapi.org/ > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > board/sunxi/Makefile | 1 + > board/sunxi/dram_bananapi.c | 31 +++++++++++++++++++++++++++++++ > boards.cfg | 1 + > 3 files changed, 33 insertions(+) > create mode 100644 board/sunxi/dram_bananapi.c > > diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile > index 3fc7513..cf001e7 100644 > --- a/board/sunxi/Makefile > +++ b/board/sunxi/Makefile > @@ -19,6 +19,7 @@ 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 > obj-$(CONFIG_BA10_TV_BOX) += dram_sun4i_384_1024_iow8.o > +obj-$(CONFIG_BANANAPI) += dram_bananapi.o > obj-$(CONFIG_CUBIEBOARD) += dram_cubieboard.o > obj-$(CONFIG_CUBIEBOARD2) += dram_cubieboard2.o > obj-$(CONFIG_CUBIETRUCK) += dram_cubietruck.o > diff --git a/board/sunxi/dram_bananapi.c b/board/sunxi/dram_bananapi.c > new file mode 100644 > index 0000000..0ed7943 > --- /dev/null > +++ b/board/sunxi/dram_bananapi.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 = 32, > + .cas = 9, > + .zq = 0x7f, > + .odt_en = 0, > + .size = 1024, > + .tpr0 = 0x42d899b7, > + .tpr1 = 0xa090, > + .tpr2 = 0x22a00, > + .tpr3 = 0x0, > + .tpr4 = 0x1, > + .tpr5 = 0x0, > + .emr1 = 0x4, > + .emr2 = 0x10, > + .emr3 = 0x0, > +}; > + > +unsigned long sunxi_dram_init(void) > +{ > + return dramc_init(&dram_para); > +} > diff --git a/boards.cfg b/boards.cfg > index a9b6106..eeba90a 100644 > --- a/boards.cfg > +++ b/boards.cfg > @@ -386,6 +386,7 @@ Active arm armv7 sunxi - sunxi > Active arm armv7 sunxi - sunxi A20-OLinuXino_MICRO sun7i:A20_OLINUXINO_M,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI Hans de Goede <hdegoede@redhat.com> > Active arm armv7 sunxi - sunxi Auxtek-T004 sun5i:AUXTEK_T004,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13) Hans de Goede <hdegoede@redhat.com> > Active arm armv7 sunxi - sunxi ba10_tv_box sun4i:BA10_TV_BOX,SPL,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12) Hans de Goede <hdegoede@redhat.com> > +Active arm armv7 sunxi - sunxi Bananapi sun7i:BANANAPI,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI Hans de Goede <hdegoede@redhat.com> > Active arm armv7 sunxi - sunxi Cubieboard sun4i:CUBIEBOARD,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI Hans de Goede <hdegoede@redhat.com> > Active arm armv7 sunxi - sunxi Cubieboard2 sun7i:CUBIEBOARD2,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> > Active arm armv7 sunxi - sunxi Cubieboard2_FEL sun7i:CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com>
On Tue, 2014-07-29 at 20:57 +0200, Hannes Petermaier wrote: > Hello Hans, > > i tried to test your patch, but unfortunately i cannot apply it to a > freshly cloned u-boot: It applies to the current u-boot-arm.git#master plus the set of changes currently in u-boot-sunxi.git#master. In fact I would expect it to show up in the latter pretty soon. Ian.
Many thanks, now the patch applies and i can compile u-boot. maybe tomorrow i get the ordered board from pollin.de and can test this. best regards, hannes On 2014-07-29 21:00, Ian Campbell wrote: > On Tue, 2014-07-29 at 20:57 +0200, Hannes Petermaier wrote: >> Hello Hans, >> >> i tried to test your patch, but unfortunately i cannot apply it to a get >> freshly cloned u-boot: > It applies to the current u-boot-arm.git#master plus the set of changes > currently in u-boot-sunxi.git#master. In fact I would expect it to show > up in the latter pretty soon. > > Ian. > >
diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile index 3fc7513..cf001e7 100644 --- a/board/sunxi/Makefile +++ b/board/sunxi/Makefile @@ -19,6 +19,7 @@ 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 obj-$(CONFIG_BA10_TV_BOX) += dram_sun4i_384_1024_iow8.o +obj-$(CONFIG_BANANAPI) += dram_bananapi.o obj-$(CONFIG_CUBIEBOARD) += dram_cubieboard.o obj-$(CONFIG_CUBIEBOARD2) += dram_cubieboard2.o obj-$(CONFIG_CUBIETRUCK) += dram_cubietruck.o diff --git a/board/sunxi/dram_bananapi.c b/board/sunxi/dram_bananapi.c new file mode 100644 index 0000000..0ed7943 --- /dev/null +++ b/board/sunxi/dram_bananapi.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 = 32, + .cas = 9, + .zq = 0x7f, + .odt_en = 0, + .size = 1024, + .tpr0 = 0x42d899b7, + .tpr1 = 0xa090, + .tpr2 = 0x22a00, + .tpr3 = 0x0, + .tpr4 = 0x1, + .tpr5 = 0x0, + .emr1 = 0x4, + .emr2 = 0x10, + .emr3 = 0x0, +}; + +unsigned long sunxi_dram_init(void) +{ + return dramc_init(&dram_para); +} diff --git a/boards.cfg b/boards.cfg index a9b6106..eeba90a 100644 --- a/boards.cfg +++ b/boards.cfg @@ -386,6 +386,7 @@ Active arm armv7 sunxi - sunxi Active arm armv7 sunxi - sunxi A20-OLinuXino_MICRO sun7i:A20_OLINUXINO_M,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI Hans de Goede <hdegoede@redhat.com> Active arm armv7 sunxi - sunxi Auxtek-T004 sun5i:AUXTEK_T004,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13) Hans de Goede <hdegoede@redhat.com> Active arm armv7 sunxi - sunxi ba10_tv_box sun4i:BA10_TV_BOX,SPL,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12) Hans de Goede <hdegoede@redhat.com> +Active arm armv7 sunxi - sunxi Bananapi sun7i:BANANAPI,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI Hans de Goede <hdegoede@redhat.com> Active arm armv7 sunxi - sunxi Cubieboard sun4i:CUBIEBOARD,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI Hans de Goede <hdegoede@redhat.com> Active arm armv7 sunxi - sunxi Cubieboard2 sun7i:CUBIEBOARD2,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> Active arm armv7 sunxi - sunxi Cubieboard2_FEL sun7i:CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com>
The Banana Pi is an A20 based development board using Raspberry Pi compatible IO headers. It comes with 1 GB RAM, 1 Gb ethernet, 2x USB host, sata, hdmi and stereo audio out + various expenansion headers: http://www.bananapi.org/ Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- board/sunxi/Makefile | 1 + board/sunxi/dram_bananapi.c | 31 +++++++++++++++++++++++++++++++ boards.cfg | 1 + 3 files changed, 33 insertions(+) create mode 100644 board/sunxi/dram_bananapi.c