diff options
author | Matt Porter <mporter@kernel.crashing.org> | 2005-10-28 20:46:14 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-28 23:55:39 -0400 |
commit | d5f7b06b036afc2cb250decb2c76b7f82c5de639 (patch) | |
tree | a4c67d17b5ee7ba23490977bbe74c42201e1d54d /arch/ppc/platforms/4xx/luan.c | |
parent | de957c89b7dadb3147e885d7b6eb9db73d0eea57 (diff) |
[PATCH] ppc32: Cleanup AMCC PPC44x eval board U-Boot support
Cleanup PPC440 eval boards (bamboo, ebony, luan and ocotea) to better
support U-Boot as bootloader.
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/platforms/4xx/luan.c')
-rw-r--r-- | arch/ppc/platforms/4xx/luan.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c index 16d953bda22..d810b736d9b 100644 --- a/arch/ppc/platforms/4xx/luan.c +++ b/arch/ppc/platforms/4xx/luan.c | |||
@@ -52,7 +52,7 @@ | |||
52 | #include <syslib/ibm440gx_common.h> | 52 | #include <syslib/ibm440gx_common.h> |
53 | #include <syslib/ibm440sp_common.h> | 53 | #include <syslib/ibm440sp_common.h> |
54 | 54 | ||
55 | bd_t __res; | 55 | extern bd_t __res; |
56 | 56 | ||
57 | static struct ibm44x_clocks clocks __initdata; | 57 | static struct ibm44x_clocks clocks __initdata; |
58 | 58 | ||
@@ -355,16 +355,7 @@ luan_setup_arch(void) | |||
355 | void __init platform_init(unsigned long r3, unsigned long r4, | 355 | void __init platform_init(unsigned long r3, unsigned long r4, |
356 | unsigned long r5, unsigned long r6, unsigned long r7) | 356 | unsigned long r5, unsigned long r6, unsigned long r7) |
357 | { | 357 | { |
358 | parse_bootinfo(find_bootinfo()); | 358 | ibm44x_platform_init(r3, r4, r5, r6, r7); |
359 | |||
360 | /* | ||
361 | * If we were passed in a board information, copy it into the | ||
362 | * residual data area. | ||
363 | */ | ||
364 | if (r3) | ||
365 | __res = *(bd_t *)(r3 + KERNELBASE); | ||
366 | |||
367 | ibm44x_platform_init(); | ||
368 | 359 | ||
369 | ppc_md.setup_arch = luan_setup_arch; | 360 | ppc_md.setup_arch = luan_setup_arch; |
370 | ppc_md.show_cpuinfo = luan_show_cpuinfo; | 361 | ppc_md.show_cpuinfo = luan_show_cpuinfo; |