diff options
| author | Tom Rini <[email protected]> | 2026-01-15 16:19:33 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-01-20 12:07:14 -0600 |
| commit | dac67bf0bee168de8f43050fe9b1d776de1ee00f (patch) | |
| tree | 802995bf2d0929be3b08c3c183c23e36f6483195 | |
| parent | 8b0ebe054bb3334c6ca9bed018360b08d4ddc7a4 (diff) | |
m68k: Update linker scripts to ensure appended device tree is aligned
With commit 0535e46d55d7 ("scripts/dtc: Update to upstream version
v1.7.2-35-g52f07dcca47c") it is now a fatal error to U-Boot if our
device tree is not 8-byte aligned. In commit 85f586035d75 ("ARM: OMAP2+:
Pad SPL binary to 8-byte alignment before DTB") Beleswar Padhi explains
that we must have ALIGN(x) statements inside of a section to ensure that
padding is included and not simply that the linker address counter is
incremented. To that end, this patch:
- Remove part of what Marek Vasut did in commit 9ed99e2eeadb ("m68k:
Assure end of U-Boot is at 8-byte aligned offset") as we now better
understand what can trigger failure and check for it.
- Rewrite the '.dynsym' section to follow modern practices, and include
the 8-byte alignment at the end of the section.
- Ensure that we do have alignment by adding an ASSERT so that when not
aligned we fail to link (and explain why).
Signed-off-by: Tom Rini <[email protected]>
| -rw-r--r-- | arch/m68k/cpu/u-boot.lds | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/m68k/cpu/u-boot.lds b/arch/m68k/cpu/u-boot.lds index be1ad0170af..452003ff43c 100644 --- a/arch/m68k/cpu/u-boot.lds +++ b/arch/m68k/cpu/u-boot.lds @@ -69,28 +69,27 @@ SECTIONS __ex_table : { *(__ex_table) } __stop___ex_table = .; - . = ALIGN(8); + . = ALIGN(4); __init_begin = .; .text.init : { *(.text.init) } .data.init : { *(.data.init) } - . = ALIGN(8); + . = ALIGN(4); __init_end = .; - . = ALIGN(8); + . = ALIGN(4); __rel_dyn_start = .; .rela.dyn : { *(.rela.dyn) } __rel_dyn_end = .; - . = ALIGN(8); - __dyn_sym_start = .; - .dynsym : { + .dynsym ALIGN(4) : { + __dyn_sym_start = .; *(.dynsym) + __dyn_sym_end = .; + . = ALIGN(8); } - __dyn_sym_end = .; - . = ALIGN(8); _end = .; __bss_start = .; @@ -100,9 +99,11 @@ SECTIONS *(.bss*) *(.sbss*) *(COMMON) - . = ALIGN(8); + . = ALIGN(4); _ebss = .; } __bss_end = . ; PROVIDE (end = .); } + +ASSERT(_end % 8 == 0, "_end must be 8-byte aligned for device tree"); |