Any outstanding ARM pull requests?

U-Boot Albert ARIBAUD 5 participants 8 messages Mar 8, 2012 – Mar 28, 2012

lore

Share & tools

lore

Albert ARIBAUD

author

2012-03-08 07:20 UTC #0 lore raw

Hi all,

On my working repo where I have all ARM subrepos as remotes, a

	git branch -r --no-merged | grep '/master'

with HEAD set to my master branch gives the following:

u-boot-atmel/master
u-boot-atmel/master-arm
u-boot-imx/master
u-boot-pxa/master
u-boot-samsung/master
u-boot-tegra/master

Which means there are commmits on these repo's master branches that are not currently in u-boot-arm.

Are there any ARM pull requests pending that I would have missed or are about to be sent?

Amicalement,

Signature · 1 line

Albert.

Stefano Babic

2012-03-08 07:29 UTC #1 lore raw

Quoted 2 lines · Albert ARIBAUD

Hi all,

Hi Albert,

Quoted 5 lines

Which means there are commmits on these repo's master branches that are not currently in u-boot-arm.
Are there any ARM pull requests pending that I would have missed or are about to be sent?

On i.MX, yes - I have applied yesterday some fixes. I will send today my pull request.

Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Minkyu Kang

2012-03-08 08:06 UTC #2 lore raw

Dear Albert,

Quoted 9 lines · Stefano Babic

Quoted 2 lines · Albert ARIBAUD
Hi all,
Hi Albert,
Quoted 3 lines
Which means there are commmits on these repo's master branches that are not currently in u-boot-arm.

Quoted 8 lines

Quoted 2 lines
Are there any ARM pull requests pending that I would have missed or are about to be sent?
On i.MX, yes - I have applied yesterday some fixes. I will send today my pull request.
Stefano

I have two commits (or three).
I will send the pull request.

Thanks :)
Minkyu Kang.

Signature · 2 lines

from. prom.
www.promsoft.net

Albert ARIBAUD

author

2012-03-08 21:05 UTC #4 lore raw

Hi Tom,

Le 08/03/2012 17:02, Tom Warren a ?crit :

Quoted 1 line

What's the cut-off? i.e. could I push it to tomorrow if I run across a problem in testing?

No hurry. Wolfgang's pushed the deadline. :)

(and yes, I saw the pull req and the subsequent hold request)

Quoted 3 lines

Thanks,
Tom

Amicalement,

Signature · 1 line

Albert.

Rob Herring

2012-03-08 16:07 UTC #5 lore raw

In reply to Albert ARIBAUD

Quoted 15 lines · Albert ARIBAUD

Hi all,
On my working repo where I have all ARM subrepos as remotes, a
    git branch -r --no-merged | grep '/master'
with HEAD set to my master branch gives the following:
u-boot-atmel/master
u-boot-atmel/master-arm
u-boot-imx/master
u-boot-pxa/master
u-boot-samsung/master
u-boot-tegra/master

Quoted 7 lines

Which means there are commmits on these repo's master branches that are not currently in u-boot-arm.
Are there any ARM pull requests pending that I would have missed or are about to be sent?
Amicalement,

The highbank fixes are still not applied. You can get them off the list or here's a pull request again:

The following changes since commit 2acca35ce4604dcef933f07d90aa9c9c930e1049:

Merge branch 'master' of git://git.denx.de/u-boot-mmc (2012-02-17
23:54:46 +0100)

are available in the git repository at:

git://sources.calxeda.com/u-boot.git fixes

Rob Herring (4):
net: calxedaxgmac: fix build due to missing __aligned definition
ARM: highbank: fix warning for calxedaxgmac_initialize
ARM: highbank: add missing get_tbclk
ARM: highbank: fix us_to_tick calculation

 arch/arm/cpu/armv7/highbank/timer.c |    9 +++++++--
 board/highbank/highbank.c           |    1 +
 drivers/net/calxedaxgmac.c          |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

Rob

Rob Herring

Acked-by Mike Frysinger

2012-03-28 18:15 UTC #6 lore raw

Albert, Wolfgang,

Quoted 43 lines · Rob Herring

Quoted 15 lines · Albert ARIBAUD
Hi all,
On my working repo where I have all ARM subrepos as remotes, a
    git branch -r --no-merged | grep '/master'
with HEAD set to my master branch gives the following:
u-boot-atmel/master
u-boot-atmel/master-arm
u-boot-imx/master
u-boot-pxa/master
u-boot-samsung/master
u-boot-tegra/master
Quoted 7 lines
Which means there are commmits on these repo's master branches that are not currently in u-boot-arm.
Are there any ARM pull requests pending that I would have missed or are about to be sent?
Amicalement,
The highbank fixes are still not applied. You can get them off the list or here's a pull request again:
The following changes since commit 2acca35ce4604dcef933f07d90aa9c9c930e1049:
Merge branch 'master' of git://git.denx.de/u-boot-mmc (2012-02-17
23:54:46 +0100)
are available in the git repository at:
git://sources.calxeda.com/u-boot.git fixes
Rob Herring (4):
net: calxedaxgmac: fix build due to missing __aligned definition
ARM: highbank: fix warning for calxedaxgmac_initialize
ARM: highbank: add missing get_tbclk
ARM: highbank: fix us_to_tick calculation

Quoted 5 lines

 arch/arm/cpu/armv7/highbank/timer.c |    9 +++++++--
 board/highbank/highbank.c           |    1 +
 drivers/net/calxedaxgmac.c          |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

Can one of you please apply these fixes for highbank. The build has been broken for nearly 3 months since this commit. This commit broke things due to Wolfgang's fixup of aligned attribute. I submitted the fix nearly 2 months ago.

commit efdd731957caff85db619636a972b7f5404ea9b4

Author: Rob Herring <[email protected]>
Date:   Thu Dec 15 11:15:49 2011 +0000

net: add Calxeda xgmac driver

This adds ethernet driver for Calxeda xgmac found on Highbank SOC.

Signed-off-by Rob Herring <[email protected]>

Fix: WARNING: __aligned(size) is preferred over __attribute__((aligned(size)))

Signed-off-by Wolfgang Denk <[email protected]>

Then it was broken in a second place with this commit due to missing get_tbclk:

commit 9c3483113de1204118a1b252bf4c81b899dd12b4

Author: Heiko Schocher <[email protected]>
Date:   Mon Jan 16 21:13:05 2012 +0000

common: add possibility for readline_into_buffer timeout

add possibility to add a timeout when reading a line into a buffer.

Signed-off-by Heiko Schocher <[email protected]>

Cc Mike Frysinger <[email protected]>

Acked-by Mike Frysinger <[email protected]>

I've rebased the fixes branch again to current master, so here's an updated pull request:

The following changes since commit 7cb30b13f12077c7eec8ce2419cd96cd65ace8e2:

Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
(2012-03-23 21:59:16 +0100)

are available in the git repository at:

git://sources.calxeda.com/u-boot.git fixes

 arch/arm/cpu/armv7/highbank/timer.c |    9 +++++++--
 board/highbank/highbank.c           |    1 +
 drivers/net/calxedaxgmac.c          |    1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

Regards,
Rob

Albert ARIBAUD

author

2012-03-28 21:35 UTC #7 lore raw

Hi Rob,

Quoted 5 lines

The following changes since commit 7cb30b13f12077c7eec8ce2419cd96cd65ace8e2:
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
(2012-03-23 21:59:16 +0100)

Quoted 8 lines

are available in the git repository at:
git://sources.calxeda.com/u-boot.git fixes
Rob Herring (4):
net: calxedaxgmac: fix build due to missing __aligned definition
ARM: highbank: fix warning for calxedaxgmac_initialize
ARM: highbank: add missing get_tbclk

These three are OK and applied to u-boot-arm/master.

Quoted 1 line

ARM: highbank: fix us_to_tick calculation

This one is part of a 6-patch set, the whole of which should go in if the fix is to go. Whole set applied to u-boot-arm/master, with a minor correction to patch 5/6 which had line with a whitespace error.

Quoted 7 lines

  arch/arm/cpu/armv7/highbank/timer.c |    9 +++++++--
  board/highbank/highbank.c           |    1 +
  drivers/net/calxedaxgmac.c          |    1 +
  3 files changed, 9 insertions(+), 2 deletions(-)

Regards,
Rob

Amicalement,

Signature · 1 line

Albert.