]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge tag 'v2026.07-rc5' into next
authorTom Rini <trini@konsulko.com>
Mon, 22 Jun 2026 22:42:41 +0000 (16:42 -0600)
committerTom Rini <trini@konsulko.com>
Mon, 22 Jun 2026 22:42:41 +0000 (16:42 -0600)
Prepare v2026.07-rc5

1  2 
Makefile
arch/arm/dts/Makefile
board/qualcomm/qcom-phone.env
configs/toradex-smarc-imx95_defconfig
configs/verdin-imx95_defconfig
drivers/gpio/qcom_pmic_gpio.c
drivers/gpio/qcom_spmi_gpio.c
drivers/power/regulator/qcom-rpmh-regulator.c

diff --cc Makefile
Simple merge
Simple merge
index f9911340295f18a56d049e1fa2b41f2ba0c61ab5,d1c586bd3fbcaff5f6f3fbaae710fd4d631a523c..42f58c3bac61149c871f646adb4452c40f5faf50
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge