qcom-capsule: patch the machine-selected xbl_config variant - #3045
Michael Scott (mike-scott) wants to merge 1 commit into
Conversation
|
CC xueqnie |
Test Results 119 files + 89 715 suites +685 6h 29m 32s ⏱️ + 3h 29m 59s For more details on these failures, see this check. Results for commit 58a3b1f. ± Comparison against base commit f87afad. This pull request removes 2 and adds 153 tests. Note that renamed tests count towards both.♻️ This comment has been updated with latest results. |
|
Milosz Wasilewski (@mwasilew) I see in the log: 24 fail and I can view the "detail" page: But I don't see any failure there. At the bottom it shows: But that only takes me to your Github. |
|
Ah, I found the correct page to show me the errors:
|
Press the "workflow" link in the "Test run workflow" |
Head branch was pushed to by a user without write access
2bcef4c to
58a3b1f
Compare
Michael Scott (mike-scott)
changed the title
|
Pushed back as a single patch updating the |
|
Ricardo Salveti de Araujo (@rsalveti) Dmitry Baryshkov (@lumag) Looks like we'll probably wait for Igor Opaniuk (@igoropaniuk) on this review? |
|
Igor Opaniuk (@igoropaniuk) Can you take a look? |
|
Ricardo Salveti de Araujo (@rsalveti) Dmitry Baryshkov (@lumag) anything else needed on this? |
|
Michael Scott (@mike-scott) mind a rebase? Just so we can have a clean test run. |
The logic for injecting FMP root cert currently uses a hardcoded
filename: xbl_config.elf.
Instead, use ${QCOM_XBL_CONFIG} which is set to the correct filename
depending on features that are enabled in MACHINE_FEATURES. For
example, "kvm" will set QCOM_XBL_CONFIG="xbl_config_kvm.elf".
Also overwrite the plain xbl_config.elf in the staging dir with
the patched variant so the capsule FV entry and do_deploy consume
the correct file.
This fixes an early kernel boot failure triggered when capsule
generation is enabled for machines with "kvm" in MACHINE_FEATURES.
They incorrectly get the default xbl_config.elf (which is typically
based on Gunyah) as part of their boot binaries.
Platforms without an xbl_config (e.g. hamoa) are unaffected.
Signed-off-by: Michael Scott <mike@foundries.io>
58a3b1f to
67bb1e3
Compare
|
Rebased on latest master. The previous pass:
|
5 participants
The logic for injecting FMP root cert currently uses a hardcoded filename: xbl_config.elf.
Instead, use ${QCOM_XBL_CONFIG} which is set to the correct filename depending on features that are enabled in MACHINE_FEATURES. For example, "kvm" will set QCOM_XBL_CONFIG="xbl_config_kvm.elf".
Also overwrite the plain xbl_config.elf in the staging dir with the patched variant so the capsule FV entry and do_deploy consume the correct file.
This fixes an early kernel boot failure triggered when capsule generation is enabled for machines with "kvm" in MACHINE_FEATURES. They incorrectly get the default xbl_config.elf (which is typically based on Gunyah) as part of their boot binaries.