[Backport Wrynose] Backport OP-TEE and TF-A changes to wrynose - #3033
Merged
Dmitry Baryshkov (lumag) merged 10 commits intoSep 13, 2026
Merged
Dmitry Baryshkov (lumag) merged 10 commits into
Dmitry Baryshkov (lumag) merged 10 commits into
Conversation
Ricardo Salveti (ricardosalveti)
previously approved these changes
Aug 28, 2026
Dmitry Baryshkov (lumag)
force-pushed
the
backport/3005-to-wrynose
branch
from
August 29, 2026 10:20
d6edb39 to
6eb326d
Compare
Contributor
Need the distro / license update as well. |
coreboot/qc_blobs carries only the sc7280 qtiseclib that qcm6490 links into BL31, yet every machine building this recipe fetches the whole repository. Append the qc_blobs entry to SRC_URI for qcm6490 only, so machines that do not consume the blob do not fetch it. Suggested-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com> Signed-off-by: Royyan Zahir <royzah@gmail.com> (cherry picked from commit af9c2a8) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
The underscore is the separator in SRCREV_FORMAT, so an SCM named qc_blobs cannot be referenced as a format component and its revision is left out of the format, and with it out of the task hash. Rename the SCM to qc-blobs and accumulate per-machine components in SRCREV_FORMAT_qcom, so the blob revision takes part in the task hash on the machines that fetch it. Suggested-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com> Signed-off-by: Royyan Zahir <royzah@gmail.com> (cherry picked from commit d0132ec) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
…-2.15-20260804 The 2.14 tags predate the lemans platform drivers, so BL31 built from them is not functional on qcs9100, and the lemans qtiseclib blob is superseded work in progress. The native drivers landed with qcom-next-2.15-20260804. Upgrade all machines to that tag; lemans builds native, no qtiseclib. Signed-off-by: Royyan Zahir <royzah@gmail.com> (cherry picked from commit 8047e1e) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
The existing TFA_BUILD_TARGET only built bl2 and fip, which is sufficient for a standard UEFI-based boot flow. However, to support the U-Boot SPL + FIT image based secure boot flow, bl31 must be built as an explicit binary artifact. U-Boot SPL loads a FIT image that bundles bl31 (TF-A), OP-TEE (bl32), and U-Boot proper (bl33) as separate loadable images. For SPL to load and jump to bl31 directly, the bl31.bin binary must be available as a standalone artifact at deploy time. It cannot be extracted from the fip alone in this flow. Adding bl31 to TFA_BUILD_TARGET ensures bl31.bin is produced and available for packaging into the SPL FIT image. Signed-off-by: Kavinaya S <kavinaya@qti.qualcomm.com> (cherry picked from commit 74606d6) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
One recipe gated on MACHINE builds a single TF-A platform, so the platform, the FIP address and the qtiseclib blob all had to be keyed on the machine. Give each device its own recipe holding those, and keep the shared source and build rules in the include. The blob follows its recipe, so a platform without qtiseclib no longer claims its licence. FIP_ELF_ADDR has no sensible default, so refuse a device recipe that leaves it unset. Signed-off-by: Royyan Zahir <royzah@gmail.com> (cherry picked from commit eddb7e7) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
optee-os-qcom picks its OP-TEE platform from MACHINE, so a build can only ever hold one, while the TF-A recipes are now per device. Give each OP-TEE platform its own recipe and point each TF-A recipe at the one it needs. The devkit and optee-test stay machine-scoped; a rootfs targets a single machine. Signed-off-by: Royyan Zahir <royzah@gmail.com> (cherry picked from commit c7a5770) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
…hine Now that both are per platform, nothing ties them to qcm6490 or qcs9100. Widen them so a machine like qcom-armv8a can build kodiak and lemans firmware side by side. Signed-off-by: Royyan Zahir <royzah@gmail.com> (cherry picked from commit a5c633a) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
In some cases (`build world` or just a build targeting generic machines) it might be required to deploy several OP-TEE recipes simultaneously. The optee-os.inc from meta-arm deploys all recipes to the "optee" subdir, causing conflicts between optee-os-qcom-lemans and optee-os-qcom-kodiak. Override the do_deploy() functions locally, letting individual recipes specify separate deployment directories. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> (cherry picked from commit 1127e71)
Now as the optee-os-qcom provides support for recipe-specific deployment dirs, deploy Kodiak OP-TEE to the "optee-kodiak" directory. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> (cherry picked from commit 0cacb51)
Now as the optee-os-qcom provides support for recipe-specific deployment dirs, deploy Lemans OP-TEE to the "optee-lemans" directory. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> (cherry picked from commit ba7c9cf)
Dmitry Baryshkov (lumag)
force-pushed
the
backport/3005-to-wrynose
branch
from
September 10, 2026 14:06
6eb326d to
d4da613
Compare
Test Results 119 files + 89 715 suites +685 7h 16m 56s ⏱️ + 4h 6m 10s For more details on these failures, see this check. Results for commit d4da613. ± Comparison against base commit 4cdb8b0. ♻️ This comment has been updated with latest results. |
Ricardo Salveti (ricardosalveti)
approved these changes
Sep 11, 2026
Viswanath Kraleti (vkraleti)
approved these changes
Sep 12, 2026
Contributor
Author
|
Known issues. |
Dmitry Baryshkov (lumag)
merged commit Sep 13, 2026
5e980b9
into
qualcomm-linux:wrynose
241 of 242 checks passed
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.
Backport #2707, #2862, #2910 and #3005 to wrynose.