Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / treeboot-bamboo.c

diff --git a/arch/powerpc/boot/treeboot-bamboo.c b/arch/powerpc/boot/treeboot-bamboo.c
index 1f1fe5aaac126a43a642fa36da19e5bced225aca..9eee48fc7114daff3e2ea241ed61a1ca1d89e6fc 100644 (file)
--- a/arch/powerpc/boot/treeboot-bamboo.c
+++ b/arch/powerpc/boot/treeboot-bamboo.c
@@ -12,16 +12,32 @@
 #include "ops.h"
 #include "stdio.h"
 #include "44x.h"
-
-extern char _end[];
+#include "stdlib.h"
 
 BSS_STACK(4096);
 
+#define PIBS_MAC0 0xfffc0400
+#define PIBS_MAC1 0xfffc0500
+char pibs_mac0[6];
+char pibs_mac1[6];
+
+static void read_pibs_mac(void)
+{
+       unsigned long long mac64;
+
+       mac64 = strtoull((char *)PIBS_MAC0, 0, 16);
+       memcpy(&pibs_mac0, (char *)&mac64+2, 6);
+
+       mac64 = strtoull((char *)PIBS_MAC1, 0, 16);
+       memcpy(&pibs_mac1, (char *)&mac64+2, 6);
+}
+
 void platform_init(void)
 {
        unsigned long end_of_ram = 0x8000000;
        unsigned long avail_ram = end_of_ram - (unsigned long)_end;
 
        simple_alloc_init(_end, avail_ram, 32, 64);
-       bamboo_init();
+       read_pibs_mac();
+       bamboo_init((u8 *)&pibs_mac0, (u8 *)&pibs_mac1);
 }