-----Original Message----- From: Dirk Behme [mailto:dirk.behme@googlemail.com] Sent: Saturday, April 25, 2009 11:05 AM To: U-Boot user list; Jean-Christophe PLAGNIOL-VILLARD; Premi, Sanjeev; Tom Rix Cc: Wolfgang Denk Subject: Re: OMAP3: Pending patches

Short status update after scanning the recent mails:

Dirk Behme wrote:

...

To avoid loosing the overview, here my list of pending

OMAP3 patches

...

ready to be applied. From my point of view there are no

open comments on

...

these which will prevent to apply them. But please correct if I overlooked anything or add what (patches? comments?) I missed.

1. OMAP3: Beagle: Set pinmux conditionally for Rev C boards

http://lists.denx.de/pipermail/u-boot/2009-April/051013.html

2. OMAP3: Remove legacy NAND defines

http://lists.denx.de/pipermail/u-boot/2009-April/050882.html

3. OMAP3: Fix timer handling to 1ms and CONFIG_SYS_HZ to 1000

http://lists.denx.de/pipermail/u-boot/2009-April/051178.html

4. OMAP3: Fix changed mmc init command

http://lists.denx.de/pipermail/u-boot/2009-April/051179.html

5. OMAP3: Remove unused board-types

http://lists.denx.de/pipermail/u-boot/2009-April/051338.html

We will try to switch to

print_cpuinfo & checkboard

http://lists.denx.de/pipermail/u-boot/2009-April/051365.html

Premi: Do you like to have a look? Hopefully it wouldn't be too hard.

[SP] Sure, I will...

Jean-Christophe: Please fix the "test-only" and add the documentation as requested by Wolfgang as soon as possible, that we can safely use it.

http://lists.denx.de/pipermail/u-boot/2009-April/051382.html

...

6. OMAP3: Print correct silicon revision

http://lists.denx.de/pipermail/u-boot/2009-April/051339.html

7. Zoom2 respin II (10 patches)

http://lists.denx.de/pipermail/u-boot/2009-April/050863.html http://lists.denx.de/pipermail/u-boot/2009-April/050864.html http://lists.denx.de/pipermail/u-boot/2009-April/050865.html http://lists.denx.de/pipermail/u-boot/2009-April/050866.html http://lists.denx.de/pipermail/u-boot/2009-April/050868.html http://lists.denx.de/pipermail/u-boot/2009-April/050867.html http://lists.denx.de/pipermail/u-boot/2009-April/050869.html http://lists.denx.de/pipermail/u-boot/2009-April/050870.html http://lists.denx.de/pipermail/u-boot/2009-April/050871.html http://lists.denx.de/pipermail/u-boot/2009-April/050872.html

After

http://lists.denx.de/pipermail/u-boot/2009-April/051383.html http://lists.denx.de/pipermail/u-boot/2009-April/051384.html http://lists.denx.de/pipermail/u-boot/2009-April/051385.html http://lists.denx.de/pipermail/u-boot/2009-April/051386.html

Tom has to check if an update of this series is necessary.

...

Note: There might be some dependencies between some of

these patches.

...

Different authors, sent at different time, unfortunately

this can't be

...

avoided. So dependent on the order the patches will be

applied, there

...

might be some conflicts. Let us know them, we will try to

update/fix

...

then as soon as possible! Most probably 5. and 7. will have some conflicts, as 5. removes some code 7. assumes it is still

there. If this

...

results in a conflict, let us apply the 10 patches from 7.

first and

...

then update 5.

Jean-Christophe: If series 7. needs an update, it would be really helpful if you could apply the other patches so that updated 7. can be rebased against them. This will reduce the risk of conflicts.

Dirk

Dear Dirk,

In message 49F5C746.6040204@googlemail.com you wrote:

Short status update after recent merges and patch updates. As usual, please correct if anything is wrong or missing.

Thanks for the summary.

Dirk Behme wrote:

...

To avoid loosing the overview, here my list of pending OMAP3 patches ready to be applied. From my point of view there are no open comments on these which will prevent to apply them. But please correct if I overlooked anything or add what (patches? comments?) I missed.

1. OMAP3: Beagle: Set pinmux conditionally for Rev C boards

http://lists.denx.de/pipermail/u-boot/2009-April/051013.html

Mail

http://lists.denx.de/pipermail/u-boot/2009-April/051459.html

tells us that this should be applied to u-boot-arm next. But I can't find it in gitweb

http://git.denx.de/?p=u-boot/u-boot-arm.git;a=shortlog;h=refs/heads/next

Did I miss something?

I cannot find it either.

Btw.: As initial patch and first update was sent ~1 day after merge window close (Apr 4?) I hoped to have a chance to still get it into master ;(

We don't have to bend much to consider this even a bug fix (it fixes a specific board configuration, doesn't it?).

...

2. OMAP3: Remove legacy NAND defines

http://lists.denx.de/pipermail/u-boot/2009-April/050882.html

Applied to u-boot-arm next. Request to move to master by Wolfgang.

...

3. OMAP3: Fix timer handling to 1ms and CONFIG_SYS_HZ to 1000

http://lists.denx.de/pipermail/u-boot/2009-April/051178.html

4. OMAP3: Fix changed mmc init command

http://lists.denx.de/pipermail/u-boot/2009-April/051179.html

Applied to u-boot-arm master.

...

5. OMAP3: Remove unused board-types

http://lists.denx.de/pipermail/u-boot/2009-April/051338.html

6. OMAP3: Print correct silicon revision

http://lists.denx.de/pipermail/u-boot/2009-April/051339.html

Patches 5 & 6 replaced by update which includes switch to checkboard and print_cpuinfo:

OMAP3: Board specific updates (3 patches) http://lists.denx.de/pipermail/u-boot/2009-April/051505.html http://lists.denx.de/pipermail/u-boot/2009-April/051506.html http://lists.denx.de/pipermail/u-boot/2009-April/051507.html

...

7. Zoom2 respin II (10 patches)

Note: Initial patch series for this was sent 'Wed Apr 1 18:08:38 CEST 2009'

http://lists.denx.de/pipermail/u-boot/2009-April/050094.html

IMHO this was while open merge window.

...

http://lists.denx.de/pipermail/u-boot/2009-April/050863.html http://lists.denx.de/pipermail/u-boot/2009-April/050864.html http://lists.denx.de/pipermail/u-boot/2009-April/050865.html http://lists.denx.de/pipermail/u-boot/2009-April/050866.html http://lists.denx.de/pipermail/u-boot/2009-April/050868.html http://lists.denx.de/pipermail/u-boot/2009-April/050867.html

Applied to u-boot-arm next (see comment about merge window above).

...

http://lists.denx.de/pipermail/u-boot/2009-April/050869.html

Applied to u-boot-arm next (see comment about merge window above).

...

http://lists.denx.de/pipermail/u-boot/2009-April/050870.html http://lists.denx.de/pipermail/u-boot/2009-April/050871.html

Applied to u-boot-arm next. Request to move to master by Wolfgang.

I think all the patches listed above could and should go into master now.

Jean-Cristophe, what do you think? Do you have any specific reasons for not pulling these into master now?

...

http://lists.denx.de/pipermail/u-boot/2009-April/050872.html

For the rest of the Zoom2 patches (#1, #2, #3, #4, #5, #8 & #10)

http://lists.denx.de/pipermail/u-boot/2009-April/051383.html http://lists.denx.de/pipermail/u-boot/2009-April/051384.html http://lists.denx.de/pipermail/u-boot/2009-April/051385.html http://lists.denx.de/pipermail/u-boot/2009-April/051386.html http://lists.denx.de/pipermail/u-boot/2009-April/051455.html

seem to apply.

I'm not sure what you mean here, Dirk. I understand that Jean-Cristophe requested changes, and we're waiting for a resubmit, right?

Jean-Cristophe, I really would like to see some progress in this area, so I'd appreciate if you could apply the patches listed above to master and send me a pull request. Thanks.

Best regards,

Wolfgang Denk

Short status update after recent ARM pull request

http://lists.denx.de/pipermail/u-boot/2009-April/051803.html

Dirk Behme wrote:

...

To avoid loosing the overview, here my list of pending OMAP3 patches ready to be applied. From my point of view there are no open comments on these which will prevent to apply them. But please correct if I overlooked anything or add what (patches? comments?) I missed.

1. OMAP3: Beagle: Set pinmux conditionally for Rev C boards

http://lists.denx.de/pipermail/u-boot/2009-April/051013.html

Mail

http://lists.denx.de/pipermail/u-boot/2009-April/051459.html

tells us that this should be applied to u-boot-arm next. But I can't find it in gitweb

http://git.denx.de/?p=u-boot/u-boot-arm.git;a=shortlog;h=refs/heads/next

Did I miss something?

Btw.: As initial patch and first update was sent ~1 day after merge window close (Apr 4?) I hoped to have a chance to still get it into master ;(

Applied to u-boot-arm next.

...

2. OMAP3: Remove legacy NAND defines

http://lists.denx.de/pipermail/u-boot/2009-April/050882.html

Applied to u-boot-arm next. Request to move to master by Wolfgang.

Copied to u-boot-arm master and part of above ARM pull request (still in u-boot-arm next, too?)

...

3. OMAP3: Fix timer handling to 1ms and CONFIG_SYS_HZ to 1000

http://lists.denx.de/pipermail/u-boot/2009-April/051178.html

Pending

http://lists.denx.de/pipermail/u-boot/2009-April/051518.html

...

4. OMAP3: Fix changed mmc init command

http://lists.denx.de/pipermail/u-boot/2009-April/051179.html

Applied to u-boot-arm master.

... and part of above ARM pull request.

...

5. OMAP3: Remove unused board-types

http://lists.denx.de/pipermail/u-boot/2009-April/051338.html

6. OMAP3: Print correct silicon revision

http://lists.denx.de/pipermail/u-boot/2009-April/051339.html

Patches 5 & 6 replaced by update which includes switch to checkboard and print_cpuinfo:

OMAP3: Board specific updates (3 patches) http://lists.denx.de/pipermail/u-boot/2009-April/051505.html http://lists.denx.de/pipermail/u-boot/2009-April/051506.html http://lists.denx.de/pipermail/u-boot/2009-April/051507.html

All three patches applied to u-boot-arm master and part of above pull request.

...

7. Zoom2 respin II (10 patches)

...

Recent remaining 5 Zoom2 patches

http://lists.denx.de/pipermail/u-boot/2009-April/051651.html http://lists.denx.de/pipermail/u-boot/2009-April/051652.html http://lists.denx.de/pipermail/u-boot/2009-April/051653.html http://lists.denx.de/pipermail/u-boot/2009-April/051654.html http://lists.denx.de/pipermail/u-boot/2009-April/051655.html

pending/under discussion

http://lists.denx.de/pipermail/u-boot/2009-April/051792.html

Summary:

Besides the question if "Set pinmux conditionally for Rev C boards" should go from next to master, the 5 "Zoom2" and the "OMAP3: Fix timer handling to 1ms and CONFIG_SYS_HZ to 1000" are still open.

Best regards

Dirk

Dear Wolfgang,

Wolfgang Denk wrote:

Dear Dirk Behme,

In message 49F9F000.2060808@googlemail.com you wrote:

...

Short status update after recent ARM pull request

Thanks for keeping the summary up to date. This is really helpful in this complicated situation.

...

...

...

1. OMAP3: Beagle: Set pinmux conditionally for Rev C boards

http://lists.denx.de/pipermail/u-boot/2009-April/051013.html

...

...

Applied to u-boot-arm next.

I cherry-picked it form there. It's in the master branch of the master repo now. [Well, give me 10 minutes until it makes it to the public server.]

...

...

...

2. OMAP3: Remove legacy NAND defines

http://lists.denx.de/pipermail/u-boot/2009-April/050882.html

Applied to u-boot-arm next. Request to move to master by Wolfgang.

Copied to u-boot-arm master and part of above ARM pull request (still in u-boot-arm next, too?)

That should not matter. git will sort this out.

...

...

...

3. OMAP3: Fix timer handling to 1ms and CONFIG_SYS_HZ to 1000

http://lists.denx.de/pipermail/u-boot/2009-April/051178.html

Pending

Applied to master branch in master repo now.

...

http://lists.denx.de/pipermail/u-boot/2009-April/051518.html

...

...

4. OMAP3: Fix changed mmc init command

http://lists.denx.de/pipermail/u-boot/2009-April/051179.html

Applied to u-boot-arm master.

... and part of above ARM pull request.

...

...

5. OMAP3: Remove unused board-types

http://lists.denx.de/pipermail/u-boot/2009-April/051338.html

6. OMAP3: Print correct silicon revision

http://lists.denx.de/pipermail/u-boot/2009-April/051339.html

Patches 5 & 6 replaced by update which includes switch to checkboard and print_cpuinfo:

OMAP3: Board specific updates (3 patches) http://lists.denx.de/pipermail/u-boot/2009-April/051505.html http://lists.denx.de/pipermail/u-boot/2009-April/051506.html http://lists.denx.de/pipermail/u-boot/2009-April/051507.html

All three patches applied to u-boot-arm master and part of above pull request.

So all the above is in mainline now and can be deleted from this list.

Wow. That was tough.

Thank you for all your help!

Best regards

Dirk