From: Alexander Graf <agraf@suse.de>
Date: Tue, 10 Jul 2018 23:39:31 +0000 (+0200)
Subject: x86: Add efi_loader bits to x86_64 linker script
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=42a3d42688d8a389237cce2df18976d51c13b07f;p=u-boot.git

x86: Add efi_loader bits to x86_64 linker script

The x86_64 linker script was missing efi runtime information. Add it.

Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/arch/x86/cpu/u-boot-64.lds b/arch/x86/cpu/u-boot-64.lds
index 9a9d39cef2..862aa2d35e 100644
--- a/arch/x86/cpu/u-boot-64.lds
+++ b/arch/x86/cpu/u-boot-64.lds
@@ -20,6 +20,20 @@ SECTIONS
 
 	.text.start : { *(.text.start); }
 
+	.__efi_runtime_start : {
+		*(.__efi_runtime_start)
+	}
+
+	.efi_runtime : {
+		*(.text.efi_runtime*)
+		*(.rodata.efi_runtime*)
+		*(.data.efi_runtime*)
+	}
+
+	.__efi_runtime_stop : {
+		*(.__efi_runtime_stop)
+	}
+
 	.text  : { *(.text*); }
 
 	. = ALIGN(4);
@@ -30,7 +44,10 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
+	.rodata : {
+		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+		KEEP(*(.rodata.efi.init));
+	}
 
 	. = ALIGN(4);
 	.data : { *(.data*) }
@@ -41,6 +58,21 @@ SECTIONS
 	. = ALIGN(4);
 	.got : { *(.got*) }
 
+	.efi_runtime_rel_start :
+	{
+		*(.__efi_runtime_rel_start)
+	}
+
+	.efi_runtime_rel : {
+		*(.rel*.efi_runtime)
+		*(.rel*.efi_runtime.*)
+	}
+
+	.efi_runtime_rel_stop :
+	{
+		*(.__efi_runtime_rel_stop)
+	}
+
 	. = ALIGN(4);
 	__data_end = .;
 	__init_end = .;