]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge patch series "various memory related fixups"
authorTom Rini <trini@konsulko.com>
Mon, 15 Jun 2026 17:04:48 +0000 (11:04 -0600)
committerTom Rini <trini@konsulko.com>
Mon, 15 Jun 2026 17:04:48 +0000 (11:04 -0600)
rs@ti.com <rs@ti.com> says:

From: Randolph Sapp <rs@ti.com>

Nitpicks and fixes from the discovery thread on adding PocketBeagle2 support
[1]. This does a lot of general setup required for the device, but these
modifications themselves aren't device specific. For those specifically
interested in PocketBeagle2 support and don't care about these details, my
development branch is public [2].

That first patch may provoke some opinions, but honestly if that warning was
still present I wouldn't have spent a week poking holes in both the EFI and LMB
allocations systems. Please let me know if there is a specific usecase that it
breaks though.

[1] https://lore.kernel.org/all/DHHC66BBMD27.YHGIH43C6XBK@ti.com/
[2] https://github.com/StaticRocket/u-boot/tree/feature/pocketbeagle2

Link: https://lore.kernel.org/r/20260604155038.3182-1-rs@ti.com
1  2 
common/board_f.c
include/image.h
lib/lmb.c
test/boot/Makefile
test/cmd_ut.c

Simple merge
diff --cc include/image.h
Simple merge
diff --cc lib/lmb.c
Simple merge
index d98f212b24379acfc723c8457acd12773081f46a,12904f7f508a010a6cccdd512ba0da1be37b5e1d..e6aa0ab7d3edcb9ed27d71d95a107357873811d4
@@@ -14,8 -14,10 +14,11 @@@ endi
  
  ifdef CONFIG_SANDBOX
  obj-$(CONFIG_$(PHASE_)CMDLINE) += bootm.o
+ ifdef CONFIG_UT_DM
+ obj-$(CONFIG_$(PHASE_)OF_LIBFDT) += image_fdt.o
+ endif
  endif
 +obj-$(CONFIG_$(PHASE_)FIT_VERITY) += fit_verity.o
  obj-$(CONFIG_MEASURED_BOOT) += measurement.o
  
  ifdef CONFIG_OF_LIVE
diff --cc test/cmd_ut.c
index d1b376f617cceb13823410aa93b6ae27df768884,363ed4eab300e4da80e3e0582616452e3ce386f5..4328670d0d67a1fc906f4c73b34f7b2dd55b18f6
@@@ -59,9 -59,9 +59,10 @@@ SUITE_DECL(env)
  SUITE_DECL(exit);
  SUITE_DECL(fdt);
  SUITE_DECL(fdt_overlay);
 +SUITE_DECL(fit_verity);
  SUITE_DECL(font);
  SUITE_DECL(hush);
+ SUITE_DECL(image_fdt);
  SUITE_DECL(lib);
  SUITE_DECL(loadm);
  SUITE_DECL(log);
@@@ -87,9 -87,9 +88,10 @@@ static struct suite suites[] = 
        SUITE(exit, "shell exit and variables"),
        SUITE(fdt, "fdt command"),
        SUITE(fdt_overlay, "device tree overlays"),
 +      SUITE(fit_verity, "FIT dm-verity cmdline generation"),
        SUITE(font, "font command"),
        SUITE(hush, "hush behaviour"),
+       SUITE(image_fdt, "image fdt parsing"),
        SUITE(lib, "library functions"),
        SUITE(loadm, "loadm command parameters and loading memory blob"),
        SUITE(log, "logging functions"),