Highbank fixes for 2012.03

From: Rob Herring <[email protected]>

This is a couple of fixes for a build error and warning.

Rob

Rob Herring (2):
ARM: highbank: fix warning for calxedaxgmac_initialize
ARM: highbank: add missing get_tbclk

 arch/arm/cpu/armv7/highbank/timer.c |    5 +++++
 board/highbank/highbank.c           |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

1.7.5.4

From: Rob Herring <[email protected]>

Add include of netdev.h to pick-up declaration of calxedaxgmac_initialize.

---
 board/highbank/highbank.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

index b0aa182..5f34fec 100644
@@ -17,6 +17,7 @@
 
 #include <common.h>
 #include <ahci.h>
+#include <netdev.h>
 #include <scsi.h>
 
 #include <asm/sizes.h>

1.7.5.4

From: Rob Herring <[email protected]>

The get_tbclk function was missing and the recent commit "common: add possibility for readline_into_buffer timeout" makes it required.

---
 arch/arm/cpu/armv7/highbank/timer.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

index d8a0288..d92503f 100644
@@ -121,3 +121,8 @@ ulong get_timer_masked(void)
 {
 	return tick_to_time(get_ticks());
 }
+
+ulong get_tbclk(void)
+{
+	return CONFIG_SYS_HZ;
+}

1.7.5.4

Hi Rob,

Le 21/02/2012 23:52, Rob Herring a ?crit :

Weird: I get a persistent error with ELDK42 (4.2.2) and Ubuntu (4.6.1) ARM toolchains:

calxedaxgmac.c:317: error: expected declaration specifiers or '...' before numeric constant
calxedaxgmac.c:317: warning: function declaration isn't a prototype

I would not mention it if you did not seem to ba able to build on your side, so I must have something wrong in my setup. Can you tell me on which commit ID you applied your patch set?

Amicalement,

Albert.

Albert,

You also need the previous fix that I sent:

http://patchwork.ozlabs.org/patch/139020/

Here's a pull request for all 4 fixes if you prefer:

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(-)

Thanks,
Rob