diff options
author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-09-14 14:54:11 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@gmail.com> | 2007-09-19 22:13:16 -0400 |
commit | 658e81701970a82d33f46241f20be416ebd5e930 (patch) | |
tree | 3390a85f111ee99c666dacb0573c455fe0ac2cf5 /arch/powerpc/boot/bamboo.c | |
parent | 0ce49a3945474fc942ec37c0c0efece60f592f80 (diff) |
[POWERPC] cuimage for Bamboo board
Add a cuboot wrapper for the Bamboo board. Additionally, we enable MAC
address fixups for both cuboot and treeboot.
This also removes some obsoleted linker declarations that have been
moved into ops.h
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'arch/powerpc/boot/bamboo.c')
-rw-r--r-- | arch/powerpc/boot/bamboo.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/boot/bamboo.c b/arch/powerpc/boot/bamboo.c index bc097694b445..f61fcdab1c7c 100644 --- a/arch/powerpc/boot/bamboo.c +++ b/arch/powerpc/boot/bamboo.c | |||
@@ -24,8 +24,7 @@ | |||
24 | #include "4xx.h" | 24 | #include "4xx.h" |
25 | #include "44x.h" | 25 | #include "44x.h" |
26 | 26 | ||
27 | extern char _dtb_start[]; | 27 | static u8 *bamboo_mac0, *bamboo_mac1; |
28 | extern char _dtb_end[]; | ||
29 | 28 | ||
30 | static void bamboo_fixups(void) | 29 | static void bamboo_fixups(void) |
31 | { | 30 | { |
@@ -34,12 +33,15 @@ static void bamboo_fixups(void) | |||
34 | ibm440ep_fixup_clocks(sysclk, 11059200); | 33 | ibm440ep_fixup_clocks(sysclk, 11059200); |
35 | ibm4xx_fixup_memsize(); | 34 | ibm4xx_fixup_memsize(); |
36 | ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00); | 35 | ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00); |
36 | dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1); | ||
37 | } | 37 | } |
38 | 38 | ||
39 | void bamboo_init(void) | 39 | void bamboo_init(void *mac0, void *mac1) |
40 | { | 40 | { |
41 | platform_ops.fixups = bamboo_fixups; | 41 | platform_ops.fixups = bamboo_fixups; |
42 | platform_ops.exit = ibm44x_dbcr_reset; | 42 | platform_ops.exit = ibm44x_dbcr_reset; |
43 | bamboo_mac0 = mac0; | ||
44 | bamboo_mac1 = mac1; | ||
43 | ft_init(_dtb_start, 0, 32); | 45 | ft_init(_dtb_start, 0, 32); |
44 | serial_console_init(); | 46 | serial_console_init(); |
45 | } | 47 | } |