From: Tom Rini <trini@konsulko.com>
Date: Mon, 22 Jun 2026 22:42:41 +0000 (-0600)
Subject: Merge tag 'v2026.07-rc5' into next
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=9f16b258e5632d74fa4a1c2c93bea4474e05234b;p=thirdparty%2Fu-boot.git

Merge tag 'v2026.07-rc5' into next

Prepare v2026.07-rc5
---

9f16b258e5632d74fa4a1c2c93bea4474e05234b
diff --cc board/qualcomm/qcom-phone.env
index f9911340295,d1c586bd3fb..42f58c3bac6
--- a/board/qualcomm/qcom-phone.env
+++ b/board/qualcomm/qcom-phone.env
@@@ -39,8 -39,7 +39,8 @@@ bootmenu_5=Reset device=rese
  bootmenu_6=Dump clocks=clk dump; pause
  bootmenu_7=Dump environment=printenv; pause
  bootmenu_8=Board info=bdinfo; pause
- bootmenu_9=Dump bootargs=fdt print /chosen bootargs; pause
+ bootmenu_9=Dump bootargs=fdt addr $fdt_addr_r; fdt print /chosen bootargs; pause
 +bootmenu_10=Power off=poweroff
  
  # Allow holding the volume down button while U-Boot loads to enter
  # the boot menu