dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-06 19:22:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

arm: Rework usage of CONFIG_ARMV[78]_SECURE_BASE in linker scripts

Browse Source 
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 <trini@konsulko.com>
This commit is contained in:
Tom Rini
2023-01-10 11:19:31 -05:00
parent 81451a3985
commit ae8a922bd2
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/cpu/armv8/u-boot.lds
View File

@@ -51,10 +51,12 @@ SECTIONS
} }
#ifndef CONFIG_ARMV8_SECURE_BASE #ifndef CONFIG_ARMV8_SECURE_BASE
#define CONFIG_ARMV8_SECURE_BASE #define __ARMV8_SECURE_BASE
#define __ARMV8_PSCI_STACK_IN_RAM #define __ARMV8_PSCI_STACK_IN_RAM
#else
#define __ARMV8_SECURE_BASE CONFIG_ARMV8_SECURE_BASE
#endif #endif
.secure_text CONFIG_ARMV8_SECURE_BASE : .secure_text __ARMV8_SECURE_BASE :
AT(ADDR(.__secure_start) + SIZEOF(.__secure_start)) AT(ADDR(.__secure_start) + SIZEOF(.__secure_start))
{ {
*(._secure.text) *(._secure.text)

6
arch/arm/cpu/u-boot.lds
View File

@@ -77,11 +77,13 @@ SECTIONS
} }
#ifndef CONFIG_ARMV7_SECURE_BASE #ifndef CONFIG_ARMV7_SECURE_BASE
#define CONFIG_ARMV7_SECURE_BASE #define __ARMV7_SECURE_BASE
#define __ARMV7_PSCI_STACK_IN_RAM #define __ARMV7_PSCI_STACK_IN_RAM
#else
#define __ARMV7_SECURE_BASE CONFIG_ARMV7_SECURE_BASE
#endif #endif
.secure_text CONFIG_ARMV7_SECURE_BASE : .secure_text __ARMV7_SECURE_BASE :
AT(ADDR(.__secure_start) + SIZEOF(.__secure_start)) AT(ADDR(.__secure_start) + SIZEOF(.__secure_start))
{ {
*(._secure.text) *(._secure.text)