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 <trini@konsulko.com>

diff --git a/arch/arm/cpu/armv8/u-boot.lds b/arch/arm/cpu/armv8/u-boot.lds
index 8fe4682dd2aed64bc80d06122f5cb1f0ee00aeea..fb6a30c922f724026d7b89b0403b3145a4559c77 100644 (file)
--- 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 f25f72b2e0d807894c99b489109b6a131a717a86..fc4f63d83489f7447ece164cf776926ecd1c3a15 100644 (file)
--- 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)