recipes-security: Add OP-TEE recipes override for RB3Gen2

b49020 · b49020 · commit af7865440f1f · 2025-10-30T10:56:46.000+05:30
Add OP-TEE recipes override for RB3Gen2 leveraging the base recipes from
meta-arm. Also, enable TF-A build to consume OP-TEE OS as the BL32 image.

Signed-off-by: Sumit Garg &lt;sumit.garg@oss.qualcomm.com&gt;
diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a-qcm6490.inc b/recipes-bsp/trusted-firmware-a/trusted-firmware-a-qcm6490.inc
@@ -1,5 +1,9 @@
 # RB3Gen2 specific TFA support
 
+DEPENDS += "optee-os"
+
 COMPATIBLE_MACHINE = "qcm6490"
 TFA_PLATFORM = "rb3gen2"
 TFA_BUILD_TARGET = "bl2 fip"
+TFA_SPD = "opteed"
+EXTRA_OEMAKE:append = " BL32=${RECIPE_SYSROOT}/${nonarch_base_libdir}/firmware/tee-raw.bin"
diff --git a/recipes-security/optee/optee-os-qcm6490.inc b/recipes-security/optee/optee-os-qcm6490.inc
@@ -0,0 +1,4 @@
+# RB3Gen2 specific OP-TEE support
+
+COMPATIBLE_MACHINE = "qcm6490"
+OPTEEMACHINE = "qcom-kodiak"
diff --git a/recipes-security/optee/optee-os-qcom.inc b/recipes-security/optee/optee-os-qcom.inc
@@ -0,0 +1,3 @@
+SRCBRANCH = "qcom-next"
+SRC_URI = "git://github.com/qualcomm-linux/optee_os.git;protocol=https;name=optee;branch=${SRCBRANCH}"
+SRCREV_optee = "a427f12bc60e74ccdd2ae771b50ed237397a0782"
diff --git a/recipes-security/optee/optee-os-tadevkit_%.bbappend b/recipes-security/optee/optee-os-tadevkit_%.bbappend
@@ -0,0 +1,4 @@
+MACHINE_OPTEE_OS_TADEVKIT_REQUIRE ?= ""
+MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:qcm6490 = "optee-os-qcm6490.inc"
+
+require optee-os-qcom.inc ${MACHINE_OPTEE_OS_TADEVKIT_REQUIRE}
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend
@@ -0,0 +1,4 @@
+MACHINE_OPTEE_OS_REQUIRE ?= ""
+MACHINE_OPTEE_OS_REQUIRE:qcm6490 = "optee-os-qcm6490.inc"
+
+require optee-os-qcom.inc ${MACHINE_OPTEE_OS_REQUIRE}
diff --git a/recipes-security/optee/optee-test-qcm6490.inc b/recipes-security/optee/optee-test-qcm6490.inc
@@ -0,0 +1,3 @@
+# qcm6490 specific configuration
+
+COMPATIBLE_MACHINE = "qcm6490"
diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend
@@ -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}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+SRCBRANCH = "qcom-next"`
	`2`	`+SRC_URI = "git://github.com/qualcomm-linux/optee_os.git;protocol=https;name=optee;branch=${SRCBRANCH}"`
	`3`	`+SRCREV_optee = "a427f12bc60e74ccdd2ae771b50ed237397a0782"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# qcm6490 specific configuration`
	`2`	`+`
	`3`	`+COMPATIBLE_MACHINE = "qcm6490"`