colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: fix __efi_runtime_rel_start/end definitions

Browse Source 
__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>
This commit is contained in:
Ilias Apalodimas
2024-03-15 08:43:47 +02:00
committed by Tom Rini
parent faf396aa1d
commit 6b7f91cd83
6 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/armv8/u-boot.lds
View File

@@ -115,9 +115,7 @@ SECTIONS
KEEP(*(SORT(__u_boot_list*))); KEEP(*(SORT(__u_boot_list*)));
} }
. = ALIGN(8); .efi_runtime_rel ALIGN(8) : {
.efi_runtime_rel : {
__efi_runtime_rel_start = .; __efi_runtime_rel_start = .;
*(.rel*.efi_runtime) *(.rel*.efi_runtime)
*(.rel*.efi_runtime.*) *(.rel*.efi_runtime.*)

16
arch/arm/cpu/u-boot.lds
View File

@@ -152,21 +152,11 @@ SECTIONS
KEEP(*(SORT(__u_boot_list*))); KEEP(*(SORT(__u_boot_list*)));
} }
. = ALIGN(4); .efi_runtime_rel ALIGN(4) : {
__efi_runtime_rel_start = .;
.efi_runtime_rel_start :
{
*(.__efi_runtime_rel_start)
}
.efi_runtime_rel : {
*(.rel*.efi_runtime) *(.rel*.efi_runtime)
*(.rel*.efi_runtime.*) *(.rel*.efi_runtime.*)
} __efi_runtime_rel_stop = .;
.efi_runtime_rel_stop :
{
*(.__efi_runtime_rel_stop)
} }
. = ALIGN(4); . = ALIGN(4);

2
arch/arm/lib/sections.c
View File

@@ -29,6 +29,4 @@ char __secure_stack_start[0] __section(".__secure_stack_start");
char __secure_stack_end[0] __section(".__secure_stack_end"); char __secure_stack_end[0] __section(".__secure_stack_end");
char __efi_runtime_start[0] __section(".__efi_runtime_start"); char __efi_runtime_start[0] __section(".__efi_runtime_start");
char __efi_runtime_stop[0] __section(".__efi_runtime_stop"); 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"); char _end[0] __section(".__end");

16
arch/arm/mach-zynq/u-boot.lds
View File

@@ -58,21 +58,11 @@ SECTIONS
KEEP(*(SORT(__u_boot_list*))); KEEP(*(SORT(__u_boot_list*)));
} }
. = ALIGN(4); .efi_runtime_rel ALIGN(4) : {
__efi_runtime_rel_start = .;
.efi_runtime_rel_start :
{
*(.__efi_runtime_rel_start)
}
.efi_runtime_rel : {
*(.rel*.efi_runtime) *(.rel*.efi_runtime)
*(.rel*.efi_runtime.*) *(.rel*.efi_runtime.*)
} __efi_runtime_rel_stop = .;
.efi_runtime_rel_stop :
{
*(.__efi_runtime_rel_stop)
} }
. = ALIGN(8); . = ALIGN(8);

2
include/asm-generic/sections.h
View File

@@ -34,6 +34,8 @@ extern char __priv_data_start[], __priv_data_end[];
/* Start and end of .ctors section - used for constructor calls. */ /* Start and end of .ctors section - used for constructor calls. */
extern char __ctors_start[], __ctors_end[]; extern char __ctors_start[], __ctors_end[];
extern char __efi_runtime_rel_start[], __efi_runtime_rel_stop[];
/* function descriptor handling (if any). Override /* function descriptor handling (if any). Override
* in asm/sections.h */ * in asm/sections.h */
#ifndef dereference_function_descriptor #ifndef dereference_function_descriptor

1
lib/efi_loader/efi_runtime.c
View File

@@ -15,6 +15,7 @@
#include <rtc.h> #include <rtc.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <u-boot/crc.h> #include <u-boot/crc.h>
#include <asm/sections.h>
/* For manual relocation support */ /* For manual relocation support */
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;