On Fri, 2014-03-21 at 17:11 +0100, Hans de Goede wrote:
> Hi,
>
> On 03/21/2014 04:45 PM, Ian Campbell wrote:
> > On Fri, 2014-03-21 at 16:14 +0100, Hans de Goede wrote:
> >> Hi,
> >>
> >> On 03/20/2014 10:37 PM, Ian Campbell wrote:
> >>> Mainly whitespace. The main construct which it complains about is:
> >>> while(POKE THE HARDWARE);
> >>> which obscures the potentially infinite loop, I've rewritten as:
> >>> while(POKE THE HARDWARE)
> >>> ;
> >>>
> >>> Signed-off-by: Ian Campbell <[email protected]>
> >>
> >> Thanks, added to u-boot-sunxi.git sunxi branch.
> >
> > Thanks, N times over (I lost count of the number of patches).
> >
> > I was planning to resync my mainlining tree this evening so this is very
> > timely.
>
> Ok, so as promised I've already done a sync and here I've 2 branches for
> you at: https://github.com/jwrdegoede/u-boot-sunxi/
>
> The first branch is: sunxi-v2014.04, this is u-boot-sunxi.git sunxi branch
> with v2014.04-rc2 merged in, essentially this is your
> sunxi-mainlining-cleanups
> with all the recent cleanups wens and you did added on top.
You've reapplied all the cleanups to the existing merge, which is going
to cause confusion when we come to merge this back into
u-boot-sunxi.git. I redid the merge on top of the latest clean ups and
pushed it to:
git://gitorious.org/ijc/u-boot.git sunxi-merge-v2014.04-rc2
That one is suitable for merging back into u-boot-sunxi.git.
> This is what I've used as a start for getting a cleaned up version of your v1
> on top of v2014.04-rc2.
>
> So the 2nd branch I've for you is: v2014.04-sunxi which is v2014.04-rc2 with
> sunxi support added on top. This contains your v1, with all the cleanups
> you did, and all the fixups I did merged in. So basically a v2 ready to
> submit upstream :) Note that your gmac patch is missing as I dropped that
> initially and I've not re-added it yet, so I guess you may want to re-add
> that before posting a v2 to the list.
That's right, you also picked up a spurious change to dram.c
(get_ram_size change). Otherwise it looked good.
> I hope this is useful for you.
It was a useful sanity check, thanks.
Ian.
--
You received this message because you are subscribed to the Google Groups
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
