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