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/bamboo.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/bamboo.c')
-rw-r--r-- | arch/ppc/platforms/4xx/bamboo.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/ppc/platforms/4xx/bamboo.c b/arch/ppc/platforms/4xx/bamboo.c index 78a403b48dba..159b228eca1e 100644 --- a/arch/ppc/platforms/4xx/bamboo.c +++ b/arch/ppc/platforms/4xx/bamboo.c | |||
@@ -51,7 +51,7 @@ | |||
51 | #include <syslib/gen550.h> | 51 | #include <syslib/gen550.h> |
52 | #include <syslib/ibm440gx_common.h> | 52 | #include <syslib/ibm440gx_common.h> |
53 | 53 | ||
54 | bd_t __res; | 54 | extern bd_t __res; |
55 | 55 | ||
56 | static struct ibm44x_clocks clocks __initdata; | 56 | static struct ibm44x_clocks clocks __initdata; |
57 | 57 | ||
@@ -425,17 +425,7 @@ bamboo_setup_arch(void) | |||
425 | void __init platform_init(unsigned long r3, unsigned long r4, | 425 | void __init platform_init(unsigned long r3, unsigned long r4, |
426 | unsigned long r5, unsigned long r6, unsigned long r7) | 426 | unsigned long r5, unsigned long r6, unsigned long r7) |
427 | { | 427 | { |
428 | parse_bootinfo(find_bootinfo()); | 428 | ibm44x_platform_init(r3, r4, r5, r6, r7); |
429 | |||
430 | /* | ||
431 | * If we were passed in a board information, copy it into the | ||
432 | * residual data area. | ||
433 | */ | ||
434 | if (r3) | ||
435 | __res = *(bd_t *)(r3 + KERNELBASE); | ||
436 | |||
437 | |||
438 | ibm44x_platform_init(); | ||
439 | 429 | ||
440 | ppc_md.setup_arch = bamboo_setup_arch; | 430 | ppc_md.setup_arch = bamboo_setup_arch; |
441 | ppc_md.show_cpuinfo = bamboo_show_cpuinfo; | 431 | ppc_md.show_cpuinfo = bamboo_show_cpuinfo; |