From ae8a922bd2061beee7524bfc826baba01fb3944f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 10 Jan 2023 11:19:31 -0500 Subject: [PATCH] arm: Rework usage of CONFIG_ARMV[78]_SECURE_BASE in linker scripts In order to avoid defining CONFIG_ARMV[78_]SECURE_BASE as empty in the linker scripts, if not already defined, add and use __ARMV[78_]SECURE_BASE for when the base is not defined and we want the linker scripts to continue. Signed-off-by: Tom Rini --- arch/arm/cpu/armv8/u-boot.lds | 6 ++++-- arch/arm/cpu/u-boot.lds | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv8/u-boot.lds b/arch/arm/cpu/armv8/u-boot.lds index 8fe4682..fb6a30c 100644 --- a/arch/arm/cpu/armv8/u-boot.lds +++ b/arch/arm/cpu/armv8/u-boot.lds @@ -51,10 +51,12 @@ SECTIONS } #ifndef CONFIG_ARMV8_SECURE_BASE -#define CONFIG_ARMV8_SECURE_BASE +#define __ARMV8_SECURE_BASE #define __ARMV8_PSCI_STACK_IN_RAM +#else +#define __ARMV8_SECURE_BASE CONFIG_ARMV8_SECURE_BASE #endif - .secure_text CONFIG_ARMV8_SECURE_BASE : + .secure_text __ARMV8_SECURE_BASE : AT(ADDR(.__secure_start) + SIZEOF(.__secure_start)) { *(._secure.text) diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds index f25f72b..fc4f63d 100644 --- a/arch/arm/cpu/u-boot.lds +++ b/arch/arm/cpu/u-boot.lds @@ -77,11 +77,13 @@ SECTIONS } #ifndef CONFIG_ARMV7_SECURE_BASE -#define CONFIG_ARMV7_SECURE_BASE +#define __ARMV7_SECURE_BASE #define __ARMV7_PSCI_STACK_IN_RAM +#else +#define __ARMV7_SECURE_BASE CONFIG_ARMV7_SECURE_BASE #endif - .secure_text CONFIG_ARMV7_SECURE_BASE : + .secure_text __ARMV7_SECURE_BASE : AT(ADDR(.__secure_start) + SIZEOF(.__secure_start)) { *(._secure.text) -- 2.7.4