diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:54 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:54 +0100 |
| commit | 601bf0fcc62854af68b35d857696be9a4a9e567d (patch) | |
| tree | 39e6eb29bdd79e49b474a64558d81f6fb9d34c94 /arch/arm/cpu | |
| parent | 701d565c2a1c50e84e7035048968bc81fd869c87 (diff) | |
| parent | a4d39ca0f1e0ceeab4e1f817a9c32b9c0a4f01c2 (diff) | |
| download | barebox-601bf0fcc62854af68b35d857696be9a4a9e567d.tar.gz barebox-601bf0fcc62854af68b35d857696be9a4a9e567d.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/uncompress.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c index 6d3302a31c..7397c7de32 100644 --- a/arch/arm/cpu/uncompress.c +++ b/arch/arm/cpu/uncompress.c @@ -46,7 +46,6 @@ static int __attribute__((__used__)) static void __noreturn noinline uncompress_start_payload(uint32_t membase, uint32_t memsize, uint32_t boarddata) { - uint32_t offset; uint32_t pg_len; void __noreturn (*barebox)(uint32_t, uint32_t, uint32_t); uint32_t endmem = membase + memsize; @@ -61,9 +60,6 @@ static void __noreturn noinline uncompress_start_payload(uint32_t membase, if (IS_ENABLED(CONFIG_PBL_RELOCATABLE)) relocate_to_current_adr(); - /* Get offset between linked address and runtime address */ - offset = get_runtime_offset(); - if (IS_ENABLED(CONFIG_RELOCATABLE)) barebox_base = arm_barebox_image_place(membase + memsize); else |