Unifying the x-loader forks

[Andy Green]

Hi -

I noticed the gitorious tree seems to be a bit stuck while the omapzoom
tree is continuing to be fed and increasingly diverging.

I spent thismorning merging omapzoom's panda_dev branch on to the
gitorious master branch. It yielded a working Panda MLO which was much
faster than the gitorious master version, I guess the new MMC code from
omapzoom's panda_dev helps.

I pushed the unified tree here in branch "unified":

http://git.warmcat.com/cgi-bin/cgit/x-loader/log/?h=unified

I guess some Omap3 stuff will be broken by the large merge, I only
checked for Panda working. Maybe if anyone cares they can bring this
branch into gitorious as a branch and confirm the other configurations;
if they work or can be made to work easily then this can maybe be the
point where the two trees can officially merge.

Otherwise from what I can see without this unification action being
officially accepted the gitorious tree is quite far behind the omapzoom
one, it only has improved Make into a subdir going for it (which is
present in the unified version too) while omapzoom has a lot of new code
including OMAP4 MMC that has a nice benefit.

-Andy

[Anand Gadiyar]

Andy Green wrote:
> Hi -
>
> I noticed the gitorious tree seems to be a bit stuck while
> the omapzoom tree is continuing to be fed and
> increasingly diverging.
>
> I spent thismorning merging omapzoom's panda_dev branch on to the
> gitorious master branch. It yielded a working Panda MLO
> which was much faster than the gitorious master version, I guess
> the new MMC code from omapzoom's panda_dev helps.
>
> I pushed the unified tree here in branch "unified":
>
> http://git.warmcat.com/cgi-bin/cgit/x-loader/log/?h=unified
>
> I guess some Omap3 stuff will be broken by the large merge, I only
> checked for Panda working. Maybe if anyone cares they can bring this
> branch into gitorious as a branch and confirm the other
> configurations;
> if they work or can be made to work easily then this can maybe be the
> point where the two trees can officially merge.

Pushed this branch out on the gitorious tree.

> Otherwise from what I can see without this unification action being
> officially accepted the gitorious tree is quite far behind
> the omapzoom one, it only has improved Make into a subdir going
> for it (which is present in the unified version too) while omapzoom
> has a lot of new code including OMAP4 MMC that has a nice benefit.
>

If someone wants to help unify the codebases, I'll gladly take patches.

Note that Aneesh already posted out a series that gets u-boot SPL
to work. So there's not much interest in the x-loader tree I suppose.

- Anand