From patchwork Fri May 13 14:12:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 8021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2F9DC433FE for ; Fri, 13 May 2022 14:12:41 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.8640.1652451154576585576 for ; Fri, 13 May 2022 07:12:35 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 02F05143D; Fri, 13 May 2022 07:12:34 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7DA0C3F5A1; Fri, 13 May 2022 07:12:33 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 1/5] arm-bsp/optee-os: set PV correctly for the corstone1000 build Date: Fri, 13 May 2022 15:12:27 +0100 Message-Id: <20220513141231.2513449-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 May 2022 14:12:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3394 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 --- 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" From patchwork Fri May 13 14:12:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 8018 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00061C433EF for ; Fri, 13 May 2022 14:12:41 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.8833.1652451155096835309 for ; Fri, 13 May 2022 07:12:35 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A2F6E1477; Fri, 13 May 2022 07:12:34 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2B0FC3F5A1; Fri, 13 May 2022 07:12:34 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 2/5] arm-bsp/optee-test: clean up bbappends Date: Fri, 13 May 2022 15:12:28 +0100 Message-Id: <20220513141231.2513449-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220513141231.2513449-1-ross.burton@arm.com> References: <20220513141231.2513449-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 May 2022 14:12:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3395 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 --- .../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} From patchwork Fri May 13 14:12:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 8017 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE368C433F5 for ; Fri, 13 May 2022 14:12:41 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.8791.1652451155669297774 for ; Fri, 13 May 2022 07:12:36 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 507831515; Fri, 13 May 2022 07:12:35 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id CC6F03F5A1; Fri, 13 May 2022 07:12:34 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 3/5] arm-bsp/optee-os: remove 3.16 bbappend Date: Fri, 13 May 2022 15:12:29 +0100 Message-Id: <20220513141231.2513449-3-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220513141231.2513449-1-ross.burton@arm.com> References: <20220513141231.2513449-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 May 2022 14:12:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3396 Corstone-1000 and TotalCompute uses 3.14, so remove the 3.16 bbappend. Signed-off-by: Ross Burton --- .../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} From patchwork Fri May 13 14:12:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 8020 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BDE7C4332F for ; Fri, 13 May 2022 14:12:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.8834.1652451156266918080 for ; Fri, 13 May 2022 07:12:36 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F1C0A143D; Fri, 13 May 2022 07:12:35 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 79CFD3F5A1; Fri, 13 May 2022 07:12:35 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 4/5] arm-bsp/optee-client: remove bbappends Date: Fri, 13 May 2022 15:12:30 +0100 Message-Id: <20220513141231.2513449-4-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220513141231.2513449-1-ross.burton@arm.com> References: <20220513141231.2513449-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 May 2022 14:12:42 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3397 These bbappends do nothing, so remove them. Signed-off-by: Ross Burton --- 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} From patchwork Fri May 13 14:12:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 8019 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C79FC43217 for ; Fri, 13 May 2022 14:12:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.8791.1652451155669297774 for ; Fri, 13 May 2022 07:12:37 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9EC561477; Fri, 13 May 2022 07:12:36 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 26DAA3F5A1; Fri, 13 May 2022 07:12:36 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 5/5] arm-bsp/optee-os-tadevkit: remove unused bbappend Date: Fri, 13 May 2022 15:12:31 +0100 Message-Id: <20220513141231.2513449-5-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220513141231.2513449-1-ross.burton@arm.com> References: <20220513141231.2513449-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 13 May 2022 14:12:42 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3398 TC uses 3.14, so remove the unused 3.16 bbappend. Signed-off-by: Ross Burton --- .../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}