Skip to content

uboot: Bump uboot version to 2026.07-rc1#2016

Merged
ricardosalveti merged 2 commits intoqualcomm-linux:masterfrom
aswinm94:src-rev
Apr 30, 2026
Merged

uboot: Bump uboot version to 2026.07-rc1#2016
ricardosalveti merged 2 commits intoqualcomm-linux:masterfrom
aswinm94:src-rev

Conversation

@aswinm94
Copy link
Copy Markdown
Contributor

@aswinm94 aswinm94 commented Apr 22, 2026

Update the uboot version from 2026.04-rc1 to 2026.07-rc1 release

U-Boot v2026.04 introduces a build failure in the mkeficapsule host tool
when building via Yocto/OpenEmbedded.

This is a known upstream issue reported in both U-Boot and OE-Core,
and the required fixes are not yet present in the OpenEmbedded layer,
which has not been updated to fully support v2026.04.

As a temporary workaround, CONFIG_TOOLS_MKEFICAPSULE is disabled to
allow the U-Boot build to succeed until the upstream fixes are
available and integrated.

Comment thread recipes-bsp/u-boot/u-boot-qcom_git.bb Outdated
@github-actions
Copy link
Copy Markdown

Test run workflow

Test jobs for commit 11e7c649be0f17bfb975726187efd933d916b2b5

Test dragonboard-820c qcs615-adp-air qcs6490 qcs8300 qcs9100 qcs9100-rb8 qrb2210-rb1
AudioRecord 🚫 pass pass pass pass 🚫 pass
BT_FW_KMD_Service 🚫 pass pass pass pass pass pass
BT_ON_OFF 🚫 pass pass pass pass fail pass
BT_SCAN 🚫 pass pass pass pass fail pass
CPUFreq_Validation 🚫 pass pass pass pass pass pass
DSP_AudioPD 🚫 pass pass pass pass pass pass
Ethernet 🚫 ⚠️ skip 🚫 pass pass pass ⚠️ skip
Interrupts 🚫 pass pass pass pass pass pass
KMSCube 🚫 ⚠️ skip ⚠️ skip pass 🚫 pass pass
OpenCV 🚫 pass pass pass pass pass pass
WiFi_Firmware_Driver 🚫 pass pass pass pass pass pass
WiFi_OnOff 🚫 pass pass pass pass pass pass
adsp_remoteproc 🚫 pass pass pass pass pass pass
boot pass pass pass pass pass pass pass
cdsp_remoteproc 🚫 pass pass pass pass pass ⚠️ skip
core_auth 🚫 pass pass pass 🚫 pass pass
fastrpc_test 🚫 pass pass pass pass pass 🚫
hotplug 🚫 pass pass pass pass pass pass
irq 🚫 pass pass pass pass pass pass
weston-simple-egl 🚫 ⚠️ skip ⚠️ skip pass 🚫 pass pass

All jobs summary

Job ID Device State Health
185136 qcs8300 Finished Complete
185170 qcs6490 Finished Complete
185120 qcs8300 Finished Complete
185171 qrb2210-rb1 Finished Complete
185113 dragonboard-820c Finished Complete
185163 qcs9100 Finished Complete
185140 qcs9100 Running Unknown
185123 qcs6490 Finished Complete
185145 qcs8300 Finished Complete
185156 qcs9100 Submitted Unknown
185173 qcs6490 Finished Complete
185141 qrb2210-rb1 Finished Complete
185168 qcs8300 Finished Complete
185132 qcs8300 Finished Complete
185127 qcs615-adp-air Finished Complete
185161 qcs615-adp-air Finished Complete
185134 qcs615-adp-air Finished Complete
185155 qcs9100-rb8 Finished Complete
185117 qcs9100-rb8 Finished Complete
185112 qcs9100 Finished Complete
185119 dragonboard-820c Finished Complete
185144 qcs6490 Finished Complete
185157 qrb2210-rb1 Finished Complete
185172 qrb2210-rb1 Finished Complete
185142 qcs8300 Finished Complete
185122 dragonboard-820c Finished Complete
185116 qcs615-adp-air Finished Complete
185115 qcs6490 Finished Complete
185169 qcs9100 Finished Complete
185159 qcs615-adp-air Finished Complete
185133 qcs615-adp-air Finished Complete
185110 qcs9100-rb8 Finished Complete
185152 qcs9100-rb8 Finished Complete
185149 qcs6490 Finished Complete
185111 qrb2210-rb1 Finished Complete
185146 qcs6490 Finished Complete
185125 qcs9100 Finished Complete
185175 qcs9100 Running Unknown
185124 qcs6490 Finished Complete
185158 qrb2210-rb1 Finished Complete
185137 qcs9100-rb8 Finished Complete
185151 qcs9100-rb8 Finished Complete
185135 qrb2210-rb1 Finished Complete
185131 qrb2210-rb1 Finished Complete
185147 qcs9100-rb8 Finished Complete
185129 qrb2210-rb1 Finished Complete
185165 qrb2210-rb1 Finished Complete
185148 qcs8300 Finished Complete
185114 qcs9100 Finished Complete
185150 qcs9100-rb8 Finished Complete
185167 qcs9100-rb8 Finished Complete
185126 dragonboard-820c Finished Complete
185153 qcs8300 Finished Complete
185121 qcs6490 Finished Complete
185160 qcs615-adp-air Finished Complete
185174 qcs8300 Finished Complete
185162 qcs615-adp-air Finished Complete
185130 qcs9100-rb8 Finished Complete
185164 qcs615-adp-air Finished Complete
185154 qcs6490 Finished Complete
185128 qcs9100 Finished Complete
185118 qcs8300 Finished Complete
185166 qcs9100 Finished Complete
185143 qcs615-adp-air Finished Complete

@test-reporting-app
Copy link
Copy Markdown

test-reporting-app Bot commented Apr 22, 2026

Test Results

   95 files  ± 0    479 suites  ±0   6h 23m 54s ⏱️ + 11m 45s
   83 tests + 2     54 ✅  - 17   0 💤 ±0  29 ❌ +19 
4 497 runs   - 22  4 422 ✅  - 63  21 💤 +3  54 ❌ +38 

For more details on these failures, see this check.

Results for commit 0596725. ± Comparison against base commit 517d87f.

♻️ This comment has been updated with latest results.

Comment thread recipes-bsp/u-boot/u-boot-qcom_git.bb Outdated
Comment thread recipes-bsp/u-boot/u-boot-qcom_git.bb Outdated
@lumag
Copy link
Copy Markdown
Contributor

lumag commented Apr 23, 2026

Please rebase.

@b49020
Copy link
Copy Markdown
Member

b49020 commented Apr 24, 2026

NAK for this U-Boot bump since it's based on a downstream U-Boot branch: https://github.com/qualcomm-linux/u-boot/commits/u-boot-mainline-1.0/ and not on qcom-next.

@aswinm94 didn't we discussed about that the meta-qcom integration has to closely follow U-Boot upstream and not a dump of downstream patches.

Comment thread recipes-bsp/u-boot/u-boot-qcom_git.bb.save Outdated
Comment thread recipes-bsp/u-boot/files/disable-eficapsule-tool.cfg
@aswinm94
Copy link
Copy Markdown
Contributor Author

NAK for this U-Boot bump since it's based on a downstream U-Boot branch: https://github.com/qualcomm-linux/u-boot/commits/u-boot-mainline-1.0/ and not on qcom-next.

@aswinm94 didn't we discussed about that the meta-qcom integration has to closely follow U-Boot upstream and not a dump of downstream patches.

the srcrev has been updated to point to qcom-next

lumag
lumag previously approved these changes Apr 28, 2026
Update the uboot version from 2026.04-rc1 to stable 2026.07-rc1 release

Signed-off-by: Aswin Murugan <aswin.murugan@oss.qualcomm.com>
@aswinm94 aswinm94 changed the title uboot: Bump uboot version to 2026.04 uboot: Bump uboot version to 2026.07-rc1 Apr 28, 2026
The mkeficapsule host tool fails to compile with U-Boot v2026.04+ in
Yocto builds. This is a known upstream issue already reported in
U-Boot and OE-Core.

As OE-Core has not yet been updated to support v2026.04, disable
CONFIG_TOOLS_MKEFICAPSULE to unblock the build.

This change is intended as a temporary workaround until the upstream
fixes are merged and consumed.

References:
- https://lore.kernel.org/all/20260408130553.819420-1-fra.schnyder@gmail.com/
- https://lore.kernel.org/u-boot/20260409074710.1322519-1-Wojciech.Dubowik@mt.com/

Signed-off-by: Aswin Murugan <aswin.murugan@oss.qualcomm.com>
@aswinm94
Copy link
Copy Markdown
Contributor Author

aswinm94 commented Apr 28, 2026

Since uboot qcom-nxt branch has been rebased to 2026.07-rc1 recently, updated the PR to align with it

@lumag lumag requested a review from b49020 April 28, 2026 09:45
@b49020
Copy link
Copy Markdown
Member

b49020 commented Apr 28, 2026

Since uboot qcom-nxt branch has been rebased to 2026.07-rc1 recently, updated the PR to align with it

Bump to qcom-next based on 2026.07-rc1 sounds fine to me.

@github-actions
Copy link
Copy Markdown

Test run workflow

Test jobs for commit 0596725

qcom-distro_linux-qcom-6.18
Pass: 178 | Fail: 4 | Total: 187
nodistro
Pass: 9 | Fail: 0 | Total: 9
qcom-distro
Pass: 163 | Fail: 1 | Total: 180

@ricardosalveti
Copy link
Copy Markdown
Contributor

But why are you updating to a newer version after this PR was proposed and approved? Since this is a major change I would prefer updating in steps, first to the final 04 release and then to the 07-rc1 (since this is rc1 and it might have other issues).

@aswinm94
Copy link
Copy Markdown
Contributor Author

But why are you updating to a newer version after this PR was proposed and approved? Since this is a major change I would prefer updating in steps, first to the final 04 release and then to the 07-rc1 (since this is rc1 and it might have other issues).

@ricardosalveti , when the PR was created the qcom-next branch was based on 2026.04, yesterday we had a 2026.07-rc1 release from uboot which has many of the changes from Qualcomm also the qcom-next branch was rebased to the newer version, hence i updated PR to point to 2026.07-rc1

@ricardosalveti
Copy link
Copy Markdown
Contributor

But why are you updating to a newer version after this PR was proposed and approved? Since this is a major change I would prefer updating in steps, first to the final 04 release and then to the 07-rc1 (since this is rc1 and it might have other issues).

@ricardosalveti , when the PR was created the qcom-next branch was based on 2026.04, yesterday we had a 2026.07-rc1 release from uboot which has many of the changes from Qualcomm also the qcom-next branch was rebased to the newer version, hence i updated PR to point to 2026.07-rc1

Sure, but please avoid changing PRs which were already approved for the previous release, it is perfectly fine to propose a new one later for the new bump, which also helps when we want to bisect possible regressions and issues.

@aswinm94
Copy link
Copy Markdown
Contributor Author

aswinm94 commented Apr 29, 2026

But why are you updating to a newer version after this PR was proposed and approved? Since this is a major change I would prefer updating in steps, first to the final 04 release and then to the 07-rc1 (since this is rc1 and it might have other issues).

@ricardosalveti , when the PR was created the qcom-next branch was based on 2026.04, yesterday we had a 2026.07-rc1 release from uboot which has many of the changes from Qualcomm also the qcom-next branch was rebased to the newer version, hence i updated PR to point to 2026.07-rc1

Sure, but please avoid changing PRs which were already approved for the previous release, it is perfectly fine to propose a new one later for the new bump, which also helps when we want to bisect possible regressions and issues.

@ricardosalveti , qli2.0 required features & bug fixes are present in 2026.07-rc1, so it will be good to bump to that version directly.

@ricardosalveti
Copy link
Copy Markdown
Contributor

Sure, but please avoid changing PRs which were already approved for the previous release, it is perfectly fine to propose a new one later for the new bump, which also helps when we want to bisect possible regressions and issues.

@ricardosalveti , qli2.0 required features & bug fixes are present in 2026.07-rc1, so it will be good to bump to that version directly.

That's a good thing to discuss, as wrynose (which is the release QLI 2.0 will be based on) uses u-boot 2026.04 by default, so this will move us ahead of oe-core, which is fine for master but we might want to discuss for wrynose.

I'm OK using a newer version for wrynose as there is no LTS for u-boot, but I'm not sure releasing on 07-rc1 is ideal, I would prefer to only bump wrynose once we have the final 07 release.

@b49020 @lumag @ndechesne what do you guys thing?

Meanwhile can you move back to the 2026.04 based rev? We can merge it first and then decide how to bump to 07-rc1.

@lumag
Copy link
Copy Markdown
Contributor

lumag commented Apr 29, 2026

Meanwhile can you move back to the 2026.04 based rev? We can merge it first and then decide how to bump to 07-rc1.

Unless @b49020 recommends otherwise, I'd go with 2026.04.

@b49020
Copy link
Copy Markdown
Member

b49020 commented Apr 30, 2026

That's a good thing to discuss, as wrynose (which is the release QLI 2.0 will be based on) uses u-boot 2026.04 by default, so this will move us ahead of oe-core, which is fine for master but we might want to discuss for wrynose.

Not sure if we tightly follow that practice from kernel point of view as well.

I'm OK using a newer version for wrynose as there is no LTS for u-boot, but I'm not sure releasing on 07-rc1 is ideal, I would prefer to only bump wrynose once we have the final 07 release.

U-Boot LTS has been long discussed but it doesn't exist at all. The U-Boot team's effort are towards mainline enablement only and I think that's the feasible approach only given the limited number of folks working upstream. Surely there will be regular rcX bumps for U-Boot as we already do for the kernel rcX but U-Boot doesn't have the LTS model as the kernel does.

That means all the fixes even after U-Boot main releases land in master branch only. Regarding Yocto wrynose vs mainline, even if we decide 2026.04 then there aren't any plans to support any feature updates or fixes there. Not sure if that would be useful for the customers if regular updates don't come there.

However, if we stick with mainline then for sure it will go through the testing process and any fixes required will get merged in staging tree as well as in mainline.

@ricardosalveti
Copy link
Copy Markdown
Contributor

Regarding Yocto wrynose vs mainline, even if we decide 2026.04 then there aren't any plans to support any feature updates or fixes there.

So the only "supported" path from our side would be to keep moving it to newer releases even in wrynose. Guess with that it is fine to move it to 07-rc1 then, as it will be the baseline we support.

@b49020
Copy link
Copy Markdown
Member

b49020 commented Apr 30, 2026

Regarding Yocto wrynose vs mainline, even if we decide 2026.04 then there aren't any plans to support any feature updates or fixes there.

So the only "supported" path from our side would be to keep moving it to newer releases even in wrynose. Guess with that it is fine to move it to 07-rc1 then, as it will be the baseline we support.

Given the resourcing constraints and U-Boot no LTS model, I think that's a reasonable approach to take. Also, we would be tracking the U-Boot patch-set delta in staging tree to be well under control as the upstream work continues.

@ricardosalveti
Copy link
Copy Markdown
Contributor

As a temporary workaround, CONFIG_TOOLS_MKEFICAPSULE is disabled to allow the U-Boot build to succeed until the upstream fixes are available and integrated.

Just a note to link to an issue so we can revert the changes later.

@ricardosalveti ricardosalveti merged commit 56c213d into qualcomm-linux:master Apr 30, 2026
482 of 485 checks passed
lumag added a commit that referenced this pull request May 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants