image_types_qcom: install KVM uefi_dtbs variant into qcomflash for iq-x7181/x5121#2616
Conversation
|
Drop the Problem / Fix splat from the PR description. Please fix your AI prompt to stop generating such PR descriptions. |
Xinzheng Long (xinlon-z)
changed the title
Done |
Test Results 110 files + 38 657 suites +288 5h 38m 45s ⏱️ + 58m 8s Results for commit 27fbcfa. ± Comparison against base commit e4d25b5. This pull request removes 5 tests.♻️ This comment has been updated with latest results. |
Dmitry Baryshkov (lumag)
left a comment
Dmitry Baryshkov (lumag)
left a comment
There was a problem hiding this comment.
Select the UEFI DTB variant (uefi_dtbs_kvm.xz vs uefi_dtbs.xz) based on
the kvm MACHINE_FEATURE.
Your commit messages lack the most important part. Why you are performing the change. Start the commit message by describing the issue or the problem that it is solving.
Xinzheng Long (xinlon-z)
force-pushed
the
uefi-dtb-qcomflash
branch
2 times, most recently
from
cf4867f to
a0f0d15
Compare
updated commit msg |
|
Please rebase on the tip to pick up build fixes. |
Xinzheng Long (xinlon-z)
force-pushed
the
uefi-dtb-qcomflash
branch
from
a0f0d15 to
0f430e1
Compare
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>
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>
Done |
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>
Xinzheng Long (xinlon-z)
force-pushed
the
uefi-dtb-qcomflash
branch
from
0f430e1 to
27fbcfa
Compare
Dmitry Baryshkov (lumag)
requested a review
from Ricardo Salveti (ricardosalveti)
Ricardo Salveti (ricardosalveti)
merged commit ef33841
into
qualcomm-linux:master
|
Successfully created backport PR for |
4 participants
On iq-x7181-evk / iq-x5121-evk, KVM boot needs
uefi_dtbs_kvm.xzinstead ofuefi_dtbs.xz. The spinor bulk-copy pulled both variants into the qcomflash package with no indication of which to use.Add
QCOM_UEFI_DTBto select the variant by thekvmMACHINE_FEATURE and install only that one asuefi_dtbs.xz, make sure the package always carries the right DTB under a stable name.example build command: