[review] core: arm: enable CFG_BOOT_MEM unconditionally

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
OP-TEE · Sep 23, 2024 · 13036b5 · 13036b5
1 parent e3a7c35
commit 13036b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/arch/arm/arm.mk b/core/arch/arm/arm.mk
@@ -15,10 +15,6 @@ include mk/cc-option.mk
 # Only applicable when paging is enabled.
 CFG_CORE_TZSRAM_EMUL_SIZE ?= 458752
 
-# Mandatory for arch/arm to avoid ifdefs in the arch specific code
-CFG_BOOT_MEM=y
-$(call force,CFG_BOOT_MEM,y)
-
 ifneq ($(CFG_LPAE_ADDR_SPACE_SIZE),)
 $(warning Error: CFG_LPAE_ADDR_SPACE_SIZE is not supported any longer)
 $(error Error: Please use CFG_LPAE_ADDR_SPACE_BITS instead)

diff --git a/mk/config.mk b/mk/config.mk
@@ -1222,4 +1222,8 @@ CFG_SEMIHOSTING ?= n
 CFG_FFA_CONSOLE ?= n
 
 # CFG_BOOT_MEM, when enabled, adds stack like memory allocation during boot.
+ifeq ($(ARCH),arm)
+$(call force,CFG_BOOT_MEM,y)
+else
 CFG_BOOT_MEM ?= n
+endif