optee: migration 3.21.0 to 4.2.0

[ldts]

Rebase (WIP) for CI wide testing.

Validated on imx8mm + SE05x

This is an interim PR - we are using wip branches in gitlinaro OP-TEE tree

[ldts]

needs rework once foundriesio/optee_os#2 and foundriesio/optee_os#1 are merged

[ldts]

updated in preparation for Foundries.io github OP-TEE branches

[angolini]

I assume the DEFAULT_PREFERENCE = "-1" is because it's a WIP PR. If it's not. I would like to know the reason behind it

[ldts]

I'm not sure what DEFAULT_PREFERENCE refers to—could you provide more details?

@angolini Just some background for reference:

We've been working to merge the functionality from this PR (OP-TEE 3.21 to OP-TEE 4.20) since November—first into for-scarthgap-next, and now into master. However, due to stability concerns - raised by you and jose, it was decided to defer the merge (see FFTK-3591).

I labeled this PR as WIP because we support multiple platforms with various configurations, making exhaustive unit testing impractical. I have validated it on imx8mm-lpddr4 with SE05x (OID 0xa564 and 0xA921) and ran xtests (including pkcs#11 and prior security flow updates), but that's not sufficient to consider the feature complete.

At this stage, we need to merge the PR, run CI across all boards and configurations, and address any issues that arise—hopefully, none.

[quaresmajose]

I'm not sure what DEFAULT_PREFERENCE refers to—could you provide more details?

This DEFAULT_PREFERENCE is a variable we use when there are more than one version available to choose from.
In this case we drop the DEFAULT_PREFERENCE = "-1" as with the merge we will drop the old optee version 3.xx and only keep the 4.xx

[angolini]

in case of dropping the old version, we can remove the DEFAULT_PREFERENCE = -1 from the new version. This way, in the test we are going to use the new version as well

[quaresmajose]

validate boot to console on the scarthgap factory

commit 62bbe15a0a39ed46a3d0574d8fb7e806c2f88635 (HEAD -> optee, fork/optee)
Author: Jose Quaresma <jose.quaresma@foundries.io>
Date:   Wed Feb 5 11:34:42 2025 +0000

    fixup! optee: migration 3.21.0 to 4.2.0
    
    Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>

diff --git a/meta-lmp-base/recipes-security/optee/optee-os-fio_4.2.0.bb b/meta-lmp-base/recipes-security/optee/optee-os-fio_4.2.0.bb
index dde704cfc..b026692e1 100644
--- a/meta-lmp-base/recipes-security/optee/optee-os-fio_4.2.0.bb
+++ b/meta-lmp-base/recipes-security/optee/optee-os-fio_4.2.0.bb
@@ -1,4 +1,4 @@
 require optee-os-fio.inc
 
-SRCREV = "1cd564f415281f0ea33c7a4eeb03347f0a535a26"
+SRCREV = "093d2db199e1c4f2d563e1ded5b9a9c3ca75ce85"
 SRCBRANCH = "4.2.0+fio"
diff --git a/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_4.2.0-imx.bb b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_4.2.0-imx.bb
index a640807ab..8c2adc6cc 100644
--- a/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_4.2.0-imx.bb
+++ b/meta-lmp-bsp/recipes-security/optee/optee-os-fio-mfgtool_4.2.0-imx.bb
@@ -1,6 +1 @@
-require recipes-security/optee/optee-os-fio.inc
-
-SRCREV = "5891192fbbc290cab0567744dec5be784b72b311"
-SRCBRANCH = "4.2.0+fio-imx"
-
-DEFAULT_PREFERENCE = "-1"
+require recipes-security/optee/optee-os-fio_${PV}.bb
diff --git a/meta-lmp-bsp/recipes-security/optee/optee-os-fio_4.2.0-imx.bb b/meta-lmp-bsp/recipes-security/optee/optee-os-fio_4.2.0-imx.bb
index a640807ab..e27f79c33 100644
--- a/meta-lmp-bsp/recipes-security/optee/optee-os-fio_4.2.0-imx.bb
+++ b/meta-lmp-bsp/recipes-security/optee/optee-os-fio_4.2.0-imx.bb
@@ -1,6 +1,9 @@
 require recipes-security/optee/optee-os-fio.inc
 
-SRCREV = "5891192fbbc290cab0567744dec5be784b72b311"
+SRCREV = "af115bd85d6e2c204a15c165639e237a00f1b000"
 SRCBRANCH = "4.2.0+fio-imx"
 
 DEFAULT_PREFERENCE = "-1"
+
+# WIP
+OPTEE_OS_REPO = "git://github.com/ldts/optee_os.git"

the optee-os-fio-mfgtool_4.2.0-imx.bb only differs from the optee-os-fio_4.2.0.bb in the recipe name so I change the first to just include the second.