diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-04-10 16:38:05 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-11 10:42:59 +0200 |
| commit | a006d53427950754a0a57b19c8e3fca181146543 (patch) | |
| tree | 0036e36bf7d62c0318936f41a94623ca40b365c8 /arch/arm/include | |
| parent | 67833dd81ab414c25e3ba847ef78ba0795d86715 (diff) | |
| download | barebox-a006d53427950754a0a57b19c8e3fca181146543.tar.gz barebox-a006d53427950754a0a57b19c8e3fca181146543.tar.xz | |
ARM: Make use of ALIGN_DOWN macro in barebox-arm.h
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/barebox-arm.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index fa673a63a7..4803237116 100644 --- a/arch/arm/include/asm/barebox-arm.h +++ b/arch/arm/include/asm/barebox-arm.h @@ -114,8 +114,7 @@ static inline unsigned long arm_mem_ttb(unsigned long membase, unsigned long endmem) { endmem = arm_mem_stack(membase, endmem); - endmem &= ~(SZ_16K - 1); - endmem -= SZ_16K; + endmem = ALIGN_DOWN(endmem, SZ_16K) - SZ_16K; return endmem; } @@ -138,7 +137,7 @@ static inline unsigned long arm_mem_ramoops(unsigned long membase, endmem = arm_mem_ttb(membase, endmem); #ifdef CONFIG_FS_PSTORE_RAMOOPS endmem -= CONFIG_FS_PSTORE_RAMOOPS_SIZE; - endmem &= ~(SZ_4K - 1); /* Align to 4K */ + endmem = ALIGN_DOWN(endmem, SZ_4K); #endif return endmem; @@ -151,9 +150,7 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase, endmem = arm_mem_ramoops(membase, endmem); if (IS_ENABLED(CONFIG_RELOCATABLE)) { - endmem -= size; - endmem &= ~(SZ_1M - 1); - return endmem; + return ALIGN_DOWN(endmem - size, SZ_1M); } else { if (TEXT_BASE >= membase && TEXT_BASE < endmem) return TEXT_BASE; |