From patchwork Thu Feb 17 15:53:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emekcan Aras X-Patchwork-Id: 3690 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 1BD70C433FE for ; Thu, 17 Feb 2022 15:53:58 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.1552.1645113236778105216 for ; Thu, 17 Feb 2022 07:53:57 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: emekcan.aras@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 5C7601396; Thu, 17 Feb 2022 07:53:56 -0800 (PST) Received: from e126835.arm.com (unknown [10.57.40.90]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 36E043F718; Thu, 17 Feb 2022 07:53:55 -0800 (PST) From: emekcan.aras@arm.com To: meta-arm@lists.yoctoproject.org, jon.mason@arm.com Cc: nd@arm.com, Vishnu Banavath Subject: [PATCH 1/2] arm-bsp/security: replace mbedcrypto with mbedtls Date: Thu, 17 Feb 2022 15:53:45 +0000 Message-Id: <20220217155346.2566392-2-emekcan.aras@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220217155346.2566392-1-emekcan.aras@arm.com> References: <20220217155346.2566392-1-emekcan.aras@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 ; Thu, 17 Feb 2022 15:53:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3005 From: Vishnu Banavath This commit replaces mbedcrpyto with mbedtls on the trusted-service recipe. Signed-off-by: Vishnu Banavath --- .../trusted-services/ts-corstone1000.inc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc b/meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc index 499dc31a..27315430 100644 --- a/meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc +++ b/meta-arm-bsp/recipes-security/trusted-services/ts-corstone1000.inc @@ -2,15 +2,14 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/secure-partitions:" COMPATIBLE_MACHINE = "corstone1000" -LIC_FILES_CHKSUM += "file://../mbedcrypto/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ - file://../nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f \ - file://../openamp/LICENSE.md;md5=a8d8cf662ef6bf9936a1e1413585ecbf \ - file://../libmetal/LICENSE.md;md5=fe0b8a4beea8f0813b606d15a3df3d3c \ - " - +LIC_FILES_CHKSUM += "file://../mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://../nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f \ + file://../openamp/LICENSE.md;md5=a8d8cf662ef6bf9936a1e1413585ecbf \ + file://../libmetal/LICENSE.md;md5=fe0b8a4beea8f0813b606d15a3df3d3c \ + " SRC_URI:append = " \ - ${SRC_URI_MBED} ${SRC_URI_NANOPB} ${SRC_URI_OPENAMP} ${SRC_URI_LIBMETAL} \ + ${SRC_URI_MBEDTLS} ${SRC_URI_NANOPB} ${SRC_URI_OPENAMP} ${SRC_URI_LIBMETAL} \ file://0001-tools-cmake-common-applying-lowercase-project-convention.patch \ file://0002-fix-EARLY_TA_PATHS-env-variable.patch \ file://0003-se-proxy-dts-add-se-proxy-as-child-node.patch \ @@ -45,8 +44,8 @@ SRC_URI:append = " \ file://0032-smm_gateway-add-checks-for-null-attributes.patch \ " -SRC_URI_MBED = "git://github.com/ARMmbed/mbed-crypto.git;protocol=https;branch=development;name=mbed;destsuffix=git/mbedcrypto" -SRCREV_mbed = "cf4a40ba0a3086cabb5a8227245191161fd26383" +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development;name=mbedtls;destsuffix=git/mbedtls" +SRCREV_mbedtls = "d65aeb37349ad1a50e0f6c9b694d4b5290d60e49" SRC_URI_NANOPB = "git://github.com/nanopb/nanopb.git;name=nanopb;protocol=https;branch=master;destsuffix=git/nanopb" SRCREV_nanopb = "df0e92f474f9cca704fe2b31483f0b4d1b1715a4" From patchwork Thu Feb 17 15:53:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emekcan Aras X-Patchwork-Id: 3691 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 1E456C433F5 for ; Thu, 17 Feb 2022 15:53:59 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.1554.1645113238719515679 for ; Thu, 17 Feb 2022 07:53:58 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: emekcan.aras@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 066E8113E; Thu, 17 Feb 2022 07:53:58 -0800 (PST) Received: from e126835.arm.com (unknown [10.57.40.90]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B99113F718; Thu, 17 Feb 2022 07:53:56 -0800 (PST) From: emekcan.aras@arm.com To: meta-arm@lists.yoctoproject.org, jon.mason@arm.com Cc: nd@arm.com, Vishnu Banavath Subject: [PATCH 2/2] arm-bsp/tf-m: update git SHA Date: Thu, 17 Feb 2022 15:53:46 +0000 Message-Id: <20220217155346.2566392-3-emekcan.aras@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220217155346.2566392-1-emekcan.aras@arm.com> References: <20220217155346.2566392-1-emekcan.aras@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 ; Thu, 17 Feb 2022 15:53:59 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3006 From: Vishnu Banavath This change is to update TF-M git SHA to fix psa-arch-tests test case failures. Signed-off-by: Vishnu Banavath --- .../trusted-firmware-m/trusted-firmware-m-corstone1000.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc index 398d66eb..f387be5a 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc @@ -7,9 +7,10 @@ TFM_DEBUG = "1" ## Default is the MPS3 board TFM_PLATFORM_IS_FVP ?= "FALSE" EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}" +EXTRA_OECMAKE += "-DCC312_LEGACY_DRIVER_API_ENABLED=OFF" SRCBRANCH_tfm = "master" -SRCREV_tfm = "49a28600f9dd640638f667273ef15acb6d1a8e1c" +SRCREV_tfm = "f8c7e5361b92b16108165601ea81c5d01feb3c22" SRCREV_mbedtls = "d65aeb37349ad1a50e0f6c9b694d4b5290d60e49" SRCREV_mcuboot = "29099e1d17f93ae1d09fe945ad191b703aacd3d8"