Zoom2 initial support rebased to arm/next
Here is the changes to Zoom2 to rebase onto the arm/next branch Patch set to follow.
Tom
1.
omap gpio changed to applyMakefile change
Whitespace in docs
Jean-Christophe Zoom2 base 4/24
2.
Quoted 6 lines
Quoted 6 lines
Divisor field is called PTV not PVT.
This change is needed because of earlier OMAP commit
81472d893fa565c9d300928a40e504a689bde131
of the same name
this change need to be done at the first patch otherwise will not be able to compile it or bisect it at all
Tom: Rebased into 1
3.
Quoted 8 lines
---
a/include/configs/omap3_zoom2.hReview line 97
Quoted 7 lines
+++
b/include/configs/omap3_zoom2.h(quoted diff) +2
-0@@ -93,6 +93,22 @@ #define CONFIG_OMAP3_MMC 1 #define CONFIG_DOS_PARTITION 1 +/* Status LED */ +#define CONFIG_STATUS_LED 1 /* Status LED enabled */
^^^^^^^^^^^^^^^
please use tab not space and so on
Tom: Tabified all led #defines
4.
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
as said precedently .ARM.extab & .ARM.exidx is not needed please remove
Quoted 1 line
I've seen you fix it in the 10th patch
So what does this mean now? Will this patch 01/10 be accepted?
As ask on the [PATCH 05/10] ZOOM2: rename timer divisor this patch and the 5th need to be joined otherwise fine
Tom: Rebased into 1
Testing
Run tested on zoom2 and zoom1
Compile tested with MAKEALL arm
Hi Tom,
Quoted 1 line · Tom
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
Quoted 14 lines · Dirk Behme
Hi Tom,
Quoted 1 line · Tom
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
Quoted 6 lines
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 ? Tom
Dear Tom, dear Jean-Christophe,
Quoted 20 lines · Tom
Quoted 19 lines · Dirk Behme
Hi Tom,
Quoted 1 line · Tom
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
Quoted 7 lines
Quoted 1 line
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.
Dear Tom, dear Jean-Christophe,
Quoted 38 lines · Dirk Behme
Dear Tom, dear Jean-Christophe,
Quoted 20 lines · Tom
Quoted 19 lines · Dirk Behme
Hi Tom,
Quoted 1 line · Tom
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
Quoted 7 lines
Quoted 1 line
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
Quoted 8 lines
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?
Any news regarding the Zoom2 patches? Seems to me that above (1) is done. Are you just busy (and I'm too impatient? Sorry!) or are there other issues delaying Zoom2 patches?
Many thanks and best regards
Dirk
Quoted 7 lines
[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 thestatus_ledand colour led API.
- ARM Add blue colour LED tostatus_led.
Dirk,
I believe I caught and fixed these changes when rebasing my zoom2 patches to the latest arm/next
From my notes :
Remove SDP_3430_V1 and SDP_3430_V2 per upstream changes
These were removed in the zoom2.h file.
No other changes needed.
Tom
Quoted 20 lines · Dirk Behme
Hi Tom,
Quoted 1 line · Tom
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