diff options
| author | Tom Rini <[email protected]> | 2026-01-15 16:19:32 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-01-20 12:06:41 -0600 |
| commit | 8b0ebe054bb3334c6ca9bed018360b08d4ddc7a4 (patch) | |
| tree | 9860e62a90d90a883dd345564574022a9df6d5b3 /scripts | |
| parent | 90efb8d394de9df1ae2c20f5e25ffc2009dc7ec5 (diff) | |
arm: 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:
- Expands some linker sections to be more readable when adding a second
statement to the section.
- Aligns the final section before _end (for U-Boot) or
_image_binary_end or __bss_end (for xPL phases) by 8-bytes by adding
'. = ALIGN(8);' to the final section before the symbol.
- Ensure that we do have alignment by adding an ASSERT so that when not
aligned we fail to link (and explain why).
- Remove now-spurious '. = ALIGN(x);' statements that were intended to
provide the above alignments.
Tested-by: Michal Simek <[email protected]> # Zynq
Reviewed-by: Ilias Apalodimas <[email protected]>
[trini: Also update arch/arm/cpu/armv8/u-boot.lds as Ilas requested]
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions
