diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-25 23:49:39 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:52:41 +0100 |
| commit | d2a7bed927eb853f36c8909ed0d4fcee878a3f49 (patch) | |
| tree | 9981b341c023c3ae79a86234961f97a85da3c730 /arch/arm/cpu | |
| parent | 8e19ee94ab7aea50635845de31daef1b593e1205 (diff) | |
| download | barebox-d2a7bed927eb853f36c8909ed0d4fcee878a3f49.tar.gz barebox-d2a7bed927eb853f36c8909ed0d4fcee878a3f49.tar.xz | |
ARM pbl: Use dynamic parameters for early malloc space
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/start-pbl.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c index 89839f0920..9c168b3c24 100644 --- a/arch/arm/cpu/start-pbl.c +++ b/arch/arm/cpu/start-pbl.c @@ -114,10 +114,6 @@ static void barebox_uncompress(void *compressed_start, unsigned int len) */ int use_mmu = 0; - /* set 128 KiB at the end of the MALLOC_BASE for early malloc */ - free_mem_ptr = MALLOC_BASE + MALLOC_SIZE - SZ_128K; - free_mem_end_ptr = free_mem_ptr + SZ_128K; - ttb = (void *)((free_mem_ptr - 0x4000) & ~0x3fff); if (use_mmu) @@ -137,6 +133,9 @@ static noinline __noreturn void __barebox_arm_entry(uint32_t membase, uint32_t offset; uint32_t pg_start, pg_end, pg_len; void __noreturn (*barebox)(uint32_t, uint32_t, uint32_t); + uint32_t endmem = membase + memsize; + + endmem -= STACK_SIZE; /* stack */ /* Get offset between linked address and runtime address */ offset = get_runtime_offset(); @@ -156,6 +155,10 @@ static noinline __noreturn void __barebox_arm_entry(uint32_t membase, setup_c(); + endmem -= SZ_128K; /* early malloc */ + free_mem_ptr = endmem; + free_mem_end_ptr = free_mem_ptr + SZ_128K; + barebox_uncompress((void *)pg_start, pg_len); if (IS_ENABLED(CONFIG_THUMB2_BAREBOX)) |