[isar-cip-core][PATCH 2/4] optee-ftpm: Factor out common recipe bits of qemu-arm64 and ti-k3 targets

From: Jan Kiszka <[email protected]>

As long as both are in sync, it's easier to maintain this way.

Signed-off-by: Jan Kiszka <[email protected]>
---
 ...-ftpm-qemu-arm64_4.10+v1.62r1-48-ge9fc7b8.bb | 17 +----------------
 ...optee-ftpm-ti-k3_4.10+v1.62r1-48-ge9fc7b8.bb | 17 +----------------
 ... => optee-ftpm_4.10+v1.62r1-48-ge9fc7b8.inc} |  5 -----
 3 files changed, 2 insertions(+), 37 deletions(-)
 copy recipes-bsp/optee-ftpm/{optee-ftpm-qemu-arm64_4.10+v1.62r1-48-ge9fc7b8.bb => optee-ftpm_4.10+v1.62r1-48-ge9fc7b8.inc} (88%)

diff --git a/recipes-bsp/optee-ftpm/optee-ftpm-qemu-arm64_4.10+v1.62r1-48-ge9fc7b8.bb b/recipes-bsp/optee-ftpm/optee-ftpm-qemu-arm64_4.10+v1.62r1-48-ge9fc7b8.bb
index 7c6b2b1d..da832475 100644
--- a/recipes-bsp/optee-ftpm/optee-ftpm-qemu-arm64_4.10+v1.62r1-48-ge9fc7b8.bb
+++ b/recipes-bsp/optee-ftpm/optee-ftpm-qemu-arm64_4.10+v1.62r1-48-ge9fc7b8.bb
@@ -9,22 +9,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-inherit optee-ftpm
-
-MAINTAINER = "cip-dev <[email protected]>"
-
-SRC_URI += " \
-    https://github.com/OP-TEE/optee_ftpm/archive/${SRCREV}.tar.gz;downloadfilename=optee_ftpm-${SRCREV}.tar.gz \
-    https://github.com/microsoft/ms-tpm-20-ref/archive/${SRCREV_ms-tpm}.tar.gz;name=ms-tpm;downloadfilename=ms-tpm-20-ref-${SRCREV_ms-tpm}.tar.gz \
-    "
-SRCREV = "a09269b15de635e1816fe832e26adfbfb44c5455"
-SRCREV_ms-tpm = "e9fc7b89d865536c46deb63f9c7d0121a3ded49c"
-
-SRC_URI[sha256sum] = "1ad448048fa8e507459fb24cc1e7e1a42099303a272c8804f8d62894090d047b"
-SRC_URI[ms-tpm.sha256sum] = "b77d092c0dde362adf6bc88a580ca7c8abe124d69bb734bf28f8904ae30494a4"
-
-S = "${WORKDIR}/optee_ftpm-${SRCREV}"
-MS_TPM_20_REF_DIR = "ms-tpm-20-ref-${SRCREV_ms-tpm}"
+require optee-ftpm_${PV}.inc
 
 OPTEE_NAME = "qemu-arm64"
 
diff --git a/recipes-bsp/optee-ftpm/optee-ftpm-ti-k3_4.10+v1.62r1-48-ge9fc7b8.bb b/recipes-bsp/optee-ftpm/optee-ftpm-ti-k3_4.10+v1.62r1-48-ge9fc7b8.bb
index b43d6b44..7e7921a0 100644
--- a/recipes-bsp/optee-ftpm/optee-ftpm-ti-k3_4.10+v1.62r1-48-ge9fc7b8.bb
+++ b/recipes-bsp/optee-ftpm/optee-ftpm-ti-k3_4.10+v1.62r1-48-ge9fc7b8.bb
@@ -7,22 +7,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-inherit optee-ftpm
-
-MAINTAINER = "cip-dev <[email protected]>"
-
-SRC_URI += " \
-    https://github.com/OP-TEE/optee_ftpm/archive/${SRCREV}.tar.gz;downloadfilename=optee_ftpm-${SRCREV}.tar.gz \
-    https://github.com/microsoft/ms-tpm-20-ref/archive/${SRCREV_ms-tpm}.tar.gz;name=ms-tpm;downloadfilename=ms-tpm-20-ref-${SRCREV_ms-tpm}.tar.gz \
-    "
-SRCREV = "a09269b15de635e1816fe832e26adfbfb44c5455"
-SRCREV_ms-tpm = "e9fc7b89d865536c46deb63f9c7d0121a3ded49c"
-
-SRC_URI[sha256sum] = "1ad448048fa8e507459fb24cc1e7e1a42099303a272c8804f8d62894090d047b"
-SRC_URI[ms-tpm.sha256sum] = "b77d092c0dde362adf6bc88a580ca7c8abe124d69bb734bf28f8904ae30494a4"
-
-S = "${WORKDIR}/optee_ftpm-${SRCREV}"
-MS_TPM_20_REF_DIR = "ms-tpm-20-ref-${SRCREV_ms-tpm}"
+require recipes-bsp/optee-ftpm/optee-ftpm_${PV}.inc
 
 OPTEE_NAME = "ti-k3"
 
diff --git a/recipes-bsp/optee-ftpm/optee-ftpm-qemu-arm64_4.10+v1.62r1-48-ge9fc7b8.bb b/recipes-bsp/optee-ftpm/optee-ftpm_4.10+v1.62r1-48-ge9fc7b8.inc
similarity index 88%
copy from recipes-bsp/optee-ftpm/optee-ftpm-qemu-arm64_4.10+v1.62r1-48-ge9fc7b8.bb
copy to recipes-bsp/optee-ftpm/optee-ftpm_4.10+v1.62r1-48-ge9fc7b8.inc
index 7c6b2b1d..232508f6 100644
--- a/recipes-bsp/optee-ftpm/optee-ftpm-qemu-arm64_4.10+v1.62r1-48-ge9fc7b8.bb
+++ b/recipes-bsp/optee-ftpm/optee-ftpm_4.10+v1.62r1-48-ge9fc7b8.inc
@@ -25,8 +25,3 @@ SRC_URI[ms-tpm.sha256sum] = "b77d092c0dde362adf6bc88a580ca7c8abe124d69bb734bf28f
 
 S = "${WORKDIR}/optee_ftpm-${SRCREV}"
 MS_TPM_20_REF_DIR = "ms-tpm-20-ref-${SRCREV_ms-tpm}"
-
-OPTEE_NAME = "qemu-arm64"
-
-TA_CPU = "cortex-a53"
-TA_DEV_KIT_DIR = "/usr/lib/optee-os/${OPTEE_NAME}/export-ta_arm64"
-- 
2.47.3