n1sdp:arm-bsp/optee: Update optee to v4.0

This change updates the optee version to v4.0

Signed-off-by: Harsimran Singh Tungal <harsimransingh.tungal@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-arm-bsp/conf/machine/n1sdp.conf

@@ -37,7 +37,7 @@ EXTRA_IMAGEDEPENDS += "edk2-firmware"
 PREFERRED_VERSION_edk2-firmware ?= "202305"
 
 #optee
-PREFERRED_VERSION_optee-os ?= "3.22.%"
+PREFERRED_VERSION_optee-os ?= "4.0.%"
 
 #grub-efi
 EFI_PROVIDER ?= "grub-efi"

meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0001-core-arm-add-MPIDR-affinity-shift-and-mask-for-32-bi.patch

@@ -1,29 +0,0 @@
-Upstream-Status: Pending [Not submitted to upstream yet]
-Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
-
-From cf84c933bb7b8a95742d1e723950cb2cde2d5320 Mon Sep 17 00:00:00 2001
-From: Vishnu Banavath <vishnu.banavath@arm.com>
-Date: Wed, 20 Jul 2022 16:37:10 +0100
-Subject: [PATCH] core: arm: add MPIDR affinity shift and mask for 32-bit
-
-This change is to add MPIDR affinity shift and mask for
-32-bit
-
-Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
-
-diff --git a/core/arch/arm/include/arm.h b/core/arch/arm/include/arm.h
-index f59478af..2f6f82e7 100644
---- a/core/arch/arm/include/arm.h
-+++ b/core/arch/arm/include/arm.h
-@@ -63,6 +63,8 @@
- #define MPIDR_AFF1_MASK		(MPIDR_AFFLVL_MASK << MPIDR_AFF1_SHIFT)
- #define MPIDR_AFF2_SHIFT	U(16)
- #define MPIDR_AFF2_MASK		(MPIDR_AFFLVL_MASK << MPIDR_AFF2_SHIFT)
-+#define MPIDR_AFF3_SHIFT	U(32)
-+#define MPIDR_AFF3_MASK		(MPIDR_AFFLVL_MASK << MPIDR_AFF3_SHIFT)
- 
- #define MPIDR_MT_SHIFT		U(24)
- #define MPIDR_MT_MASK		BIT(MPIDR_MT_SHIFT)
--- 
-2.17.1
-

meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc

@@ -6,11 +6,10 @@ TS_INSTALL_PREFIX_PATH = "${RECIPE_SYSROOT}/firmware/sp/opteesp"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/n1sdp:"
 SRC_URI:append = " \
-    file://0001-core-arm-add-MPIDR-affinity-shift-and-mask-for-32-bi.patch \
-    file://0002-plat-n1sdp-add-N1SDP-platform-support.patch \
-    file://0003-Handle-logging-syscall.patch \
-    file://0004-plat-n1sdp-register-DRAM1-to-optee-os.patch \
-    file://0005-plat-n1sdp-add-external-device-tree-base-and-size.patch \
+    file://0001-plat-n1sdp-add-N1SDP-platform-support.patch \
+    file://0002-Handle-logging-syscall.patch \
+    file://0003-plat-n1sdp-register-DRAM1-to-optee-os.patch \
+    file://0004-plat-n1sdp-add-external-device-tree-base-and-size.patch \
     "
 
 EXTRA_OEMAKE += " CFG_TEE_CORE_LOG_LEVEL=4"

meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.0.0.bbappend

@@ -0,0 +1,6 @@
+# Machine specific configurations
+
+MACHINE_OPTEE_OS_TADEVKIT_REQUIRE ?= ""
+MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:n1sdp = "optee-os-n1sdp.inc"
+
+require ${MACHINE_OPTEE_OS_TADEVKIT_REQUIRE}

meta-arm-bsp/recipes-security/optee/optee-os_4.0.0.bbappend

@@ -2,5 +2,6 @@
 # Machine specific configurations
 MACHINE_OPTEE_OS_REQUIRE ?= ""
 MACHINE_OPTEE_OS_REQUIRE:corstone1000 = "optee-os-corstone1000-common.inc"
+MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc"
 
 require ${MACHINE_OPTEE_OS_REQUIRE}

meta-arm-bsp/recipes-security/optee/optee-test_4.0.0.bbappend

@@ -0,0 +1,6 @@
+# Machine specific configurations
+
+MACHINE_OPTEE_TEST_REQUIRE ?= ""
+MACHINE_OPTEE_TEST_REQUIRE:n1sdp = "optee-os-generic-n1sdp.inc"
+
+require ${MACHINE_OPTEE_TEST_REQUIRE}