diff options
| author | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
| commit | 3e4d27b06d7484040355e22eec2cbce7335d6dab (patch) | |
| tree | 9672a2bb2e4ce0edc0ab776ddf0e2ca8e39a5f62 /arch/powerpc/cpu/mpc86xx/mp.c | |
| parent | bad05afe083eec0467220de21683443292c5012e (diff) | |
| parent | 59852d03867108217fe88e3bfc3e1e9cedfe63c5 (diff) | |
| download | olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.tar.xz olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.zip | |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'arch/powerpc/cpu/mpc86xx/mp.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/mp.c | 9 | 
1 files changed, 6 insertions, 3 deletions
| diff --git a/arch/powerpc/cpu/mpc86xx/mp.c b/arch/powerpc/cpu/mpc86xx/mp.c index 30c99ebc5..de705f0ae 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) { |