* [U-Boot] Any outstanding ARM pull requests?
@ 2012-03-08 7:20 Albert ARIBAUD
2012-03-08 7:29 ` Stefano Babic
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Albert ARIBAUD @ 2012-03-08 7:20 UTC (permalink / raw)
To: u-boot
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,
--
Albert.
^ permalink raw reply [flat|nested] 8+ messages in thread* [U-Boot] Any outstanding ARM pull requests?
2012-03-08 7:20 [U-Boot] Any outstanding ARM pull requests? Albert ARIBAUD
@ 2012-03-08 7:29 ` Stefano Babic
2012-03-08 8:06 ` Minkyu Kang
2012-03-08 16:02 ` Tom Warren
2012-03-08 16:07 ` Rob Herring
2 siblings, 1 reply; 8+ messages in thread
From: Stefano Babic @ 2012-03-08 7:29 UTC (permalink / raw)
To: u-boot
On 08/03/2012 08:20, Albert ARIBAUD wrote:
> Hi all,
>
Hi Albert,
> 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
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] Any outstanding ARM pull requests?
2012-03-08 7:29 ` Stefano Babic
@ 2012-03-08 8:06 ` Minkyu Kang
0 siblings, 0 replies; 8+ messages in thread
From: Minkyu Kang @ 2012-03-08 8:06 UTC (permalink / raw)
To: u-boot
Dear Albert,
On 8 March 2012 16:29, Stefano Babic <sbabic@denx.de> wrote:
> On 08/03/2012 08:20, Albert ARIBAUD wrote:
>> Hi all,
>>
>
> Hi Albert,
>
>> 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
>
I have two commits (or three).
I will send the pull request.
Thanks :)
Minkyu Kang.
--
from. prom.
www.promsoft.net
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] Any outstanding ARM pull requests?
2012-03-08 7:20 [U-Boot] Any outstanding ARM pull requests? Albert ARIBAUD
2012-03-08 7:29 ` Stefano Babic
@ 2012-03-08 16:02 ` Tom Warren
2012-03-08 21:05 ` Albert ARIBAUD
2012-03-08 16:07 ` Rob Herring
2 siblings, 1 reply; 8+ messages in thread
From: Tom Warren @ 2012-03-08 16:02 UTC (permalink / raw)
To: u-boot
Albert,
> -----Original Message-----
> From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
> Sent: Thursday, March 08, 2012 12:20 AM
> To: U-Boot at lists.denx.de
> Cc: Reinhard Meyer; Stefano Babic; Marek Vasut; Minkyu Kang; Tom Warren
> Subject: Any outstanding ARM pull requests?
>
> 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?
I hope to get a pull request together today for u-boot-tegra/master.
What's the cut-off? i.e. could I push it to tomorrow if I run across a problem in testing?
Thanks,
Tom
--
nvpublic
>
> Amicalement,
> --
> Albert.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] Any outstanding ARM pull requests?
2012-03-08 7:20 [U-Boot] Any outstanding ARM pull requests? Albert ARIBAUD
2012-03-08 7:29 ` Stefano Babic
2012-03-08 16:02 ` Tom Warren
@ 2012-03-08 16:07 ` Rob Herring
2012-03-28 18:15 ` Rob Herring
2 siblings, 1 reply; 8+ messages in thread
From: Rob Herring @ 2012-03-08 16:07 UTC (permalink / raw)
To: u-boot
On 03/08/2012 01:20 AM, Albert ARIBAUD wrote:
> 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,
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
^ permalink raw reply [flat|nested] 8+ messages in thread* [U-Boot] Any outstanding ARM pull requests?
2012-03-08 16:07 ` Rob Herring
@ 2012-03-28 18:15 ` Rob Herring
2012-03-28 21:35 ` Albert ARIBAUD
0 siblings, 1 reply; 8+ messages in thread
From: Rob Herring @ 2012-03-28 18:15 UTC (permalink / raw)
To: u-boot
Albert, Wolfgang,
On 03/08/2012 10:07 AM, Rob Herring wrote:
>
> On 03/08/2012 01:20 AM, Albert ARIBAUD wrote:
>> 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,
>
> 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(-)
>
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 <rob.herring@calxeda.com>
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 <rob.herring@calxeda.com>
Fix: WARNING: __aligned(size) is preferred over
__attribute__((aligned(size)))
Signed-off-by: Wolfgang Denk <wd@denx.de>
Then it was broken in a second place with this commit due to missing
get_tbclk:
commit 9c3483113de1204118a1b252bf4c81b899dd12b4
Author: Heiko Schocher <hs@denx.de>
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 <hs@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
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
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(-)
Regards,
Rob
^ permalink raw reply [flat|nested] 8+ messages in thread* [U-Boot] Any outstanding ARM pull requests?
2012-03-28 18:15 ` Rob Herring
@ 2012-03-28 21:35 ` Albert ARIBAUD
0 siblings, 0 replies; 8+ messages in thread
From: Albert ARIBAUD @ 2012-03-28 21:35 UTC (permalink / raw)
To: u-boot
Hi Rob,
> 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
>
> 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.
> 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.
> 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,
--
Albert.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-03-28 21:35 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-08 7:20 [U-Boot] Any outstanding ARM pull requests? Albert ARIBAUD
2012-03-08 7:29 ` Stefano Babic
2012-03-08 8:06 ` Minkyu Kang
2012-03-08 16:02 ` Tom Warren
2012-03-08 21:05 ` Albert ARIBAUD
2012-03-08 16:07 ` Rob Herring
2012-03-28 18:15 ` Rob Herring
2012-03-28 21:35 ` Albert ARIBAUD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox