Skip to content

trusted-firmware-a-qcom, optee-os-qcom: split into per-platform recipes - #2910

Merged
Ricardo Salveti (ricardosalveti) merged 3 commits into
qualcomm-linux:masterfrom
royzah:tii/tfa-platform-key
Aug 20, 2026
Merged

trusted-firmware-a-qcom, optee-os-qcom: split into per-platform recipes#2910
Ricardo Salveti (ricardosalveti) merged 3 commits into
qualcomm-linux:masterfrom
royzah:tii/tfa-platform-key

Conversation

@royzah

@royzah Royyan Zahir (royzah) commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

qcom-armv8a cannot build kodiak and lemans firmware together: TF-A is gated on MACHINE and builds one platform, and optee-os-qcom picks its platform the same way.

Split both per platform, each TF-A recipe depending on its own OP-TEE, then widen the machine gate once nothing is tied to a single machine. Machines opt in through EXTRA_IMAGEDEPENDS as before.

Renames recipes, so layers with a trusted-firmware-a-qcom or optee-os-qcom bbappend or DEPENDS need updating.

Still machine-scoped on a multi-platform build: BL33 (u-boot.bin) and the shared optee/ deploy dir.

Grew out of #2707.

@royzah
Royyan Zahir (royzah) force-pushed the tii/tfa-platform-key branch 3 times, most recently from cc11d14 to c1ccd65 Compare August 10, 2026 10:13
@royzah Royyan Zahir (royzah) changed the title trusted-firmware-a-qcom: key qtiseclib on TFA_PLATFORM, not MACHINE trusted-firmware-a-qcom: split into per-device recipes Aug 10, 2026
@royzah
Royyan Zahir (royzah) force-pushed the tii/tfa-platform-key branch 3 times, most recently from 578d9ca to 7f81cbd Compare August 10, 2026 12:10
@royzah Royyan Zahir (royzah) changed the title trusted-firmware-a-qcom: split into per-device recipes trusted-firmware-a-qcom, optee-os-qcom: split into per-platform recipes Aug 10, 2026
@royzah

Copy link
Copy Markdown
Contributor Author

Added the OP-TEE split so the (qcom) claim actually holds: each TF-A recipe now depends on its own optee-os-qcom-kodiak / -lemans. Devkit and optee-test stay machine-scoped.

@lumag Dmitry Baryshkov (lumag) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you might want to split/squash the commits.

@royzah

Royyan Zahir (royzah) commented Aug 10, 2026

Copy link
Copy Markdown
Contributor Author

Restructured and rebased on master.

  1. trusted-firmware-a-qcom: split into per-device recipes
  2. optee-os-qcom: split into per-platform recipes
  3. build on any aarch64 qcom machine

@royzah

Copy link
Copy Markdown
Contributor Author

CI on the previous head caught one real failure: rb3gen2-core-kit-open-fw fails the image licence gate, because meta-qcom-distro keys its INCOMPATIBLE_LICENSE_EXCEPTIONS on the old recipe name.

Fix is one line there: qualcomm-linux/meta-qcom-distro#422. Needs to merge before this can go green (CI tracks that repo at main, no pin).

Rest of that run was clean: iq-9075-evk-open-fw passed end to end, and rb3gen2 built TF-A with qtiseclib plus both OP-TEE platform recipes before hitting the licence check.

Dmitry Baryshkov (@lumag) Ricardo Salveti (@ricardosalveti) Sumit Garg (@b49020) Jose Quaresma (@quaresmajose) heads up, the rename touches that list.

@royzah

Copy link
Copy Markdown
Contributor Author

Rebased on master, picks up the LicenseRef- rename from #2802. Commits restructured as you suggested and the OP-TEE split is in. Dmitry Baryshkov (@lumag) PTAL when you get a chance.

@lumag

Copy link
Copy Markdown
Contributor

"This branch has conflicts that must be resolved"

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>
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>
…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>
@royzah

Copy link
Copy Markdown
Contributor Author

Rebased on master, conflicts resolved (picked up the OP-TEE 20260721 bump). Dmitry Baryshkov (@lumag) PTAL

Ricardo Salveti (ricardosalveti) added a commit to qualcomm-linux/meta-qcom-distro that referenced this pull request Aug 18, 2026
#422)

qualcomm-linux/meta-qcom#2910 splits `trusted-firmware-a-qcom` per
device, so the recipe carrying the qtiseclib blob becomes
`trusted-firmware-a-qcom-rb3gen2` and stops matching the exception. The
image licence gate then fails on rb3gen2-core-kit-open-fw.

Add the new name; the old one stays until the split lands.

Needed before meta-qcom#2910 can go green. CI there tracks this repo at
`main` with no pin, so merging is enough.
@royzah

Copy link
Copy Markdown
Contributor Author

Thanks Dmitry Baryshkov (@lumag)! Build is green (67/67) and the licence gate passes now that meta-qcom-distro#422 landed. Only red is the workflow security scan, which fails on other PRs too. Good to merge?

@github-actions

github-actions Bot commented Aug 19, 2026

Copy link
Copy Markdown

Test run workflow

Test jobs for commit a5c633a

qcom-distro
Pass: 306 | Fail: 0 | Total: 342
nodistro
Pass: 10 | Fail: 0 | Total: 10
qcom-distro_linux-qcom-6.18
Pass: 236 | Fail: 0 | Total: 259

@test-reporting-app

test-reporting-app Bot commented Aug 19, 2026

Copy link
Copy Markdown

Test Results

  117 files    698 suites   7h 40m 11s ⏱️
  159 tests   159 ✅  0 💤 0 ❌
4 499 runs  4 440 ✅ 59 💤 0 ❌

Results for commit a5c633a.

♻️ This comment has been updated with latest results.

@qcomlnxci

Copy link
Copy Markdown

Test Coral run workflow

Test jobs for commit a5c633a

  • qcomdistro: multimedia image-prop
    Pass: 44 | Fail: 0 | Total: 44
  • qcomdistro: multimedia image
    Pass: 9 | Fail: 0 | Total: 9

@lumag

Copy link
Copy Markdown
Contributor

Royyan Zahir (@royzah) it requires a second review.

@ricardosalveti
Ricardo Salveti (ricardosalveti) merged commit 086b40a into qualcomm-linux:master Aug 20, 2026
540 of 543 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants