]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge patch series "mkimage: Detect FIT image load address overlaps and fix related...
authorTom Rini <trini@konsulko.com>
Tue, 23 Sep 2025 19:41:16 +0000 (13:41 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 23 Sep 2025 19:41:16 +0000 (13:41 -0600)
Aristo Chen <jj251510319013@gmail.com> says:

This patch series enhances FIT image robustness by adding **memory
region overlap detection** to `mkimage` and fixing existing overlaps
in DTS files and `binman` tests.

The primary goal is to prevent runtime memory corruption from
conflicting load addresses in FIT images.

Key Changes:

1.  `mkimage` Overlap Detection: A new validation in
    `tools/fit_image.c` checks for overlapping load addresses
    within FIT configurations. `mkimage` now errors out with
    detailed info on conflicts, preventing bad FIT image creation.

2.  New Test Case: A Python test verifies the new detection.
    It intentionally creates an overlap (kernel and FDT)
    to confirm correct error handling.

3.  Fixes for Existing Overlaps:
    * Board DTS (k3-am6xx): Adjusted load addresses for TI
      firmware stubs to prevent conflicts. This resolves
      previously undetected overlaps.
    * `binman` Tests: Fixed several tests. U-Boot load
      addresses were shifted to avoid ATF conflicts. A new
      linker script for TEE ELF sections ensures distinct
      memory layouts.

4.  Documentation: Added guidance for developers on how to
    determine ELF load addresses using readelf, linker scripts,
    and objdump when working with binman FIT images.

Impact:

This series improves FIT image reliability by catching overlaps
at build time, helping developers resolve issues before runtime
failures.

Link: https://lore.kernel.org/r/20250914110021.4103-1-aristo.chen@canonical.com
1  2 
tools/binman/entries.rst
tools/binman/ftest.py
tools/fit_image.c
tools/mkimage.c

Simple merge
Simple merge
Simple merge
diff --cc tools/mkimage.c
Simple merge