| Message ID | 20260106121413.844461-1-festevam@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 91d49a31e26c2123e2aca1d1422b1171fabb8776 |
| Headers | show |
| Series | u-boot: upgrade 2025.10 -> 2026.01 | expand |
On Tue Jan 6, 2026 at 1:14 PM CET, Fabio Estevam via lists.openembedded.org wrote: > Upgrade to U-Boot 2026.01. > > Signed-off-by: Fabio Estevam <festevam@gmail.com> > --- > meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +- > .../u-boot/{u-boot-tools_2025.10.bb => u-boot-tools_2026.01.bb} | 0 > .../recipes-bsp/u-boot/{u-boot_2025.10.bb => u-boot_2026.01.bb} | 0 > 3 files changed, 1 insertion(+), 1 deletion(-) > rename meta/recipes-bsp/u-boot/{u-boot-tools_2025.10.bb => u-boot-tools_2026.01.bb} (100%) > rename meta/recipes-bsp/u-boot/{u-boot_2025.10.bb => u-boot_2026.01.bb} (100%) > > diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc > index 93ff0ca6ca..79ddde3f5c 100644 > --- a/meta/recipes-bsp/u-boot/u-boot-common.inc > +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc > @@ -12,7 +12,7 @@ PE = "1" > > # We use the revision in order to avoid having to fetch it from the > # repo during parse > -SRCREV = "e50b1e8715011def8aff1588081a2649a2c6cd47" > +SRCREV = "127a42c7257a6ffbbd1575ed1cbaa8f5408a44b3" > > SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}" > > diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2025.10.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2026.01.bb > similarity index 100% > rename from meta/recipes-bsp/u-boot/u-boot-tools_2025.10.bb > rename to meta/recipes-bsp/u-boot/u-boot-tools_2026.01.bb > diff --git a/meta/recipes-bsp/u-boot/u-boot_2025.10.bb b/meta/recipes-bsp/u-boot/u-boot_2026.01.bb > similarity index 100% > rename from meta/recipes-bsp/u-boot/u-boot_2025.10.bb > rename to meta/recipes-bsp/u-boot/u-boot_2026.01.bb Hi Jon, Ross, Just a quick warning, once merged, this update will break meta-arm builds, as some patches are conflicting: ERROR: u-boot-1_2026.01-r0 do_patch: Applying patch '/srv/pokybuild/yocto-worker/meta-arm/build/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64-Set-the-DM_RNG-property.patch' on target directory '/srv/pokybuild/yocto-worker/meta-arm/build/build/tmp/work/fvp_base-poky-linux/u-boot/2026.01/sources/u-boot-2026.01' CmdError('quilt --quiltrc /srv/pokybuild/yocto-worker/meta-arm/build/build/tmp/work/fvp_base-poky-linux/u-boot/2026.01/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0001-vexpress64-Set-the-DM_RNG-property.patch patching file board/armltd/vexpress64/Kconfig Hunk #1 FAILED at 21. 1 out of 1 hunk FAILED -- rejects in file board/armltd/vexpress64/Kconfig Patch 0001-vexpress64-Set-the-DM_RNG-property.patch does not apply (enforce with -f) https://autobuilder.yoctoproject.org/valkyrie/#/builders/75/builds/2872 Thanks, Mathieu
On Thu, Jan 8, 2026 at 5:05 AM Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> wrote: > Hi Jon, Ross, > > Just a quick warning, once merged, this update will break meta-arm > builds, as some patches are conflicting: > > ERROR: u-boot-1_2026.01-r0 do_patch: Applying patch '/srv/pokybuild/yocto-worker/meta-arm/build/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0001-vexpress64-Set-the-DM_RNG-property.patch' on target directory '/srv/pokybuild/yocto-worker/meta-arm/build/build/tmp/work/fvp_base-poky-linux/u-boot/2026.01/sources/u-boot-2026.01' > CmdError('quilt --quiltrc /srv/pokybuild/yocto-worker/meta-arm/build/build/tmp/work/fvp_base-poky-linux/u-boot/2026.01/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0001-vexpress64-Set-the-DM_RNG-property.patch > patching file board/armltd/vexpress64/Kconfig > Hunk #1 FAILED at 21. > 1 out of 1 hunk FAILED -- rejects in file board/armltd/vexpress64/Kconfig > Patch 0001-vexpress64-Set-the-DM_RNG-property.patch does not apply (enforce with -f) This patch is already present in U-Boot 2026.01, so it must be dropped.
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 93ff0ca6ca..79ddde3f5c 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -12,7 +12,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "e50b1e8715011def8aff1588081a2649a2c6cd47" +SRCREV = "127a42c7257a6ffbbd1575ed1cbaa8f5408a44b3" SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}" diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2025.10.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2026.01.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot-tools_2025.10.bb rename to meta/recipes-bsp/u-boot/u-boot-tools_2026.01.bb diff --git a/meta/recipes-bsp/u-boot/u-boot_2025.10.bb b/meta/recipes-bsp/u-boot/u-boot_2026.01.bb similarity index 100% rename from meta/recipes-bsp/u-boot/u-boot_2025.10.bb rename to meta/recipes-bsp/u-boot/u-boot_2026.01.bb
Upgrade to U-Boot 2026.01. Signed-off-by: Fabio Estevam <festevam@gmail.com> --- meta/recipes-bsp/u-boot/u-boot-common.inc | 2 +- .../u-boot/{u-boot-tools_2025.10.bb => u-boot-tools_2026.01.bb} | 0 .../recipes-bsp/u-boot/{u-boot_2025.10.bb => u-boot_2026.01.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-bsp/u-boot/{u-boot-tools_2025.10.bb => u-boot-tools_2026.01.bb} (100%) rename meta/recipes-bsp/u-boot/{u-boot_2025.10.bb => u-boot_2026.01.bb} (100%)