From patchwork Fri Sep 12 09:03:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suhaas Joshi X-Patchwork-Id: 70060 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 5C138CA101F for ; Fri, 12 Sep 2025 09:07:24 +0000 (UTC) Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) by mx.groups.io with SMTP id smtpd.web10.12060.1757668040037632167 for ; Fri, 12 Sep 2025 02:07:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=mOjt0iiv; spf=pass (domain: ti.com, ip: 198.47.19.246, mailfrom: s-joshi@ti.com) Received: from fllvem-sh03.itg.ti.com ([10.64.41.86]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTP id 58C97JuF940387 for ; Fri, 12 Sep 2025 04:07:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1757668039; bh=4lO4gTQtbpVfnhdyqhyV3mBwVxOVBCn47rgHiZfZRRg=; h=From:To:CC:Subject:Date; b=mOjt0iivtnmbt1QujpZ7B+jOAFMDBUrwijUDFohPKiJ62QnhIQxcPaGcG9KeKSfgA tX98J98OodiTuCvCHmFMRwHdtPJyCcctsip4WV0DJ39xe7EI+DRofv3vorrhbhvS0R X/ZdLs1CBC4inOrF8gRVR0piBOn/jNczf4wo6TTA= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by fllvem-sh03.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 58C97JEt1873369 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL) for ; Fri, 12 Sep 2025 04:07:19 -0500 Received: from DLEE215.ent.ti.com (157.170.170.118) 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.55; Fri, 12 Sep 2025 04:07:18 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DLEE215.ent.ti.com (157.170.170.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Fri, 12 Sep 2025 04:07:18 -0500 Received: from localhost (ula0507357.dhcp.ti.com [172.24.233.173]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 58C97HGV3668377; Fri, 12 Sep 2025 04:07:18 -0500 From: Suhaas Joshi To: CC: , Subject: [meta-ti][master][PATCH v2] optee: Update to 4.7.0 tag Date: Fri, 12 Sep 2025 14:33:40 +0530 Message-ID: <20250912090340.506817-1-s-joshi@ti.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea 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, 12 Sep 2025 09:07:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18997 Update optee_client, optee_examples, optee_os and optee_test to the newer 4.7.0 tag from the previous 4.6.0 one. Further: meta-arm applies 0003-optee-enable-clang-support patch to optee_os. However, in a recent upstream commit [0], the line to which the patch applies was removed. Therefore the patch is no longer required. As a result, tell optee_os.bbappend file to remove it. [0] https://github.com/OP-TEE/optee_os/commit/3d5c2dd8b59ae888434b3f86842828131f115d90 Signed-off-by: Suhaas Joshi --- changes since v1: - Make commit header shorter, removing redundant text. - Specify target branch in subject prefix. - Separately send the patch for master and scarthgap. This is for master. - Link to v1: https://lore.kernel.org/yocto-meta-ti/b470b481-adbf-41da-b22e-cc04fa616bc8@ti.com/T/#t --- .../recipes-security/optee/optee-client-ti-version.inc | 4 ++-- .../recipes-security/optee/optee-examples-ti-version.inc | 4 ++-- meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc | 4 ++-- .../recipes-security/optee/optee-os-tadevkit_%.bbappend | 4 ++++ meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc | 4 ++-- meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 4 ++++ meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc | 5 +++-- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc index dd00cde1..ec10cefe 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc @@ -1,5 +1,5 @@ -PV = "4.6.0+git" -SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75" +PV = "4.7.0+git" +SRCREV = "23c112a6f05cc5e39bd4aaf52ad515cad532237d" SRC_URI:remove = " \ file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \ diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc index 6c120be2..91dd5e60 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc @@ -1,2 +1,2 @@ -PV = "4.6.0+git" -SRCREV = "5306d2c7c618bb4a91df17a2d5d79ae4701af4a3" +PV = "4.7.0+git" +SRCREV = "14321a0607db16099d158478b21a2b2e37b3a935" diff --git a/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc index 119795c4..55ca0e34 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-ftpm-ti-version.inc @@ -1,2 +1,2 @@ -PV = "4.6.0+git" -SRCREV_optee-ta = "6f99e783eb9bb57c314a881433d4ec970de87959" +PV = "4.7.0+git" +SRCREV_optee-ta = "ce33372ab772e879826361a1ca91126260bd9be1" 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 980f7a4b..407436a9 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -6,4 +6,8 @@ require ${OPTEE_TI_VERSION} OPTEE_TI_OVERRIDES = "" OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" +SRC_URI:remove = " \ + file://0003-optee-enable-clang-support.patch \ +" + require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc index a9a1d1e8..a1133d31 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc @@ -1,5 +1,5 @@ -PV = "4.6.0+git" -SRCREV = "71785645fa6ce42db40dbf5a54e0eaedc4f61591" +PV = "4.7.0+git" +SRCREV = "86846f4fdf14f25b50fd64a87888ca9fe85a9e2b" SRC_URI:remove = " \ file://0001-mk-compile.mk-remove-absolute-build-time-paths.patch \ diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index 0cee127f..50f87199 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -6,4 +6,8 @@ require ${OPTEE_TI_VERSION} OPTEE_TI_OVERRIDES = "" OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc" +SRC_URI:remove = " \ + file://0003-optee-enable-clang-support.patch \ +" + require ${OPTEE_TI_OVERRIDES} diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc index dec59d88..4a4a2f92 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc @@ -1,5 +1,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:" -PV = "4.6.0+git" -SRCREV = "a9e9495f4d57b97022008ad11198195e7e044c5d" +PV = "4.7.0+git" +SRCREV = "a15be9eca1b7e935917d834284726027dffc8cfb" + SRC_URI += "file://0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch"