From: Tom Rini <trini@konsulko.com>
Date: Mon, 23 Jun 2025 20:49:16 +0000 (-0600)
Subject: Merge tag 'v2025.07-rc5' into next
X-Git-Tag: v2025.10-rc1~91^2~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=184e7d0bb211b8885f6715fdd6149ce96a4d1037;p=thirdparty%2Fu-boot.git

Merge tag 'v2025.07-rc5' into next

Prepare v2025.07-rc5

With this merge, tighten up the LTO_FLAGS removal we added to not
trigger on ARMv7 (which is Thumb-2 and should be fine).
---

184e7d0bb211b8885f6715fdd6149ce96a4d1037
diff --cc common/Makefile
index 35991562a12,e589f307262..d62ea34599e
--- a/common/Makefile
+++ b/common/Makefile
@@@ -19,6 -19,10 +19,12 @@@ obj-y += version.
  # # boards
  obj-y += board_f.o
  obj-y += board_r.o
+ ifdef CONFIG_$(PHASE_)SYS_THUMB_BUILD
++ifneq ($(CONFIG_SYS_ARM_ARCH),7)
+ CFLAGS_REMOVE_board_f.o := $(LTO_CFLAGS)
+ CFLAGS_REMOVE_board_r.o := $(LTO_CFLAGS)
+ endif
++endif
  obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
  obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o