| Message ID | 20240304090113.1410575-4-ilias.apalodimas@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Clean up arm linker scripts | expand |
On 3/4/24 02:01, Ilias Apalodimas wrote: > __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. 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. > > Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Reviewed-by: Sam Edwards <CFSworks@gmail.com> Tested-by: Sam Edwards <CFSworks@gmail.com> # Binary output identical Thanks for the cleanup, Sam > --- > arch/arm/cpu/armv8/u-boot.lds | 4 +--- > arch/arm/cpu/u-boot.lds | 16 +++------------- > arch/arm/lib/sections.c | 2 -- > arch/arm/mach-zynq/u-boot.lds | 16 +++------------- > include/asm-generic/sections.h | 2 ++ > lib/efi_loader/efi_runtime.c | 1 + > 6 files changed, 10 insertions(+), 31 deletions(-) > > diff --git a/arch/arm/cpu/armv8/u-boot.lds b/arch/arm/cpu/armv8/u-boot.lds > index c4ee10ebc3ff..eccb116d3cfa 100644 > --- 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 90d329b1ebe0..70e78ce46672 100644 > --- 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 8e8bd5797e16..ddfde52163fc 100644 > --- 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 8d3259821719..66a9e37f9198 100644 > --- 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 1e1657a01673..60949200dd93 100644 > --- 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 18da6892e796..9185f1894c47 100644 > --- 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;
diff --git a/arch/arm/cpu/armv8/u-boot.lds b/arch/arm/cpu/armv8/u-boot.lds index c4ee10ebc3ff..eccb116d3cfa 100644 --- 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 90d329b1ebe0..70e78ce46672 100644 --- 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 8e8bd5797e16..ddfde52163fc 100644 --- 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 8d3259821719..66a9e37f9198 100644 --- 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 1e1657a01673..60949200dd93 100644 --- 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 18da6892e796..9185f1894c47 100644 --- 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;
__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. 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. Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> --- arch/arm/cpu/armv8/u-boot.lds | 4 +--- arch/arm/cpu/u-boot.lds | 16 +++------------- arch/arm/lib/sections.c | 2 -- arch/arm/mach-zynq/u-boot.lds | 16 +++------------- include/asm-generic/sections.h | 2 ++ lib/efi_loader/efi_runtime.c | 1 + 6 files changed, 10 insertions(+), 31 deletions(-)