fsl-layerscape: Kconfig: Select RESV_RAM if GIC_V3_ITS

[oweals/u-boot.git] / arch / arm / cpu / u-boot.lds

diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds
index 0a5fae6efccfbe46d3477cfbff15fd72c97782d7..0eb164d2e694d44e03e1313d41ba2a03435c91a6 100644 (file)
--- a/arch/arm/cpu/u-boot.lds
+++ b/arch/arm/cpu/u-boot.lds
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2004-2008 Texas Instruments
  *
  * (C) Copyright 2002
  * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
@@ -44,17 +43,36 @@ SECTIONS
                *(.__image_copy_start)
                *(.vectors)
                CPUDIR/start.o (.text*)
+       }
+
+       /* This needs to come before *(.text*) */
+       .__efi_runtime_start : {
+               *(.__efi_runtime_start)
+       }
+
+       .efi_runtime : {
+               *(.text.efi_runtime*)
+               *(.rodata.efi_runtime*)
+               *(.data.efi_runtime*)
+       }
+
+       .__efi_runtime_stop : {
+               *(.__efi_runtime_stop)
+       }
+
+       .text_rest :
+       {
                *(.text*)
        }
 
 #ifdef CONFIG_ARMV7_NONSEC
 
        /* Align the secure section only if we're going to use it in situ */
-       .__secure_start :
+       .__secure_start
 #ifndef CONFIG_ARMV7_SECURE_BASE
                ALIGN(CONSTANT(COMMONPAGESIZE))
 #endif
-       {
+       : {
                KEEP(*(.__secure_start))
        }
 
@@ -74,6 +92,7 @@ SECTIONS
                *(._secure.data)
        }
 
+#ifdef CONFIG_ARMV7_PSCI
        .secure_stack ALIGN(ADDR(.secure_data) + SIZEOF(.secure_data),
                            CONSTANT(COMMONPAGESIZE)) (NOLOAD) :
 #ifdef __ARMV7_PSCI_STACK_IN_RAM
@@ -83,10 +102,10 @@ SECTIONS
 #endif
        {
                KEEP(*(.__secure_stack_start))
-#ifdef CONFIG_ARMV7_PSCI
+
                /* Skip addreses for stack */
                . = . + CONFIG_ARMV7_PSCI_NR_CPUS * ARM_PSCI_STACK_SIZE;
-#endif
+
                /* Align end of stack section to page boundary */
                . = ALIGN(CONSTANT(COMMONPAGESIZE));
 
@@ -107,6 +126,8 @@ SECTIONS
 #ifndef __ARMV7_PSCI_STACK_IN_RAM
        /* Reset VMA but don't allocate space if we have secure SRAM */
        . = LOADADDR(.secure_stack);
+#endif
+
 #endif
 
        .__secure_end : AT(ADDR(.__secure_end)) {
@@ -134,27 +155,14 @@ SECTIONS
 
        . = ALIGN(4);
 
-       .__efi_runtime_start : {
-               *(.__efi_runtime_start)
-       }
-
-       .efi_runtime : {
-               *(efi_runtime_text)
-               *(efi_runtime_data)
-       }
-
-       .__efi_runtime_stop : {
-               *(.__efi_runtime_stop)
-       }
-
        .efi_runtime_rel_start :
        {
                *(.__efi_runtime_rel_start)
        }
 
        .efi_runtime_rel : {
-               *(.relefi_runtime_text)
-               *(.relefi_runtime_data)
+               *(.rel*.efi_runtime)
+               *(.rel*.efi_runtime.*)
        }
 
        .efi_runtime_rel_stop :