arm: fix __efi_runtime_rel_start/end definitions

__efi_runtime_rel_start/end are defined as c variables for arm7 only in
order to force the compiler emit relative references. However, defining
those within a section definition will do the same thing since [0].
On top of that the v8 linker scripts define it as a symbol.

So let's remove the special sections from the linker scripts, the
variable definitions from sections.c and define them as a symbols within
the correct section.

[0] binutils commit 6b3b0ab89663 ("Make linker assigned symbol dynamic only for shared object")

Suggested-by: Sam Edwards <CFSworks@gmail.com>
Reviewed-by: Sam Edwards <CFSworks@gmail.com>
Tested-by: Sam Edwards <CFSworks@gmail.com> # Binary output identical
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/arch/arm/cpu/armv8/u-boot.lds b/arch/arm/cpu/armv8/u-boot.lds
index 9640cc7a04b8cf25b68f25526c5eca6d544c8ab2..8561e1b3142ed927a58058234272d24a38c79081 100644 (file)
--- a/arch/arm/cpu/armv8/u-boot.lds
+++ b/arch/arm/cpu/armv8/u-boot.lds
@@ -115,9 +115,7 @@ SECTIONS
                KEEP(*(SORT(__u_boot_list*)));
        }
 
-       . = ALIGN(8);
-
-       .efi_runtime_rel : {
+       .efi_runtime_rel ALIGN(8) : {
                 __efi_runtime_rel_start = .;
                *(.rel*.efi_runtime)
                *(.rel*.efi_runtime.*)

diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds
index 0dfe5f633b16e2044fd884bdc666a8ff1e7024e6..f19f2812ee916a6f151a94f5b52de7318c957712 100644 (file)
--- a/arch/arm/cpu/u-boot.lds
+++ b/arch/arm/cpu/u-boot.lds
@@ -152,21 +152,11 @@ SECTIONS
                KEEP(*(SORT(__u_boot_list*)));
        }
 
-       . = ALIGN(4);
-
-       .efi_runtime_rel_start :
-       {
-               *(.__efi_runtime_rel_start)
-       }
-
-       .efi_runtime_rel : {
+       .efi_runtime_rel ALIGN(4) : {
+               __efi_runtime_rel_start = .;
                *(.rel*.efi_runtime)
                *(.rel*.efi_runtime.*)
-       }
-
-       .efi_runtime_rel_stop :
-       {
-               *(.__efi_runtime_rel_stop)
+               __efi_runtime_rel_stop = .;
        }
 
        . = ALIGN(4);

diff --git a/arch/arm/lib/sections.c b/arch/arm/lib/sections.c
index 8e8bd5797e1681ac9bd8283c57a4092a2bee4e0e..ddfde52163fc0ae1fb5085238a0f7561be638ddf 100644 (file)
--- a/arch/arm/lib/sections.c
+++ b/arch/arm/lib/sections.c
@@ -29,6 +29,4 @@ char __secure_stack_start[0] __section(".__secure_stack_start");
 char __secure_stack_end[0] __section(".__secure_stack_end");
 char __efi_runtime_start[0] __section(".__efi_runtime_start");
 char __efi_runtime_stop[0] __section(".__efi_runtime_stop");
-char __efi_runtime_rel_start[0] __section(".__efi_runtime_rel_start");
-char __efi_runtime_rel_stop[0] __section(".__efi_runtime_rel_stop");
 char _end[0] __section(".__end");

diff --git a/arch/arm/mach-zynq/u-boot.lds b/arch/arm/mach-zynq/u-boot.lds
index 3c5008b57392e3a0298042512caf15e08ae6a3ec..bb0e0ceb32ecb2bc863347c09226276322c4afbd 100644 (file)
--- a/arch/arm/mach-zynq/u-boot.lds
+++ b/arch/arm/mach-zynq/u-boot.lds
@@ -58,21 +58,11 @@ SECTIONS
                KEEP(*(SORT(__u_boot_list*)));
        }
 
-       . = ALIGN(4);
-
-       .efi_runtime_rel_start :
-       {
-               *(.__efi_runtime_rel_start)
-       }
-
-       .efi_runtime_rel : {
+       .efi_runtime_rel ALIGN(4) : {
+               __efi_runtime_rel_start = .;
                *(.rel*.efi_runtime)
                *(.rel*.efi_runtime.*)
-       }
-
-       .efi_runtime_rel_stop :
-       {
-               *(.__efi_runtime_rel_stop)
+               __efi_runtime_rel_stop = .;
        }
 
        . = ALIGN(8);

diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
index 1e1657a01673168bf59b7acbb8f6505e410e8b19..60949200dd93a224f8eca5be21a89826e5efd92e 100644 (file)
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
@@ -34,6 +34,8 @@ extern char __priv_data_start[], __priv_data_end[];
 /* Start and end of .ctors section - used for constructor calls. */
 extern char __ctors_start[], __ctors_end[];
 
+extern char __efi_runtime_rel_start[], __efi_runtime_rel_stop[];
+
 /* function descriptor handling (if any).  Override
  * in asm/sections.h */
 #ifndef dereference_function_descriptor

diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c
index 18da6892e7964f1371f8a298aa9a58305e9ebfb4..9185f1894c475060d43c32f50f235898542ae35c 100644 (file)
--- a/lib/efi_loader/efi_runtime.c
+++ b/lib/efi_loader/efi_runtime.c
@@ -15,6 +15,7 @@
 #include <rtc.h>
 #include <asm/global_data.h>
 #include <u-boot/crc.h>
+#include <asm/sections.h>
 
 /* For manual relocation support */
 DECLARE_GLOBAL_DATA_PTR;