diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-13 11:33:01 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-23 07:43:28 +0100 |
| commit | 548a574e370f046d09443bc29b210c2c294fa532 (patch) | |
| tree | 2b8353b88f9bd9c753997e0d89d0e7c39a87e642 | |
| parent | 2ebb5ba8d0fde2e07cfd6356a80f1989b4136632 (diff) | |
| download | barebox-548a574e370f046d09443bc29b210c2c294fa532.tar.gz barebox-548a574e370f046d09443bc29b210c2c294fa532.tar.xz | |
ARM: Make some variables 64bit aware
Use unsigned long as type for variables that are used as addresses.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/cpu/start-pbl.c | 10 | ||||
| -rw-r--r-- | arch/arm/cpu/uncompress.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c index 73c27429da..25f91b02f3 100644 --- a/arch/arm/cpu/start-pbl.c +++ b/arch/arm/cpu/start-pbl.c @@ -48,10 +48,10 @@ extern void *input_data_end; __noreturn void barebox_single_pbl_start(unsigned long membase, unsigned long memsize, void *boarddata) { - uint32_t offset; - uint32_t pg_start, pg_end, pg_len, uncompressed_len; + unsigned long offset; + unsigned long pg_start, pg_end, pg_len, uncompressed_len; void __noreturn (*barebox)(unsigned long, unsigned long, void *); - uint32_t endmem = membase + memsize; + unsigned long endmem = membase + memsize; unsigned long barebox_base; if (IS_ENABLED(CONFIG_PBL_RELOCATABLE)) @@ -60,8 +60,8 @@ __noreturn void barebox_single_pbl_start(unsigned long membase, /* Get offset between linked address and runtime address */ offset = get_runtime_offset(); - pg_start = (uint32_t)&input_data + global_variable_offset(); - pg_end = (uint32_t)&input_data_end + global_variable_offset(); + pg_start = (unsigned long)&input_data + global_variable_offset(); + pg_end = (unsigned long)&input_data_end + global_variable_offset(); pg_len = pg_end - pg_start; uncompressed_len = get_unaligned((const u32 *)(pg_start + pg_len - 4)); diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c index 37845b2259..c721eef0ad 100644 --- a/arch/arm/cpu/uncompress.c +++ b/arch/arm/cpu/uncompress.c @@ -45,7 +45,7 @@ void __noreturn barebox_multi_pbl_start(unsigned long membase, { uint32_t pg_len, uncompressed_len; void __noreturn (*barebox)(unsigned long, unsigned long, void *); - uint32_t endmem = membase + memsize; + unsigned long endmem = membase + memsize; unsigned long barebox_base; uint32_t *image_end; void *pg_start; |