]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge tag 'v2025.07-rc5' into next
authorTom Rini <trini@konsulko.com>
Mon, 23 Jun 2025 20:49:16 +0000 (14:49 -0600)
committerTom Rini <trini@konsulko.com>
Mon, 23 Jun 2025 22:15:23 +0000 (16:15 -0600)
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).

1  2 
Makefile
common/Makefile
configs/e850-96_defconfig
configs/r8a779g0_whitehawk_defconfig
include/image.h

diff --cc Makefile
Simple merge
diff --cc common/Makefile
index 35991562a12b5c020ab17605c504592e37437652,e589f3072621803a77b27fdeae5cb2627401823b..d62ea34599edfe07b29e819160fbb7e65aae1780
@@@ -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
  
Simple merge
Simple merge
diff --cc include/image.h
Simple merge