[Backport wrynose] Plumb flashing support for open-firmware boot for IQ-9075 EVK and RB3Gen2 - #3294
Merged
Merged
Conversation
The SWIV platform annotation is not specific to the U-Boot SPL; the TF-A BL2 signing needs the same platform name. Rename the variable to the firmware-generic QCOM_FW_SWIV_PLATFORM so both consumers can share it. Assisted-by: GitHub Copilot CLI:claude-opus-4-8 Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com> (cherry picked from commit 3e28b9b)
Open-firmware boot loads a signed BL2 from the trust-zone partition, but
only fip.elf was signed before, so BL2 was never prepared as a bootable
trust-zone image.
Sign BL2 with qtestsign, with an optional SWIV pre-step for platforms
that require it, reusing the shared QCOM_FW_SWIV_PLATFORM. Both fip.elf
and bl2.mbn land in ${D}${FIRMWARE_DIR}, which meta-arm's firmware.bbclass
already deploys under ${DEPLOY_DIR_IMAGE}/${PN}/, so no extra deploy step
is needed.
Assisted-by: GitHub Copilot CLI:claude-opus-4-8
Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
(cherry picked from commit 4f20c23)
Open-firmware machines boot through a signed BL2 that loads the FIP payload, which qcomflash never installed. Add QCOM_TFA_FIP_FLASH to install fip.elf as uefi.elf and bl2.mbn into the tz slot, reading both from the TF-A recipe deploy directory named by QCOM_TFA_RECIPE. The same variable drives the do_image_qcomflash deploy dependency, so machines only set QCOM_TFA_FIP_FLASH and QCOM_TFA_RECIPE. Fail when the trust-zone image is missing, since FIP boot cannot work without it, and leave the u-boot and SPL-FIT paths unchanged when disabled. Assisted-by: GitHub Copilot CLI:claude-opus-4-8 Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com> (cherry picked from commit 5b71dca)
rb3gen2-core-kit-open-fw boots the open TF-A BL2 plus FIP payload. Enable QCOM_TFA_FIP_FLASH and point QCOM_TFA_RECIPE at its TF-A recipe so do_image_qcomflash orders after the TF-A deploy and flashes the signed BL2 and FIP. Assisted-by: GitHub Copilot CLI:claude-opus-4-8 Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com> (cherry picked from commit c891e8e)
test_machine_dtb_entries_exist_for_kernel_providers only scans arch/*/boot/dts for .dts/.dtso sources, so it misses composite DTBs like qcs6490-rb3gen2-el2.dtb that the kernel assembles from a "<name>-dtbs :=" rule instead. Parse those Makefile rules too and add each resulting DTB to the set of available outputs. Assisted-by: GitHub Copilot CLI:claude-opus-4-8 Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com> (cherry picked from commit e956da5)
The open firmware UKI runs at EL2, so it must carry the merged qcs6490-rb3gen2-el2.dtb that ukify embeds whole instead of applying the .dtbo overlays itself. That DTB only exists in linux-qcom kernels, so build it through LINUX_QCOM_KERNEL_DEVICETREE to keep linux-yocto builds working, and embed it into the ESP image. The machine already defaults to a linux-qcom kernel through qcom-base.inc. Assisted-by: GitHub Copilot CLI:claude-opus-4-8 Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com> (cherry picked from commit d278c4f)
iq-9075-evk-open-fw boots the open TF-A BL2 plus FIP payload. Enable QCOM_TFA_FIP_FLASH and point QCOM_TFA_RECIPE at its TF-A recipe so do_image_qcomflash orders after the TF-A deploy and flashes the signed BL2 and FIP. The SPL variant inherits this config but flashes the U-Boot SPL instead, so keep QCOM_TFA_FIP_FLASH disabled there and note why. Assisted-by: GitHub Copilot CLI:claude-opus-4-8 Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com> (cherry picked from commit 6f19785)
The open firmware UKI runs at EL2, so it must carry the merged lemans-evk-el2.dtb that ukify embeds whole instead of applying the .dtbo overlays itself. That DTB is upstream, so build it through the regular KERNEL_DEVICETREE and embed it into the ESP image. Assisted-by: GitHub Copilot CLI:claude-opus-4-8 Signed-off-by: Sumit Garg <sumit.garg@oss.qualcomm.com> (cherry picked from commit cc60528)
Ricardo Salveti (ricardosalveti)
approved these changes
Oct 4, 2026
Test Results 119 files + 51 715 suites +396 8h 19m 46s ⏱️ + 2h 57m 14s For more details on these failures, see this check. Results for commit c9fd506. ± Comparison against base commit 8e5a1e0. ♻️ This comment has been updated with latest results. |
Dmitry Baryshkov (lumag)
approved these changes
Oct 4, 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 #3258 to
wrynose.