Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
SRC_URI += "https://github.com/coreboot/qc_blobs/raw/refs/heads/master/sc7280/qtiseclib/libqtisec.a;name=qtiseclib"
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the licence for the blob? Does it change the licence of the generated binary?

Copy link
Member Author

Choose a reason for hiding this comment

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

The license for this blob can be found here: https://github.com/coreboot/qc_blobs/blob/master/sc7280/qtiseclib/LICENSE.

Does it change the licence of the generated binary?

AFAIK, it doesn't change the overall TF-A project license but rather it is required for the binary components to be compliant with the TF-A license terms, see here: https://trustedfirmware-a.readthedocs.io/en/latest/process/contributing.html#binary-components

Copy link
Contributor

Choose a reason for hiding this comment

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

Still the licence should be included in SBOM, etc., so it should be properly annotated.
Also we have to comply to the licensing terms. E.g.:

(iii) redistribution of the Redistributable Binary Code must include the .txt file setting forth the terms and condition of this Agreement;

SRC_URI[qtiseclib.sha256sum] = "6860dda0701c8709530608cc0e5a61b76484ae16cb673ba9a23510cf4b3d57bf"

DEPENDS += "optee-os"

COMPATIBLE_MACHINE = "qcm6490"
TFA_PLATFORM = "rb3gen2"
TFA_BUILD_TARGET = "bl2 fip"
TFA_SPD = "opteed"
EXTRA_OEMAKE:append = " \
QTISECLIB_PATH=${UNPACKDIR}/libqtisec.a \
BL32=${RECIPE_SYSROOT}/${nonarch_base_libdir}/firmware/tee-raw.bin \
Copy link
Contributor

Choose a reason for hiding this comment

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

If you change the order of the commits, you won't have to change the file that you have just added.

Copy link
Member Author

Choose a reason for hiding this comment

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

This commit adds OP-TEE support to the TF-A recipe added by previous commit. So, I am not sure what do you meant by reordering commits here.

Copy link
Contributor

Choose a reason for hiding this comment

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

  • Add OP-TEE as a recipe
  • Add TF-A, which uses OP-TEE among other dependencies

"
6 changes: 6 additions & 0 deletions recipes-security/optee/optee-os-qcm6490.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# RB3Gen2 specific OP-TEE support

require optee-os-qcom.inc

COMPATIBLE_MACHINE = "qcm6490"
OPTEEMACHINE = "qcom-kodiak"
3 changes: 3 additions & 0 deletions recipes-security/optee/optee-os-qcom.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SRCBRANCH = "qcom-next"
Copy link
Contributor

Choose a reason for hiding this comment

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

inline

SRC_URI = "git://github.com/qualcomm-linux/optee_os.git;protocol=https;name=optee;branch=${SRCBRANCH}"
SRCREV_optee = "a427f12bc60e74ccdd2ae771b50ed237397a0782"
Copy link
Contributor

Choose a reason for hiding this comment

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

The same question. We rewrite SRC_URI and SRCREV here. It breaks user assumptions.

4 changes: 4 additions & 0 deletions recipes-security/optee/optee-os-tadevkit_%.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
MACHINE_OPTEE_OS_TADEVKIT_REQUIRE ?= ""
MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:qcm6490 = "optee-os-qcm6490.inc"

require ${MACHINE_OPTEE_OS_TADEVKIT_REQUIRE}
4 changes: 4 additions & 0 deletions recipes-security/optee/optee-os_%.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
MACHINE_OPTEE_OS_REQUIRE ?= ""
MACHINE_OPTEE_OS_REQUIRE:qcm6490 = "optee-os-qcm6490.inc"

require ${MACHINE_OPTEE_OS_REQUIRE}
3 changes: 3 additions & 0 deletions recipes-security/optee/optee-test-qcm6490.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# qcm6490 specific configuration

COMPATIBLE_MACHINE = "qcm6490"
6 changes: 6 additions & 0 deletions recipes-security/optee/optee-test_%.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Machine specific configurations

MACHINE_OPTEE_TEST_REQUIRE ?= ""
MACHINE_OPTEE_TEST_REQUIRE:qcm6490 = "optee-test-qcm6490.inc"

require ${MACHINE_OPTEE_TEST_REQUIRE}
9 changes: 9 additions & 0 deletions recipes-security/packagegroups/packagegroup-optee.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
SUMMARY = "Packages for the OP-TEE support"

inherit packagegroup

RRECOMMENDS:${PN} = " \
${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-client', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-test', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os-ta', '', d)} \
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we need three lines here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Okay, I will convert them in a single line.

"