fit-dtb-compatible: kodiak el2 follow ups for kvm by default - #3186
Merged
Ricardo Salveti (ricardosalveti) merged 3 commits intoSep 18, 2026
Merged
Ricardo Salveti (ricardosalveti) merged 3 commits into
Ricardo Salveti (ricardosalveti) merged 3 commits into
Conversation
Every kodiak FIT_DTB_COMPATIBLE entry was switched to load kodiak-el2.dtbo by default when kvm became the default hypervisor on the kodiak machines, except the subtype13 combo, which only exists in the base fit-dtb-compatible.inc and was left untouched. A qcs6490-iot subtype13 board therefore matches an entry without kodiak-el2 while running the kvm xbl_config, so it boots without the EL2 fixups for ADSP, CDSP, venus, wifi and the watchdog. Override the subtype13 entry for the linux-qcom kernels so it appends kodiak-el2, and add the -el2gh sibling so the Gunyah variant can still be selected, the same way the subtype9 entries above are handled. Assisted-by: Claude Code:claude-opus-5[1m] Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
The Gunyah entries added for the kodiak camx staging combos put the el2gh suffix after camx, while every other board spells the same combination as <board>-el2gh-camx-staging: qcs615-iot, qcs8275-iot, qcs8300-adp, qcs9075-iot and sa8775p-qam-r2.0 all use that order, and the kodiak camx entries without staging were already fixed to -el2gh-camx. Move the suffix so the four kodiak camx staging entries follow the same order as the rest of the file. Assisted-by: Claude Code:claude-opus-5[1m] Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
The Gunyah entry for sa8775p-qam with camx and staging is the only one on lemans that spells the suffix as camx-el2gh-staging. Its r2.0 counterpart, and every other board with the same combination, uses <board>-el2gh-camx-staging. Rename the entry to match, so the lemans and kodiak boards end up with one single spelling for the Gunyah compatible strings. Assisted-by: Claude Code:claude-opus-5[1m] Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
Test Results 119 files 715 suites 7h 14m 43s ⏱️ Results for commit b5fa024. ♻️ This comment has been updated with latest results. |
Dmitry Baryshkov (lumag)
approved these changes
Sep 17, 2026
Viswanath Kraleti (vkraleti)
approved these changes
Sep 18, 2026
Koen Kooi (koenkooi)
approved these changes
Sep 18, 2026
Ricardo Salveti (ricardosalveti)
merged commit Sep 18, 2026
6302234
into
qualcomm-linux:master
210 of 211 checks passed
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin wrynose
git worktree add -d .worktree/backport/3186-to-wrynose origin/wrynose
cd .worktree/backport/3186-to-wrynose
git switch --create backport/3186-to-wrynose
git cherry-pick -x b567f9b1f23ac7c3b10a6441cf3db57357455103 5cb1558aae4577fda961d1fec1ac44dbd2ee1dd8 b5fa024eebceb33a00f170d1b1f65f5cf3019814 |
Contributor
Author
|
Will retry the backport once #3189 is merged. |
Contributor
|
Successfully created backport PR for |
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
6 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.
Follow up to #2879. Three small fixes to the kodiak compatible strings now that kvm is the default hypervisor.
qcs6490-iot subtype13 was the only kodiak combo left without kodiak-el2, since it only exists in the base fit-dtb-compatible.inc, so that board boots without the EL2 fixups while running the kvm xbl_config.
The Gunyah entries for the kodiak camx staging combos ended up as -camx-el2gh-staging, while qcs615, qcs8275, qcs8300, qcs9075 and sa8775p-qam-r2.0 all use -el2gh-camx-staging. The last commit fixes the same outlier on sa8775p-qam, which was raised during the review of #2879.