summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2022-01-14 09:42:26 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2022-01-17 08:10:10 +0100
commit774fbf8630200c87ac316627c243cdb4fc3c1d71 (patch)
tree3c203a6ab5ff4a6d48addbcf700ec978f90a8022 /arch/arm
parent880c9803b95a08520359c49285f57af874ee109f (diff)
downloadbarebox-774fbf8630200c87ac316627c243cdb4fc3c1d71.tar.gz
barebox-774fbf8630200c87ac316627c243cdb4fc3c1d71.tar.xz
ARM: turn arm_mem_stack_top into a macro
This makes it possible to use for static initialization, like done in a follow-up commit. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.barebox.org/20220114084227.308804-2-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/barebox-arm.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
index 2fbdaaa356..d915cde294 100644
--- a/arch/arm/include/asm/barebox-arm.h
+++ b/arch/arm/include/asm/barebox-arm.h
@@ -98,14 +98,13 @@ static inline void arm_fixup_vectors(void)
void *barebox_arm_boot_dtb(void);
-static inline unsigned long arm_mem_stack_top(unsigned long membase,
- unsigned long endmem)
-{
- if (IS_ENABLED(CONFIG_BOOTM_OPTEE) || IS_ENABLED(CONFIG_PBL_OPTEE))
- endmem -= OPTEE_SIZE;
+#define __arm_mem_stack_top(membase, endmem) ((endmem) - SZ_64K)
- return endmem - SZ_64K;
-}
+#if defined(CONFIG_BOOTM_OPTEE) || defined(CONFIG_PBL_OPTEE)
+#define arm_mem_stack_top(membase, endmem) (__arm_mem_stack_top(membase, endmem) - OPTEE_SIZE)
+#else
+#define arm_mem_stack_top(membase, endmem) __arm_mem_stack_top(membase, endmem)
+#endif
static inline unsigned long arm_mem_stack(unsigned long membase,
unsigned long endmem)