]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge tag 'v2025.10-rc3' into next
authorTom Rini <trini@konsulko.com>
Mon, 25 Aug 2025 19:28:49 +0000 (13:28 -0600)
committerTom Rini <trini@konsulko.com>
Mon, 25 Aug 2025 19:28:49 +0000 (13:28 -0600)
Prepare v2025.10-rc3

1  2 
board/phytec/phycore_am62ax/phycore_am62ax.env
board/phytec/phycore_am62x/phycore_am62x.env
board/phytec/phycore_am64x/phycore_am64x.env
configs/sandbox_defconfig

index 3f4b3cc4f0d780bec985a703f1907a20d65678c0,ff4ab8c87b8996f30803d41348004e2e5ab2d2f3..006a817d0e2230104cf7c58dbff40c50685d78a3
@@@ -26,7 -25,9 +26,11 @@@ spi_fdt_addr=0x70000
  spi_image_addr=0x800000
  spi_ramdisk_addr=0x2200000
  
+ #ifdef CONFIG_BOOTMETH_RAUC
+ bootmeths=rauc script efi extlinux pxe
+ #else
  bootmeths=script efi extlinux pxe
+ #endif
  boot_targets=mmc1 mmc0 spi_flash dhcp
 +
 +watchdog=watchdog@e000000
index 3f4b3cc4f0d780bec985a703f1907a20d65678c0,ff4ab8c87b8996f30803d41348004e2e5ab2d2f3..006a817d0e2230104cf7c58dbff40c50685d78a3
@@@ -26,7 -25,9 +26,11 @@@ spi_fdt_addr=0x70000
  spi_image_addr=0x800000
  spi_ramdisk_addr=0x2200000
  
+ #ifdef CONFIG_BOOTMETH_RAUC
+ bootmeths=rauc script efi extlinux pxe
+ #else
  bootmeths=script efi extlinux pxe
+ #endif
  boot_targets=mmc1 mmc0 spi_flash dhcp
 +
 +watchdog=watchdog@e000000
index 3775a27c1a3164714d13b1ec6bcf07ce0392a453,cbaf45b3ace0a7fd7705735bc335229f82367dbd..bf251c4bcdd8ba5a8d8ff5a76780aeb2487d80fc
@@@ -25,7 -24,9 +25,11 @@@ spi_fdt_addr=0x70000
  spi_image_addr=0x800000
  spi_ramdisk_addr=0x2200000
  
+ #ifdef CONFIG_BOOTMETH_RAUC
+ bootmeths=rauc script efi extlinux pxe
+ #else
  bootmeths=script efi extlinux pxe
+ #endif
  boot_targets=mmc1 mmc0 spi_flash dhcp
 +
 +watchdog=watchdog@e000000
Simple merge