diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-25 23:16:40 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:52:41 +0100 |
| commit | fbf7653ea7208830f839beb0fb1d13e272a860db (patch) | |
| tree | f023af0626c57e12943e2e907123397898450e68 /arch/arm/cpu | |
| parent | c0304873015152d8c316df2b82083eea31053c04 (diff) | |
| download | barebox-fbf7653ea7208830f839beb0fb1d13e272a860db.tar.gz barebox-fbf7653ea7208830f839beb0fb1d13e272a860db.tar.xz | |
ARM start-pbl: call uncompressed binary with arguments
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/start-pbl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c index 0da4fef801..64cd6ff8a7 100644 --- a/arch/arm/cpu/start-pbl.c +++ b/arch/arm/cpu/start-pbl.c @@ -106,9 +106,8 @@ static void mmu_disable(void) __mmu_cache_off(); } -static void __noreturn barebox_uncompress(void *compressed_start, unsigned int len) +static void barebox_uncompress(void *compressed_start, unsigned int len) { - void __noreturn (*barebox)(void); /* * remap_cached currently does not work rendering the feature * of enabling the MMU in the PBL useless. disable for now. @@ -124,19 +123,12 @@ static void __noreturn barebox_uncompress(void *compressed_start, unsigned int l if (use_mmu) mmu_enable((unsigned long)compressed_start, len); - if (IS_ENABLED(CONFIG_THUMB2_BAREBOX)) - barebox = (void *)(TEXT_BASE + 1); - else - barebox = (void *)TEXT_BASE; - pbl_barebox_uncompress((void*)TEXT_BASE, compressed_start, len); if (use_mmu) mmu_disable(); flush_icache(); - - barebox(); } static noinline __noreturn void __barebox_arm_entry(uint32_t membase, @@ -144,6 +136,7 @@ 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); /* Get offset between linked address and runtime address */ offset = get_runtime_offset(); @@ -164,6 +157,13 @@ static noinline __noreturn void __barebox_arm_entry(uint32_t membase, setup_c(); barebox_uncompress((void *)pg_start, pg_len); + + if (IS_ENABLED(CONFIG_THUMB2_BAREBOX)) + barebox = (void *)(TEXT_BASE + 1); + else + barebox = (void *)TEXT_BASE; + + barebox(membase, memsize, boarddata); } /* |