Message ID | 1406189941-24600-1-git-send-email-ijc@hellion.org.uk |
---|---|
State | Accepted |
Delegated to: | Hans de Goede |
Headers | show |
Hi, On 07/24/2014 10:19 AM, Ian Campbell wrote: > For some reason even the original sunxi tree was missing this. The original tree is not missing it, in the original tree the logic is backwards, all board get AXP209 unless NO_AXP or AXP152 are defined. I decided to not carry this "magic" forward to the upstream code, which means that any board which does not have NO_AXP or AXP152 upstream needs AXP209 > > Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Acked-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > boards.cfg | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/boards.cfg b/boards.cfg > index 47028e8..8572972 100644 > --- a/boards.cfg > +++ b/boards.cfg > @@ -379,8 +379,8 @@ Active arm armv7 s5pc1xx samsung smdkc100 > Active arm armv7 socfpga altera socfpga socfpga_cyclone5 - - > Active arm armv7 sunxi - sunxi A13-OLinuXinoM sun5i:A13_OLINUXINOM,SPL,CONS_INDEX=2 Hans de Goede <hdegoede@redhat.com> > Active arm armv7 sunxi - sunxi Cubieboard sun4i:CUBIEBOARD,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8) Hans de Goede <hdegoede@redhat.com> > -Active arm armv7 sunxi - sunxi Cubieboard2 sun7i:CUBIEBOARD2,SPL,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> > -Active arm armv7 sunxi - sunxi Cubieboard2_FEL sun7i:CUBIEBOARD2,SPL_FEL,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> > +Active arm armv7 sunxi - sunxi Cubieboard2 sun7i:CUBIEBOARD2,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) 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) Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> > Active arm armv7 sunxi - sunxi Cubietruck sun7i:CUBIETRUCK,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12) Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> > Active arm armv7 sunxi - sunxi Cubietruck_FEL sun7i:CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12) Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> > Active arm armv7 sunxi - sunxi r7-tv-dongle sun5i:R7DONGLE,SPL,AXP152_POWER Hans de Goede <hdegoede@redhat.com> >
On Sat, 2014-07-26 at 15:23 +0200, Hans de Goede wrote: > Hi, > > On 07/24/2014 10:19 AM, Ian Campbell wrote: > > For some reason even the original sunxi tree was missing this. > > The original tree is not missing it, in the original tree the logic is backwards, > all board get AXP209 unless NO_AXP or AXP152 are defined. Ah, I missed that tricky bit of logic. > I decided to not carry this "magic" forward to the upstream code, Yes, that makes absolute sense (and I now vague recall you telling me this before). > which means > that any board which does not have NO_AXP or AXP152 upstream needs AXP209 > > > > > Signed-off-by: Ian Campbell <ijc@hellion.org.uk> > > Acked-by: Hans de Goede <hdegoede@redhat.com> Thanks. FYI I've started collecting things into next to be swept into master and PR-d once the existing PR goes through. Ian.
Hi, On 07/27/2014 10:31 AM, Ian Campbell wrote: > On Sat, 2014-07-26 at 15:23 +0200, Hans de Goede wrote: >> Hi, >> >> On 07/24/2014 10:19 AM, Ian Campbell wrote: >>> For some reason even the original sunxi tree was missing this. >> >> The original tree is not missing it, in the original tree the logic is backwards, >> all board get AXP209 unless NO_AXP or AXP152 are defined. > > Ah, I missed that tricky bit of logic. > >> I decided to not carry this "magic" forward to the upstream code, > > Yes, that makes absolute sense (and I now vague recall you telling me > this before). > >> which means >> that any board which does not have NO_AXP or AXP152 upstream needs AXP209 >> >>> >>> Signed-off-by: Ian Campbell <ijc@hellion.org.uk> >> >> Acked-by: Hans de Goede <hdegoede@redhat.com> > > Thanks. > > FYI I've started collecting things into next to be swept into master and > PR-d once the existing PR goes through. Right, I've been using that tree to base my current work to add support for more boards on: https://github.com/jwrdegoede/u-boot-sunxi/commits/next Regards, Hans
Hi, On 07/27/2014 10:31 AM, Ian Campbell wrote: > On Sat, 2014-07-26 at 15:23 +0200, Hans de Goede wrote: >> Hi, >> >> On 07/24/2014 10:19 AM, Ian Campbell wrote: >>> For some reason even the original sunxi tree was missing this. >> >> The original tree is not missing it, in the original tree the logic is backwards, >> all board get AXP209 unless NO_AXP or AXP152 are defined. > > Ah, I missed that tricky bit of logic. > >> I decided to not carry this "magic" forward to the upstream code, > > Yes, that makes absolute sense (and I now vague recall you telling me > this before). > >> which means >> that any board which does not have NO_AXP or AXP152 upstream needs AXP209 >> >>> >>> Signed-off-by: Ian Campbell <ijc@hellion.org.uk> >> >> Acked-by: Hans de Goede <hdegoede@redhat.com> > > Thanks. > > FYI I've started collecting things into next to be swept into master and > PR-d once the existing PR goes through. I've pushed this patch to u-boot-sunxi next now. Regards, Hans
diff --git a/boards.cfg b/boards.cfg index 47028e8..8572972 100644 --- a/boards.cfg +++ b/boards.cfg @@ -379,8 +379,8 @@ Active arm armv7 s5pc1xx samsung smdkc100 Active arm armv7 socfpga altera socfpga socfpga_cyclone5 - - Active arm armv7 sunxi - sunxi A13-OLinuXinoM sun5i:A13_OLINUXINOM,SPL,CONS_INDEX=2 Hans de Goede <hdegoede@redhat.com> Active arm armv7 sunxi - sunxi Cubieboard sun4i:CUBIEBOARD,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8) Hans de Goede <hdegoede@redhat.com> -Active arm armv7 sunxi - sunxi Cubieboard2 sun7i:CUBIEBOARD2,SPL,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> -Active arm armv7 sunxi - sunxi Cubieboard2_FEL sun7i:CUBIEBOARD2,SPL_FEL,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> +Active arm armv7 sunxi - sunxi Cubieboard2 sun7i:CUBIEBOARD2,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) 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) Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> Active arm armv7 sunxi - sunxi Cubietruck sun7i:CUBIETRUCK,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12) Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> Active arm armv7 sunxi - sunxi Cubietruck_FEL sun7i:CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12) Ian Campbell <ijc@hellion.org.uk>:Hans de Goede <hdegoede@redhat.com> Active arm armv7 sunxi - sunxi r7-tv-dongle sun5i:R7DONGLE,SPL,AXP152_POWER Hans de Goede <hdegoede@redhat.com>
For some reason even the original sunxi tree was missing this. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> --- boards.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)