From da008898b0904b4bb6047eb2ae875fe6f3825e88 Mon Sep 17 00:00:00 2001
From: Etienne Carriere <etienne.carriere@foss.st.com>
Date: Fri, 17 Nov 2023 21:54:32 +0100
Subject: [PATCH] plat-vexpress: relax CFG_ASAN_SHADOW_OFFSET configuration
 value

Fixes CFG_ASAN_SHADOW_OFFSET configuration value for vexpress
platform qemu* flavors. Before this change CFG_ASAN_SHADOW_OFFSET
variable needed a specific scope to override the default value set
by platform conf.mk file.

Fixes: 24475b562b81 ("plat-vexpress: move CFG_TEE_CORE_NB_CORE to platform conf.mk")
Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
---
 core/arch/arm/plat-vexpress/conf.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/arch/arm/plat-vexpress/conf.mk b/core/arch/arm/plat-vexpress/conf.mk
index a87d1059dc0..452aba01590 100644
--- a/core/arch/arm/plat-vexpress/conf.mk
+++ b/core/arch/arm/plat-vexpress/conf.mk
@@ -115,7 +115,7 @@ ifeq ($(CFG_CORE_SANITIZE_KADDRESS),y)
 # This is unfortunately currently not possible to do in make so we have to
 # calculate it offline, there's some asserts in
 # core/arch/arm/kernel/generic_boot.c to check that we got it right
-CFG_ASAN_SHADOW_OFFSET = 0xc6a71c0
+CFG_ASAN_SHADOW_OFFSET ?= 0xc6a71c0
 endif
 $(call force,CFG_BOOT_SECONDARY_REQUEST,y)
 $(call force,CFG_PSCI_ARM32,y)
@@ -140,7 +140,7 @@ CFG_SHMEM_SIZE  ?= 0x00200000
 CFG_TEE_SDP_MEM_SIZE ?= 0x00400000
 ifeq ($(CFG_CORE_SANITIZE_KADDRESS),y)
 # See comment above
-CFG_ASAN_SHADOW_OFFSET = 0xc6a71c0
+CFG_ASAN_SHADOW_OFFSET ?= 0xc6a71c0
 endif
 endif
 $(call force,CFG_DT,y)