[U-Boot] Zoom2 initial support rebased to arm/next

[Dirk Behme]

Dear Tom, dear Jean-Christophe,

Tom wrote:
> Dirk Behme wrote:
>> Hi Tom,
>>
>> Tom wrote:
>>> Here is the changes to Zoom2 to rebase onto the arm/next branch
>>
>> I'm not sure and and didn't test it, but it seems to me that we might 
>> get some conflicts with patches in arm/master branch and these against 
>> arm/next.
>>
>> With Premi's patch that removes unused board-types
>>
>> http://git.denx.de/?p=u-boot/u-boot-arm.git;a=commit;h=90006e9b33bcdbf241b0295d186e3634137907a9 
>>
>>
>> it might conflict with your patch that still assumes the struct 
>> elements and macros are still there (?).
>>
>> Best regards
>>
>> Dirk
> Yes, I think so.
> My rebase to arm/next was because the arm led patch that was part of the 
> patch set against master was pushed there.
> I think the changes in the above patch are straightforward so should be 
> easy to fix the conflicts when the merge happens.
> Can this wait till after the whole patch set is pushed to arm/next ?

Yes. But somebody should help Jean-Christophe with merge resolve then.

Now that all other OMAP3 patches are in mainline, easiest would be 
something like:

1) Update u-boot-arm master and next against mainline

2) Move the three (*) patches from u-boot-arm next to u-boot-arm 
master as proposed by Wolfgang [bottom of 1].

3) With (1) and (2) we have all OMAP3 patches and already applied 
Zoom2 patches in one git. Now we will be able to update the remaining 
5 Zoom2 patches against it.

What do you think? Any easier way?

Best regards

Dirk

[1] http://lists.denx.de/pipermail/u-boot/2009-May/051863.html

(*) Already applied Zoom2 patches at u-boot-arm next:

- ZOOM1 Remove more legacy NAND defines.
- LED Add documentation describing the status_led and colour led API.
- ARM Add blue colour LED to status_led.