Message ID | 1395319777-8884-1-git-send-email-trini@ti.com |
---|---|
State | RFC |
Delegated to: | Albert ARIBAUD |
Headers | show |
Hi Tom, On Thu, 20 Mar 2014 08:49:37 -0400, Tom Rini <trini@ti.com> wrote: > Tested-by: Matt Porter <matt.porter@linaro.org> > Signed-off-by: Tom Rini <trini@ti.com> > --- Where does this patch come from? The source tree it applies to is not that of mainline U-Boot. If this is actually an RFC that I should look into, (as the PW state says), then which repository does it apply to? Amicalement,
Hi, On 06/09/2014 08:50 AM, Albert ARIBAUD wrote: > Hi Tom, > > On Thu, 20 Mar 2014 08:49:37 -0400, Tom Rini <trini@ti.com> wrote: > >> Tested-by: Matt Porter <matt.porter@linaro.org> >> Signed-off-by: Tom Rini <trini@ti.com> >> --- > > Where does this patch come from? The source tree it applies to is not > that of mainline U-Boot. If this is actually an RFC that I should look > into, (as the PW state says), then which repository does it apply to? This was posted by Tom as an add on patch to my: "[PATCH u-boot sunxi 00/12] sun4i (v2) + sun5i + pmic + emac support" Series, which was a series on top of one of Ian's sun7i support series: http://lists.denx.de/pipermail/u-boot/2014-March/175656.html In the mean time (as you know) Ians' series has gone upstream and I've continued working on the series in question, with Ian reviewing it. Actually I've just send you a pull-req with the bits of this series which are ready to go upstream. Which includes support for the A13-OLinuXinoM as part of the "sunxi: Add sun5i support" patch. Regards, Hans
Hi Hans, On Mon, 09 Jun 2014 09:56:01 +0200, Hans de Goede <hdegoede@redhat.com> wrote: > Hi, > > On 06/09/2014 08:50 AM, Albert ARIBAUD wrote: > > Hi Tom, > > > > On Thu, 20 Mar 2014 08:49:37 -0400, Tom Rini <trini@ti.com> wrote: > > > >> Tested-by: Matt Porter <matt.porter@linaro.org> > >> Signed-off-by: Tom Rini <trini@ti.com> > >> --- > > > > Where does this patch come from? The source tree it applies to is not > > that of mainline U-Boot. If this is actually an RFC that I should look > > into, (as the PW state says), then which repository does it apply to? > > This was posted by Tom as an add on patch to my: > "[PATCH u-boot sunxi 00/12] sun4i (v2) + sun5i + pmic + emac support" > > Series, which was a series on top of one of Ian's sun7i support > series: > > http://lists.denx.de/pipermail/u-boot/2014-March/175656.html > > In the mean time (as you know) Ians' series has gone upstream and > I've continued working on the series in question, with Ian > reviewing it. Actually I've just send you a pull-req with the > bits of this series which are ready to go upstream. Which includes > support for the A13-OLinuXinoM as part of the > "sunxi: Add sun5i support" patch. Thanks. Unfortunately, I had lost track of the dependencies -- which is a live example of why patches with dependencies should mention them explicitly after their commit message (not in it, though, as once applied, the dependency info is not relevant any more), so that folks like me can reconstruct the information. :) I'll process you patch series -- not "pull request", as I only pull from other (ARM-related only) U-Boot repos :) -- in a few days, then I'll handle Tom's patch. > Regards, > > Hans Amicalement,
Hi, On 06/10/2014 09:25 AM, Albert ARIBAUD wrote: > Hi Hans, > > On Mon, 09 Jun 2014 09:56:01 +0200, Hans de Goede <hdegoede@redhat.com> > wrote: > >> Hi, >> >> On 06/09/2014 08:50 AM, Albert ARIBAUD wrote: >>> Hi Tom, >>> >>> On Thu, 20 Mar 2014 08:49:37 -0400, Tom Rini <trini@ti.com> wrote: >>> >>>> Tested-by: Matt Porter <matt.porter@linaro.org> >>>> Signed-off-by: Tom Rini <trini@ti.com> >>>> --- >>> >>> Where does this patch come from? The source tree it applies to is not >>> that of mainline U-Boot. If this is actually an RFC that I should look >>> into, (as the PW state says), then which repository does it apply to? >> >> This was posted by Tom as an add on patch to my: >> "[PATCH u-boot sunxi 00/12] sun4i (v2) + sun5i + pmic + emac support" >> >> Series, which was a series on top of one of Ian's sun7i support >> series: >> >> http://lists.denx.de/pipermail/u-boot/2014-March/175656.html >> >> In the mean time (as you know) Ians' series has gone upstream and >> I've continued working on the series in question, with Ian >> reviewing it. Actually I've just send you a pull-req with the >> bits of this series which are ready to go upstream. Which includes >> support for the A13-OLinuXinoM as part of the >> "sunxi: Add sun5i support" patch. > > Thanks. Unfortunately, I had lost track of the dependencies -- which is > a live example of why patches with dependencies should mention them > explicitly after their commit message (not in it, though, as once > applied, the dependency info is not relevant any more), so that folks > like me can reconstruct the information. :) > > I'll process you patch series -- not "pull request", as I only pull > from other (ARM-related only) U-Boot repos :) -- in a few days, then > I'll handle Tom's patch. Adding support for the A13-OLinuXinoM has been integrated into my series, so you can drop Tom's patch. Note I've a lot more allwinner boards (all olimex variants, various mele devices, various mk802 and mk805 variants), which I plan to add support for (these are already support in the u-boot-sunxi git repository), but I'm trying to upstream things in small batches. Let me know if you want me to speed things up and queue up more patches. Regards, Hans
Hi Hans, On Tue, 10 Jun 2014 09:48:48 +0200, Hans de Goede <hdegoede@redhat.com> wrote: > Hi, > > On 06/10/2014 09:25 AM, Albert ARIBAUD wrote: > > Hi Hans, > > > > On Mon, 09 Jun 2014 09:56:01 +0200, Hans de Goede <hdegoede@redhat.com> > > wrote: > > > >> Hi, > >> > >> On 06/09/2014 08:50 AM, Albert ARIBAUD wrote: > >>> Hi Tom, > >>> > >>> On Thu, 20 Mar 2014 08:49:37 -0400, Tom Rini <trini@ti.com> wrote: > >>> > >>>> Tested-by: Matt Porter <matt.porter@linaro.org> > >>>> Signed-off-by: Tom Rini <trini@ti.com> > >>>> --- > >>> > >>> Where does this patch come from? The source tree it applies to is not > >>> that of mainline U-Boot. If this is actually an RFC that I should look > >>> into, (as the PW state says), then which repository does it apply to? > >> > >> This was posted by Tom as an add on patch to my: > >> "[PATCH u-boot sunxi 00/12] sun4i (v2) + sun5i + pmic + emac support" > >> > >> Series, which was a series on top of one of Ian's sun7i support > >> series: > >> > >> http://lists.denx.de/pipermail/u-boot/2014-March/175656.html > >> > >> In the mean time (as you know) Ians' series has gone upstream and > >> I've continued working on the series in question, with Ian > >> reviewing it. Actually I've just send you a pull-req with the > >> bits of this series which are ready to go upstream. Which includes > >> support for the A13-OLinuXinoM as part of the > >> "sunxi: Add sun5i support" patch. > > > > Thanks. Unfortunately, I had lost track of the dependencies -- which is > > a live example of why patches with dependencies should mention them > > explicitly after their commit message (not in it, though, as once > > applied, the dependency info is not relevant any more), so that folks > > like me can reconstruct the information. :) > > > > I'll process you patch series -- not "pull request", as I only pull > > from other (ARM-related only) U-Boot repos :) -- in a few days, then > > I'll handle Tom's patch. > > Adding support for the A13-OLinuXinoM has been integrated into my series, > so you can drop Tom's patch. Ok. > Note I've a lot more allwinner boards (all olimex variants, various > mele devices, various mk802 and mk805 variants), which I plan to add > support for (these are already support in the u-boot-sunxi git repository), > but I'm trying to upstream things in small batches. Let me know if you > want me to speed things up and queue up more patches. No need to speed things up right now as any new patch series posted at this time would only be considered for next merge window. Right now, I'd only take a new patch for 2014.07 if it was a bug fix, or maybe a really trivial *and* really useful addition. > Regards, > > Hans Amicalement,
diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile index 8e284d4..a49e28e 100644 --- a/board/sunxi/Makefile +++ b/board/sunxi/Makefile @@ -11,4 +11,5 @@ obj-y += board.o obj-$(CONFIG_A10_OLINUXINO_L) += dram_a10_olinuxino_l.o obj-$(CONFIG_A10S_OLINUXINO_M) += dram_a10s_olinuxino_m.o +obj-$(CONFIG_A13_OLINUXINOM) += dram_a13_oli_micro.o obj-$(CONFIG_CUBIETRUCK) += dram_cubietruck.o diff --git a/board/sunxi/dram_a13_oli_micro.c b/board/sunxi/dram_a13_oli_micro.c new file mode 100644 index 0000000..8154ea2 --- /dev/null +++ b/board/sunxi/dram_a13_oli_micro.c @@ -0,0 +1,32 @@ +/* this file is generated, don't edit it yourself */ + +#include <common.h> +#include <asm/arch/dram.h> + +static struct dram_para dram_para = { + .clock = 408, + .type = 3, + .rank_num = 1, + .density = 2048, + .io_width = 16, + .bus_width = 16, + .cas = 9, + .zq = 123, + .odt_en = 0, + .size = 256, + .tpr0 = 0x42d899b7, + .tpr1 = 0xa090, + .tpr2 = 0x22a00, + .tpr3 = 0, + .tpr4 = 0, + .tpr5 = 0, + .emr1 = 0, + .emr2 = 0x10, + .emr3 = 0, + +}; + +unsigned long sunxi_dram_init(void) +{ + return dramc_init(&dram_para); +} diff --git a/boards.cfg b/boards.cfg index 28f6fbc..b695a10 100644 --- a/boards.cfg +++ b/boards.cfg @@ -355,6 +355,7 @@ Active arm armv7 s5pc1xx samsung smdkc100 Active arm armv7 socfpga altera socfpga socfpga_cyclone5 - - Active arm armv7 sunxi - sunxi A10-OLinuXino-Lime sun4i:A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,SPL - Active arm armv7 sunxi - sunxi A10s-OLinuXino-M sun5i:A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,SPL - +Active arm armv7 sunxi - sunxi A13-OLinuXinoM sun5i:A13_OLINUXINOM,SPL,NO_AXP,STATUSLED=201,CONS_INDEX=2 - Active arm armv7 sunxi - sunxi Cubietruck sun7i:CUBIETRUCK,AXP209_POWER,FAST_MBUS,SPL - Active arm armv7 sunxi - sunxi Cubietruck_FEL sun7i:CUBIETRUCK,AXP209_POWER,FAST_MBUS,SPL_FEL - Active arm armv7 u8500 st-ericsson snowball snowball - Mathieu Poirier <mathieu.poirier@linaro.org>