diff options
| author | Tom Rini <[email protected]> | 2023-01-10 11:19:31 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-01-20 12:27:06 -0500 |
| commit | ae8a922bd2061beee7524bfc826baba01fb3944f (patch) | |
| tree | a3d09c02fd3d902bf741cd1ce2dc810c8ba75351 | |
| parent | 81451a3985a7ca9f2bc871a14d8aff8aa86db9ba (diff) | |
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 <[email protected]>
| -rw-r--r-- | arch/arm/cpu/armv8/u-boot.lds | 6 | ||||
| -rw-r--r-- | 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 8fe4682dd2a..fb6a30c922f 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 f25f72b2e0d..fc4f63d8348 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) |