[PATCH 05/10] mips: Update linker scripts to ensure appended device tree is aligned
Daniel Schwierzeck
daniel.schwierzeck at gmail.com
Tue Jan 20 14:57:38 CET 2026
On Thu, Jan 15, 2026 at 11:28 PM Tom Rini <trini at konsulko.com> wrote:
>
> 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 f613a6e15ef7 ("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:
> - Aligns the final section before _end (for U-Boot) or _image_binary_end
> (for xPL phases) by 8-bytes by adding '. = ALIGN(8);' to the final
> section before the symbol. For SPL we need this in two places to cover
> all build configurations.
> - Remove now-spurious '. = ALIGN(x);' statements that were intended to
> provide the above alignments.
> - 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 <trini at konsulko.com>
> ---
> Cc: Daniel Schwierzeck <daniel.schwierzeck at gmail.com> (maintainer:MIPS)
> Cc: Ilias Apalodimas <ilias.apalodimas at linaro.org>
> Cc: Marek Vasut <marek.vasut+renesas at mailbox.org>
> Cc: Richard Henderson <richard.henderson at linaro.org>
> ---
> arch/mips/cpu/u-boot-spl.lds | 6 +++++-
> arch/mips/cpu/u-boot.lds | 4 +++-
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
More information about the U-Boot
mailing list