From patchwork Thu Nov 2 18:20:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 33476 X-Patchwork-Delegate: reatmon@ti.com 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 583F6C4167D for ; Thu, 2 Nov 2023 18:20:50 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web11.39387.1698949248655901820 for ; Thu, 02 Nov 2023 11:20:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=qaMBpDHX; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: reatmon@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3A2IKlMo011337; Thu, 2 Nov 2023 13:20:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1698949247; bh=EUFzPlqBDqyVKYvgA1OGTgi503GCn+IUuI+rxjIIbbQ=; h=From:To:Subject:Date; b=qaMBpDHXmItnEGZw8LQvtcX9jwJYIMcY1G80wIO5E2BSxUatgwZi9sxMFGSidqpQ1 MXsStlfl+FwpEBDKTm40tT0SMdCXcNmc9uA4DE3OTX1LWKdcMevYoG3j+AIu2NILkj 7d0OV6nnhEhLdSEZiPY69YVcspjBmfBEk4CLY8R8= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3A2IKlsI065449 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 2 Nov 2023 13:20:47 -0500 Received: from DLEE111.ent.ti.com (157.170.170.22) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 2 Nov 2023 13:20:47 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE111.ent.ti.com (157.170.170.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 2 Nov 2023 13:20:47 -0500 Received: from uda0214219 (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 3A2IKlOH010869; Thu, 2 Nov 2023 13:20:47 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1qycJD-0006bA-0e; Thu, 02 Nov 2023 13:20:47 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][master][RFC] optee: Rework include files Date: Thu, 2 Nov 2023 13:20:46 -0500 Message-ID: <20231102182046.25324-1-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Thu, 02 Nov 2023 18:20:50 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/17225 Minor rework of the TI include files used to override both SRCREV and other settings in the optee recipes for TI SOC parts. The intent is to make it more clear when we are changing SRCREVs versus changing other items, and allow for sharing the SRCREV changes for optee-os-tadevkit which should track the optee-os SRCREV. Signed-off-by: Ryan Eatmon --- ...optee-client-ti.inc => optee-client-ti-srcrev.inc} | 0 .../recipes-security/optee/optee-client_%.bbappend | 6 +++--- ...e-examples-ti.inc => optee-examples-ti-srcrev.inc} | 0 .../recipes-security/optee/optee-examples_%.bbappend | 6 +++--- .../optee/optee-os-tadevkit-ti-overrides.inc | 1 + .../optee/optee-os-tadevkit_%.bbappend | 11 ++++++++--- .../{optee-os-ti.inc => optee-os-ti-overrides.inc} | 8 -------- ...ptee-os-tadevkit-ti.inc => optee-os-ti-srcrev.inc} | 2 -- .../recipes-security/optee/optee-os_%.bbappend | 11 ++++++++--- .../{optee-test-ti.inc => optee-test-ti-srcrev.inc} | 0 .../recipes-security/optee/optee-test_%.bbappend | 6 +++--- 11 files changed, 26 insertions(+), 25 deletions(-) rename meta-ti-bsp/recipes-security/optee/{optee-client-ti.inc => optee-client-ti-srcrev.inc} (100%) rename meta-ti-bsp/recipes-security/optee/{optee-examples-ti.inc => optee-examples-ti-srcrev.inc} (100%) create mode 100644 meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc rename meta-ti-bsp/recipes-security/optee/{optee-os-ti.inc => optee-os-ti-overrides.inc} (86%) rename meta-ti-bsp/recipes-security/optee/{optee-os-tadevkit-ti.inc => optee-os-ti-srcrev.inc} (87%) rename meta-ti-bsp/recipes-security/optee/{optee-test-ti.inc => optee-test-ti-srcrev.inc} (100%) diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-srcrev.inc similarity index 100% rename from meta-ti-bsp/recipes-security/optee/optee-client-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-client-ti-srcrev.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend index 08c5256b..71b85720 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend @@ -1,4 +1,4 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_SRCREV = "" +OPTEE_TI_SRCREV:ti-soc = "${BPN}-ti-srcrev.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_SRCREV} diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-srcrev.inc similarity index 100% rename from meta-ti-bsp/recipes-security/optee/optee-examples-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-examples-ti-srcrev.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend index 08c5256b..71b85720 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend @@ -1,4 +1,4 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_SRCREV = "" +OPTEE_TI_SRCREV:ti-soc = "${BPN}-ti-srcrev.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_SRCREV} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc new file mode 100644 index 00000000..df46e243 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti-overrides.inc @@ -0,0 +1 @@ +EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend index 08c5256b..9f265932 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -1,4 +1,9 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_SRCREV = "" +OPTEE_TI_SRCREV:ti-soc = "optee-os-ti-srcrev.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_SRCREV} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc similarity index 86% rename from meta-ti-bsp/recipes-security/optee/optee-os-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc index 6d192bbe..de13d282 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc @@ -1,11 +1,3 @@ -PV = "4.0.0+git${SRCPV}" -SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6" - -# Fixes for pointing to 4.0.0 before upstream meta-arm -FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:" -SRC_URI:remove = "file://0002-core-Define-section-attributes-for-clang.patch" -SRC_URI:append = " file://0002ti-core-Define-section-attributes-for-clang.patch" - # Use TI SECDEV for signing inherit ti-secdev diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-srcrev.inc similarity index 87% rename from meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-os-ti-srcrev.inc index 55453366..06472e34 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit-ti.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-srcrev.inc @@ -5,5 +5,3 @@ SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6" FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:" SRC_URI:remove = "file://0002-core-Define-section-attributes-for-clang.patch" SRC_URI:append = " file://0002ti-core-Define-section-attributes-for-clang.patch" - -EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index 08c5256b..eb29392b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -1,4 +1,9 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_SRCREV = "" +OPTEE_TI_SRCREV:ti-soc = "${BPN}-ti-srcrev.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_SRCREV} + +OPTEE_TI_OVERRIDES = "" +OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" + +require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-srcrev.inc similarity index 100% rename from meta-ti-bsp/recipes-security/optee/optee-test-ti.inc rename to meta-ti-bsp/recipes-security/optee/optee-test-ti-srcrev.inc diff --git a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend index 08c5256b..71b85720 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend @@ -1,4 +1,4 @@ -OPTEE_TI = "" -OPTEE_TI:ti-soc = "${BPN}-ti.inc" +OPTEE_TI_SRCREV = "" +OPTEE_TI_SRCREV:ti-soc = "${BPN}-ti-srcrev.inc" -require ${OPTEE_TI} +require ${OPTEE_TI_SRCREV}