summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2007-04-27 03:19:31 +1000
committerPaul Mackerras <paulus@samba.org>2007-04-27 21:14:21 +1000
commit173ba87b9584e4cba41ce9a06916eba80baa1bf4 (patch)
treee15f27af2942af562d39248d82ff4db20fee1efd /arch/powerpc/boot
parent4536b937466ff6784d2a9a4bebde924a0d6e01cb (diff)
[POWERPC] bootwrapper: cuboot-83xx: Exclude upper 1MB from heap.
The uppermost part of memory is where u-boot puts the stack, so don't include that in the heap. It's not currently causing problems, as the current code allocates from the bottom of the heap, but this will keep things from potentially breaking if a future implementation were to allocate from the top. Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/cuboot-83xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/cuboot-83xx.c b/arch/powerpc/boot/cuboot-83xx.c
index 8f11d1e8937..6cbc20afb4d 100644
--- a/arch/powerpc/boot/cuboot-83xx.c
+++ b/arch/powerpc/boot/cuboot-83xx.c
@@ -61,7 +61,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
loader_info.cmdline = (char *)r6;
loader_info.cmdline_len = r7 - r6;
- simple_alloc_init(_end, avail_ram, 32, 64);
+ simple_alloc_init(_end, avail_ram - 1024*1024, 32, 64);
ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
serial_console_init();
platform_ops.fixups = platform_fixups;