From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f62qP-0004hU-Pj for barebox@lists.infradead.org; Tue, 10 Apr 2018 23:38:35 +0000 Received: by mail-pf0-x244.google.com with SMTP id y69so6588pfb.5 for ; Tue, 10 Apr 2018 16:38:23 -0700 (PDT) From: Andrey Smirnov Date: Tue, 10 Apr 2018 16:38:05 -0700 Message-Id: <20180410233805.4191-1-andrew.smirnov@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH] ARM: Make use of ALIGN_DOWN macro in barebox-arm.h To: barebox@lists.infradead.org Cc: Andrey Smirnov Signed-off-by: Andrey Smirnov --- arch/arm/include/asm/barebox-arm.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h index 4b270e7de..67e4d964d 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; -- 2.14.3 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox