From 0e7c1bb30e62f91c75a50d21f8053bee4321d14d Mon Sep 17 00:00:00 2001 From: Vishnu Banavath Date: Wed, 26 Oct 2022 09:44:22 +0100 Subject: [PATCH] arm-bsp:optee: enable optee test for N1SDP target These changes are to build and install optee test for N1SDP Signed-off-by: Vishnu Banavath Signed-off-by: Jon Mason --- meta-arm-bsp/recipes-security/optee/optee-os-generic-n1sdp.inc | 2 ++ meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc | 3 +-- .../recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend | 1 + meta-arm-bsp/recipes-security/optee/optee-test_3.18.0.bbappend | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-generic-n1sdp.inc diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-generic-n1sdp.inc b/meta-arm-bsp/recipes-security/optee/optee-os-generic-n1sdp.inc new file mode 100644 index 00000000..c090834c --- /dev/null +++ b/meta-arm-bsp/recipes-security/optee/optee-os-generic-n1sdp.inc @@ -0,0 +1,2 @@ +COMPATIBLE_MACHINE:n1sdp = "n1sdp" +OPTEEMACHINE:n1sdp = "n1sdp" diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc b/meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc index 5e6e1507..2719e4c0 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc +++ b/meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc @@ -1,7 +1,6 @@ # N1 SDP specific configuration for optee-os -COMPATIBLE_MACHINE:n1sdp = "n1sdp" -OPTEEMACHINE:n1sdp = "n1sdp" +require optee-os-generic-n1sdp.inc TS_INSTALL_PREFIX_PATH = "${RECIPE_SYSROOT}/firmware/sp/opteesp" diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend index 6a22d47e..9a210832 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend +++ b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.18.0.bbappend @@ -2,5 +2,6 @@ MACHINE_OPTEE_OS_TADEVKIT_REQUIRE ?= "" MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:tc = "optee-os-generic-tc.inc" +MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:n1sdp = "optee-os-n1sdp.inc" require ${MACHINE_OPTEE_OS_TADEVKIT_REQUIRE} diff --git a/meta-arm-bsp/recipes-security/optee/optee-test_3.18.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-test_3.18.0.bbappend index 490b3500..9318a07e 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-test_3.18.0.bbappend +++ b/meta-arm-bsp/recipes-security/optee/optee-test_3.18.0.bbappend @@ -2,5 +2,6 @@ MACHINE_OPTEE_TEST_REQUIRE ?= "" MACHINE_OPTEE_TEST_REQUIRE:tc = "optee-test-tc.inc" +MACHINE_OPTEE_TEST_REQUIRE:n1sdp = "optee-os-generic-n1sdp.inc" require ${MACHINE_OPTEE_TEST_REQUIRE}