On Sun, 2014-03-16 at 16:15 +0100, Hans de Goede wrote: > Hi, > > On 03/16/2014 04:05 PM, Ian Campbell wrote: > > On Sun, 2014-03-16 at 14:53 +0100, Hans de Goede wrote: > >> Hi All, > >> > >> Here is a patch-set adding sun4i support on top of Ian's recent 1st > >> attempt to get sun7i upstream patch-set. > >> > >> Note I've had to drop the raising of the cpu core clock, without matching > >> axp209 changes this causes issues on sun4i. > > > > Yes, I was going to drop this from the base series based on the feedback > > so far. > > Ack, the "FIXUP" marked patched in my series are intented to get squashed > into your patches.
Thanks, will do. > >> I've been thinking about how to best move forward with this patch-set, and > >> I think it would be best to first complete the job of splitting up what > >> we've > >> in u-boot-sunxi now (at least most of it), keeping this based on v2014.01 > >> so that we can easily diff. > > > > I was actually planning to ask if we could merge up to at least > > v2014.04-rc2, in general it is easier to upstream the closer we are > > starting from. > > You mean merging u-boot-sunxi's sunxi branch to v2014.04-rc2 right? Correct. > That sounds > fine to me. Ultimately its HNO call to make though. HNO if you're ok with this > I can test Ian's merge on sun4i and sun5i and then push it to u-boot-sunxi's > sunxi > branch. > > > In particular between v2014.01 and v2014.04.rc the following are going > > to be relevant for upstreaming: > > * Switch to Kbuild has made the Makefile stuff very different > > * Based on Wens' feedback it looked like there are changes to the > > designware stuff upstream which will need integrating > > * The generic distro stuff which Dennis asked for isn't in > > v2014.01 AFAIK. > > > > The merge up doesn't seem too bad, I've got it mostly done locally. Not > > sure what the best way to send it out is -- probably as a git pull > > request? > > Yes a git pull is probably best. You can use either github's pull-req > interface or just send one to the linux-sunxi list. I've been trying to avoid registering with github so I'll send a request to the list. > > I've also got a small series which addresses the initial upstream review > > feedback in sunxi.git which I hope to send out soon. > > Sounds good. > > >> We can even paralellize things. I can stick with Ian's v1 patchset for now, > >> adding patches on top adding what is missing in piecemeal patches, and Ian > >> can start working on making his initial series ready to go upstream. > > > > I'd prefer this approach to tacking your patches onto the end of my > > series and managing them myself. > > Ok, so lets split up our efforts for now then, you work on getting the basic > sun7i support upstream and I'll work on adding missing bits, like sun4i, sun5i > and axp support. Agreed. > For those reading along, I've just finished adding sun5i support, testing that > is next on my todo list, then adding axp support. I'll send a second patch-set > with what I've tonight to avoid others doing double work. In general my latest > work on this can be found here: > https://github.com/jwrdegoede/u-boot-sunxi/tree/v2014.01-sunxi Great! Ian. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
