Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

[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 4157374d21d68689b2613e135f758a2a5e7948ce..0eb164d2e694d44e03e1313d41ba2a03435c91a6 100644 (file)
--- a/arch/arm/cpu/u-boot.lds
+++ b/arch/arm/cpu/u-boot.lds
@@ -43,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))
        }
 
@@ -136,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 :