[Backport wrynose] image_types_qcom: install KVM uefi_dtbs variant into qcomflash for iq-x7181/x5121#2661
Open
quic-yocto-ci wants to merge 3 commits into
Open
[Backport wrynose] image_types_qcom: install KVM uefi_dtbs variant into qcomflash for iq-x7181/x5121#2661quic-yocto-ci wants to merge 3 commits into
quic-yocto-ci wants to merge 3 commits into
Conversation
The spinor block bulk-copies the whole firmware spinor subdir into the qcomflash package, leaving no place to select between same-type variants (e.g. KVM/non-KVM UEFI DTB blobs). Replace it with a whitelist mirroring firmware-qcom-boot-common.inc's do_deploy filter. Behavior is unchanged: the source can only contain files matching that filter. Signed-off-by: Xinzheng Long <xinzheng.long@oss.qualcomm.com> (cherry picked from commit b65fee5)
Platforms booting with KVM enabled (e.g. iq-x7181-evk / iq-x5121-evk built with qcom-distro-kvm.yml) require a different UEFI DTB blob than the non-KVM build. The boot firmware ships both variants (uefi_dtbs_kvm.xz and uefi_dtbs.xz) side by side, but there is no variable to express which one a given machine should use. Introduce QCOM_UEFI_DTB, resolving to the KVM variant when the kvm MACHINE_FEATURE is set and the non-KVM variant otherwise, so callers can pick the correct file based on machine configuration. Signed-off-by: Xinzheng Long <xinzheng.long@oss.qualcomm.com> (cherry picked from commit d826a3b)
The spinor whitelist in create_qcomflash_pkg() picks up every *.xz file from the firmware spinor subdir, which pulls both uefi_dtbs.xz and uefi_dtbs_kvm.xz into the qcomflash package whenever the firmware set ships them side by side. The resulting package carries duplicate DTB blobs with no indication of which one matches the build, so the KVM-appropriate DTB is never explicitly delivered to the flashing flow. Exclude uefi_dtbs*.xz from the spinor whitelist and install only the QCOM_UEFI_DTB-selected variant under the fixed name uefi_dtbs.xz, so the package always carries the right DTB under a stable filename. Signed-off-by: Xinzheng Long <xinzheng.long@oss.qualcomm.com> (cherry picked from commit 27fbcfa)
Ricardo Salveti (ricardosalveti)
approved these changes
Jun 30, 2026
Koen Kooi (koenkooi)
approved these changes
Jul 1, 2026
Test Results 63 files - 6 305 suites - 51 4h 15m 9s ⏱️ + 24m 50s For more details on these failures, see this check. Results for commit 939039f. ± Comparison against base commit 6f95b3d. |
Dmitry Baryshkov (lumag)
approved these changes
Jul 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Backport of #2616 to
wrynose.