freescale/layerscape: Rename the config CONFIG_SECURE_BOOT name

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

diff --git a/arch/arm/cpu/armv8/u-boot.lds b/arch/arm/cpu/armv8/u-boot.lds
index 22195b8834b52c063f3f94406dffba221c3a04d7..2554980595b14cf9a1f5b13db03f147f73048305 100644 (file)
--- a/arch/arm/cpu/armv8/u-boot.lds
+++ b/arch/arm/cpu/armv8/u-boot.lds
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2013
  * David Feng <fenghua@phytium.com.cn>
  *
  * (C) Copyright 2002
  * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
@@ -26,6 +25,19 @@ SECTIONS
        {
                *(.__image_copy_start)
                CPUDIR/start.o (.text*)
+       }
+
+       /* This needs to come before *(.text*) */
+       .efi_runtime : {
+                __efi_runtime_start = .;
+               *(.text.efi_runtime*)
+               *(.rodata.efi_runtime*)
+               *(.data.efi_runtime*)
+                __efi_runtime_stop = .;
+       }
+
+       .text_rest :
+       {
                *(.text*)
        }
 
@@ -46,6 +58,10 @@ SECTIONS
                AT(ADDR(.__secure_start) + SIZEOF(.__secure_start))
        {
                *(._secure.text)
+               . = ALIGN(8);
+               __secure_svc_tbl_start = .;
+               KEEP(*(._secure_svc_tbl_entries))
+               __secure_svc_tbl_end = .;
        }
 
        .secure_data : AT(LOADADDR(.secure_text) + SIZEOF(.secure_text))
@@ -99,17 +115,10 @@ SECTIONS
 
        . = ALIGN(8);
 
-       .efi_runtime : {
-                __efi_runtime_start = .;
-               *(efi_runtime_text)
-               *(efi_runtime_data)
-                __efi_runtime_stop = .;
-       }
-
        .efi_runtime_rel : {
                 __efi_runtime_rel_start = .;
-               *(.relaefi_runtime_text)
-               *(.relaefi_runtime_data)
+               *(.rel*.efi_runtime)
+               *(.rel*.efi_runtime.*)
                 __efi_runtime_rel_stop = .;
        }
 
@@ -159,4 +168,8 @@ SECTIONS
        /DISCARD/ : { *(.plt*) }
        /DISCARD/ : { *(.interp*) }
        /DISCARD/ : { *(.gnu*) }
+
+#ifdef CONFIG_LINUX_KERNEL_IMAGE_HEADER
+#include "linux-kernel-image-header-vars.h"
+#endif
 }