From: Tom Rini Date: Mon, 25 Aug 2025 19:28:49 +0000 (-0600) Subject: Merge tag 'v2025.10-rc3' into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fceb37d802b65beb4713f17e9167e7ecc4dbbe67;p=thirdparty%2Fu-boot.git Merge tag 'v2025.10-rc3' into next Prepare v2025.10-rc3 --- fceb37d802b65beb4713f17e9167e7ecc4dbbe67 diff --cc board/phytec/phycore_am62ax/phycore_am62ax.env index 3f4b3cc4f0d,ff4ab8c87b8..006a817d0e2 --- a/board/phytec/phycore_am62ax/phycore_am62ax.env +++ b/board/phytec/phycore_am62ax/phycore_am62ax.env @@@ -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 diff --cc board/phytec/phycore_am62x/phycore_am62x.env index 3f4b3cc4f0d,ff4ab8c87b8..006a817d0e2 --- a/board/phytec/phycore_am62x/phycore_am62x.env +++ b/board/phytec/phycore_am62x/phycore_am62x.env @@@ -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 diff --cc board/phytec/phycore_am64x/phycore_am64x.env index 3775a27c1a3,cbaf45b3ace..bf251c4bcdd --- a/board/phytec/phycore_am64x/phycore_am64x.env +++ b/board/phytec/phycore_am64x/phycore_am64x.env @@@ -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