[PATCH 1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build

[PATCH 1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build

[Ross Burton]

The corstone1000 build of optee-os has a bbappend which uses a specific
non-upstream branch of optee-os which is actually based on 3.10, so set
PV appropriately in the recipe and update the PREFERRED_VERSION in
corstone1000.inc.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm-bsp/conf/machine/include/corstone1000.inc            | 4 ++--
 .../recipes-security/optee/optee-os_corstone1000_common.inc   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc
index 380ed30f..2f665d02 100644
--- a/meta-arm-bsp/conf/machine/include/corstone1000.inc
+++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc
@@ -34,8 +34,8 @@ UBOOT_ARCH = "arm"
 UBOOT_EXTLINUX = "0"
 
 # optee
-PREFERRED_VERSION_optee-os ?= "3.14%"
-PREFERRED_VERSION_optee-client ?= "3.14%"
+PREFERRED_VERSION_optee-os ?= "3.10.%"
+PREFERRED_VERSION_optee-client ?= "3.14.%"
 EXTRA_IMAGEDEPENDS += "optee-os"
 OPTEE_ARCH = "arm64"
 OPTEE_BINARY = "tee-pager_v2.bin"
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc b/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc
index e17467fe..9f372413 100644
--- a/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc
+++ b/meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc
@@ -1,6 +1,6 @@
 SRC_URI = "git://git.trustedfirmware.org/OP-TEE/optee_os.git;protocol=https;branch=psa-development"
 SRCREV = "f9de2c9520ed97b89760cc4c99424aae440b63f4"
-PV .= "+git${SRCPV}"
+PV = "3.10.0+git${SRCPV}"
 
 DEPENDS += "python3-pycryptodomex-native dtc-native"
 
-- 
2.25.1

[PATCH 2/5] arm-bsp/optee-test: clean up bbappends

[Ross Burton]

The 3.14 bbappend sets DEPENDS which are redundant as they're already
set in the base recipe.

Remove the unused 3.16 bbappend.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-security/optee/optee-test_3.14.0.bbappend       | 2 --
 .../recipes-security/optee/optee-test_3.16.0.bbappend       | 6 ------
 2 files changed, 8 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend

diff --git a/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend
index f8194d0e..490b3500 100644
--- a/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend
+++ b/meta-arm-bsp/recipes-security/optee/optee-test_3.14.0.bbappend
@@ -1,7 +1,5 @@
 # Machine specific configurations
 
-DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native"
-
 MACHINE_OPTEE_TEST_REQUIRE ?= ""
 MACHINE_OPTEE_TEST_REQUIRE:tc = "optee-test-tc.inc"
 
diff --git a/meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend
deleted file mode 100644
index 490b3500..00000000
--- a/meta-arm-bsp/recipes-security/optee/optee-test_3.16.0.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# Machine specific configurations
-
-MACHINE_OPTEE_TEST_REQUIRE ?= ""
-MACHINE_OPTEE_TEST_REQUIRE:tc = "optee-test-tc.inc"
-
-require ${MACHINE_OPTEE_TEST_REQUIRE}
-- 
2.25.1

[PATCH 3/5] arm-bsp/optee-os: remove 3.16 bbappend

[Ross Burton]

Corstone-1000 and TotalCompute uses 3.14, so remove the 3.16 bbappend.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-security/optee/optee-os_3.16.0.bbappend        | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend

diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend
deleted file mode 100644
index 7834b64b..00000000
--- a/meta-arm-bsp/recipes-security/optee/optee-os_3.16.0.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-# Machine specific configurations
-
-MACHINE_OPTEE_OS_REQUIRE ?= ""
-MACHINE_OPTEE_OS_REQUIRE:corstone1000 = "optee-os_corstone1000.inc"
-MACHINE_OPTEE_OS_REQUIRE:tc = "optee-os-tc.inc"
-
-require ${MACHINE_OPTEE_OS_REQUIRE}
-- 
2.25.1

[PATCH 4/5] arm-bsp/optee-client: remove bbappends

[Ross Burton]

These bbappends do nothing, so remove them.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm-bsp/recipes-security/optee/optee-client-tc.inc     | 3 ---
 .../recipes-security/optee/optee-client_3.14.0.bbappend     | 6 ------
 .../recipes-security/optee/optee-client_3.16.0.bbappend     | 6 ------
 3 files changed, 15 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-client-tc.inc
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend

diff --git a/meta-arm-bsp/recipes-security/optee/optee-client-tc.inc b/meta-arm-bsp/recipes-security/optee/optee-client-tc.inc
deleted file mode 100644
index f3fb7cd0..00000000
--- a/meta-arm-bsp/recipes-security/optee/optee-client-tc.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# TC specific configuration
-
-# Change in SHA, extra patches specific to TC0 are added in this file.
diff --git a/meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend
deleted file mode 100644
index d2b023b1..00000000
--- a/meta-arm-bsp/recipes-security/optee/optee-client_3.14.0.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# Machine specific configurations
-
-MACHINE_OPTEE_CLIENT_REQUIRE ?= ""
-MACHINE_OPTEE_CLIENT_REQUIRE:tc = "optee-client-tc.inc"
-
-require ${MACHINE_OPTEE_CLIENT_REQUIRE}
diff --git a/meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend
deleted file mode 100644
index d2b023b1..00000000
--- a/meta-arm-bsp/recipes-security/optee/optee-client_3.16.0.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# Machine specific configurations
-
-MACHINE_OPTEE_CLIENT_REQUIRE ?= ""
-MACHINE_OPTEE_CLIENT_REQUIRE:tc = "optee-client-tc.inc"
-
-require ${MACHINE_OPTEE_CLIENT_REQUIRE}
-- 
2.25.1

[PATCH 5/5] arm-bsp/optee-os-tadevkit: remove unused bbappend

[Ross Burton]

TC uses 3.14, so remove the unused 3.16 bbappend.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../optee/optee-os-tadevkit_3.16.0.bbappend                 | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend

diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend
deleted file mode 100644
index 6a22d47e..00000000
--- a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.16.0.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# Machine specific configurations
-
-MACHINE_OPTEE_OS_TADEVKIT_REQUIRE ?= ""
-MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:tc = "optee-os-generic-tc.inc"
-
-require ${MACHINE_OPTEE_OS_TADEVKIT_REQUIRE}
-- 
2.25.1

Re: [PATCH 1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build

[Jon Mason]

On Fri, 13 May 2022 15:12:27 +0100, Ross Burton wrote:
> The corstone1000 build of optee-os has a bbappend which uses a specific
> non-upstream branch of optee-os which is actually based on 3.10, so set
> PV appropriately in the recipe and update the PREFERRED_VERSION in
> corstone1000.inc.

Applied, thanks!

[1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build
      commit: 4b94d77f693a0d21d01eb287d5a9757ecb5122b0
[2/5] arm-bsp/optee-test: clean up bbappends
      commit: 6286e0d54cdc6edf9e1d03019fd9e0440f0d546f
[3/5] arm-bsp/optee-os: remove 3.16 bbappend
      commit: 7e09d10e23f4bd92ab0d559e8c84b32ee949fa22
[4/5] arm-bsp/optee-client: remove bbappends
      commit: 155a2f9ed4ff26d95ca0228d8d069062ac5bb4e4
[5/5] arm-bsp/optee-os-tadevkit: remove unused bbappend
      commit: 79a20dc1d76fbd983365c29063eca64872b8ab1d

Best regards,
-- 
Jon Mason <jon.mason@arm.com>

Re: [PATCH 1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build

[Jon Mason]

On Fri, 13 May 2022 15:12:27 +0100, Ross Burton wrote:
> The corstone1000 build of optee-os has a bbappend which uses a specific
> non-upstream branch of optee-os which is actually based on 3.10, so set
> PV appropriately in the recipe and update the PREFERRED_VERSION in
> corstone1000.inc.

Applied, thanks!

[1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build
      commit: 4b94d77f693a0d21d01eb287d5a9757ecb5122b0
[2/5] arm-bsp/optee-test: clean up bbappends
      commit: 6286e0d54cdc6edf9e1d03019fd9e0440f0d546f
[3/5] arm-bsp/optee-os: remove 3.16 bbappend
      commit: 7e09d10e23f4bd92ab0d559e8c84b32ee949fa22
[4/5] arm-bsp/optee-client: remove bbappends
      commit: 155a2f9ed4ff26d95ca0228d8d069062ac5bb4e4
[5/5] arm-bsp/optee-os-tadevkit: remove unused bbappend
      commit: 79a20dc1d76fbd983365c29063eca64872b8ab1d

Best regards,
-- 
Jon Mason <jon.mason@arm.com>

Re: [PATCH 1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build

[Jon Mason]

On Fri, 13 May 2022 15:12:27 +0100, Ross Burton wrote:
> The corstone1000 build of optee-os has a bbappend which uses a specific
> non-upstream branch of optee-os which is actually based on 3.10, so set
> PV appropriately in the recipe and update the PREFERRED_VERSION in
> corstone1000.inc.

Applied, thanks!

[1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build
      commit: 4b94d77f693a0d21d01eb287d5a9757ecb5122b0
[2/5] arm-bsp/optee-test: clean up bbappends
      commit: 6286e0d54cdc6edf9e1d03019fd9e0440f0d546f
[3/5] arm-bsp/optee-os: remove 3.16 bbappend
      commit: 7e09d10e23f4bd92ab0d559e8c84b32ee949fa22
[4/5] arm-bsp/optee-client: remove bbappends
      commit: 155a2f9ed4ff26d95ca0228d8d069062ac5bb4e4
[5/5] arm-bsp/optee-os-tadevkit: remove unused bbappend
      commit: 79a20dc1d76fbd983365c29063eca64872b8ab1d

Best regards,
-- 
Jon Mason <jon.mason@arm.com>