[Backport wrynose] fit-dtb-compatible: kodiak el2 follow ups for kvm by default - #3197
Merged
Merged
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> (cherry picked from commit b567f9b)
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> (cherry picked from commit 5cb1558)
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> (cherry picked from commit b5fa024)
Test Results 119 files + 1 715 suites +5 7h 42m 21s ⏱️ - 2h 13m 32s For more details on these failures, see this check. Results for commit 45e4fb7. ± Comparison against base commit d055051. ♻️ This comment has been updated with latest results. |
Viswanath Kraleti (vkraleti)
approved these changes
Sep 19, 2026
Dmitry Baryshkov (lumag)
approved these changes
Sep 20, 2026
Contributor
|
Known issues. |
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 #3186 to
wrynose.