diff options
| author | Tom Rini <trini@ti.com> | 2012-10-22 16:54:38 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-22 16:54:38 -0700 |
| commit | c7656bab411433f987baa2288eff8c78ddc0f378 (patch) | |
| tree | 18fe8fa515ecdea19afa83d1af0c6eff4946a5d4 /arch/powerpc/cpu/mpc86xx | |
| parent | bdc3ff6e4f75813d01e51081799d10e4a9c7fbcb (diff) | |
| parent | 23028d69e950023a3cb605751dbcb1e314be8b36 (diff) | |
| download | u-boot-imx-c7656bab411433f987baa2288eff8c78ddc0f378.zip u-boot-imx-c7656bab411433f987baa2288eff8c78ddc0f378.tar.gz u-boot-imx-c7656bab411433f987baa2288eff8c78ddc0f378.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc86xx')
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/fdt.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/mp.c | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c index 61f5110..2f955fe 100644 --- a/arch/powerpc/cpu/mpc86xx/fdt.c +++ b/arch/powerpc/cpu/mpc86xx/fdt.c @@ -20,7 +20,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) { #ifdef CONFIG_MP int off; - u32 bootpg = determine_mp_bootpg(); + u32 bootpg = determine_mp_bootpg(NULL); #endif do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c index 30c99eb..de705f0 100644 --- a/arch/powerpc/cpu/mpc86xx/mp.c +++ b/arch/powerpc/cpu/mpc86xx/mp.c @@ -90,8 +90,11 @@ int cpu_release(int nr, int argc, char * const argv[]) return 1; } -u32 determine_mp_bootpg(void) +u32 determine_mp_bootpg(unsigned int *pagesize) { + if (pagesize) + *pagesize = 4096; + /* if we have 4G or more of memory, put the boot page at 4Gb-1M */ if ((u64)gd->ram_size > 0xfffff000) return (0xfff00000); @@ -101,7 +104,7 @@ u32 determine_mp_bootpg(void) void cpu_mp_lmb_reserve(struct lmb *lmb) { - u32 bootpg = determine_mp_bootpg(); + u32 bootpg = determine_mp_bootpg(NULL); /* tell u-boot we stole a page */ lmb_reserve(lmb, bootpg, 4096); @@ -115,7 +118,7 @@ void setup_mp(void) { extern ulong __secondary_start_page; ulong fixup = (ulong)&__secondary_start_page; - u32 bootpg = determine_mp_bootpg(); + u32 bootpg = determine_mp_bootpg(NULL); u32 bootpg_va; if (bootpg >= CONFIG_SYS_MAX_DDR_BAT_SIZE) { |