On Mon, 2014-02-10 at 20:15 +0100, Hans de Goede wrote:
> Hi,
>
> On 02/10/2014 12:20 PM, Ian Campbell wrote:
>
> <snip>
>
> > I was a bit torn over what to do with this and the first patch ("Provide
> > a weak scsi_init hook") since they are both essentially upstream fodder
> > already _except_ that they wouldn't be being presented at the same time
> > as a consumer of the change.
>
> I met one of the core u-boot developers, Marek Vasut at decvonf.cz and
> ended up talking quite a bit with him about upstreaming sunxi-u-boot.
>
> I think that it is safe to say that they are definitively interested in
> fixes like this going upstream immediately. So please do submit these
> upstream as soon as you feel they are ready to go upstream.
>
> Upstream also is the proper place to discuss whether making the ahci
> probe delay longer makes sense for all boards, or if we need to make it
> an #ifdef SUXNI thing.
[...]
OK, I'll copy the series to the mainline list as I resend.
> So now that the cat is out of the bag wrt me talking to Marek, yes there
> now is something resembling a plan for upstreaming u-boot sunxi.
Can you share the details?
> I won't
> start working on this until I've finished getting all the kernel bits
> I've currently in-flight upstream as I don't want to open yet another
> "battle front". If anyone wants to beat me working on this they are
> very much invited to do so (*).
FWIW I've been mulling this over since it was discussed over dinner at
FOSDEM.
What I've thought of doing is creating a rebasing git branch based on
the current mainline base used in the sunxi branch.
The contents of the mainlining branch would be a series of cleaned up
commits suitable for sending upstream.
The mainlining and sunxi branches can then be diffed against each other
to see what still remains to be done, which anyone can do in parallel
for the stuff they care about.
Any clean ups would need to appear in the sunxi branch, but this would
happen naturally as things got upstreamed and merged back or could
happen explicitly by patching sunxi too.
When some portion of the mainlining branch gets upstreamed then sunxi
merges a new upstream and the mainlining branch is rebased, repeat until
the diff is uninteresting.
What I've actually got right now is a branch which can FEL boot on
exactly sun7i cubietruck i.e. no sun[1234556]i, single board, bare
minimum drivers, not even MMC boot yet, but including the core SPL
framework, clocks, timers, board.c etc.
Functionalitywise it's not very interesting but it is a baseline
discussion/review and for others to run git diff against and extract the
bits they care about (and/or have hardware for etc), which can then be
added to the branch. IOW it's intended as a seed and I'm not offering to
do all the work myself ;-).
I haven't yet turned it into a potentially upstreamable series of
commits, I was waiting till I got round to writing this mail to see if
that would be worthwhile.
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/groups/opt_out.
