diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2009-03-31 23:02:38 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2009-04-01 15:29:44 -0500 |
| commit | 7649a590b53ee548f41428bf20780f74ce9fc099 (patch) | |
| tree | 760d4e61535a9e5382dbe81cc6b0feddace4cd7f /cpu/mpc86xx/fdt.c | |
| parent | f6ef8b7a43ed7f68a4bb524faad5e4f75ea3e3e2 (diff) | |
| download | blackbird-obmc-uboot-7649a590b53ee548f41428bf20780f74ce9fc099.tar.gz blackbird-obmc-uboot-7649a590b53ee548f41428bf20780f74ce9fc099.zip | |
86xx: Cleanup MP support
* Use CONFIG_MP instead of CONFIG_NUM_CPUS to match 85xx
* Introduce determine_mp_bootpg() helper. We'll need this to address a
bug introduced in v2009.03 with 86xx MP booting. We have to make sure
to reserve the region of memory used for the MP bootpg() so other
u-boot code doesn't use it.
* Added dummy versions of cpu_reset(), cpu_status() & cpu_release() to
allow cmd_mp.c to build and work. In the future we should look at
implementing all these functions. This could be common w/85xx if we
use spin tables on 86xx.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'cpu/mpc86xx/fdt.c')
| -rw-r--r-- | cpu/mpc86xx/fdt.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/cpu/mpc86xx/fdt.c b/cpu/mpc86xx/fdt.c index 383b06b5ae..a36ee30c3f 100644 --- a/cpu/mpc86xx/fdt.c +++ b/cpu/mpc86xx/fdt.c @@ -9,15 +9,15 @@ #include <common.h> #include <libfdt.h> #include <fdt_support.h> -#include "mp.h" +#include <asm/mp.h> DECLARE_GLOBAL_DATA_PTR; void ft_cpu_setup(void *blob, bd_t *bd) { -#if (CONFIG_NUM_CPUS > 1) +#ifdef CONFIG_MP int off; - u32 bootpg; + u32 bootpg = determine_mp_bootpg(); #endif do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, @@ -48,13 +48,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) "clock-frequency", CONFIG_SYS_NS16550_CLK, 1); #endif -#if (CONFIG_NUM_CPUS > 1) - /* if we have 4G or more of memory, put the boot page at 4Gb-1M */ - if (gd->ram_size > 0xfffff000) - bootpg = 0xfff00000; - else - bootpg = gd->ram_size - (1024 * 1024); - +#ifdef CONFIG_MP /* Reserve the boot page so OSes dont use it */ off = fdt_add_mem_rsv(blob, bootpg, (u64)4096); if (off < 0) |
