Commit 2b56b861 authored by Øyvind Rønningstad's avatar Øyvind Rønningstad Committed by Ioannis Glaropoulos
Browse files

arm: tz: secure_entry_functions.ld: Fix NSC_ALIGN redefinition 

Allow CONFIG_ARM_NSC_REGION_BASE_ADDRESS to override the nRF-specific
logic for alignment.

Fixes issue https://github.com/zephyrproject-rtos/zephyr/issues/27544



Signed-off-by: default avatarØyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
parent 61d42cf4

arch/arm/core/aarch32/cortex_m/tz/secure_entry_functions.ld

+5 −4
Original line number Diff line number Diff line
@@ -5,20 +5,21 @@ 
 */



/* nRF-specific defines. */

#ifdef CONFIG_CPU_HAS_NRF_IDAU

#if defined(CONFIG_CPU_HAS_NRF_IDAU) && CONFIG_ARM_NSC_REGION_BASE_ADDRESS == 0

	/* This SOC needs the NSC region to be at the end of an SPU region. */

	#define NSC_ALIGN \

		. = ALIGN(CONFIG_NRF_SPU_FLASH_REGION_SIZE) \

			- (1 << LOG2CEIL(__sg_size))

	#define NSC_ALIGN_END . = ALIGN(CONFIG_NRF_SPU_FLASH_REGION_SIZE)

#endif /* CONFIG_CPU_HAS_NRF_IDAU */



#endif /* CONFIG_CPU_HAS_NRF_IDAU && CONFIG_ARM_NSC_REGION_BASE_ADDRESS != 0 */



#ifndef NSC_ALIGN

#if CONFIG_ARM_NSC_REGION_BASE_ADDRESS != 0

	#define NSC_ALIGN . = ABSOLUTE(CONFIG_ARM_NSC_REGION_BASE_ADDRESS)

#elif !defined(NSC_ALIGN)

#else

	#define NSC_ALIGN . = ALIGN(4)

#endif /* CONFIG_ARM_NSC_REGION_BASE_ADDRESS */

#endif /* !NSC_ALIGN */



#ifndef NSC_ALIGN_END

	#define NSC_ALIGN_END . = ALIGN(4)

CRA Git | Maintained and supported by SUSTech CRA and CCSE