From 3f9a466c99ca5ddc9f6f9da44652ec12b6c9be95 Mon Sep 17 00:00:00 2001 From: Vishnu Banavath Date: Thu, 17 Feb 2022 15:53:45 +0000 Subject: [PATCH] arm-bsp/security: replace mbedcrypto with mbedtls This commit replaces mbedcrpyto with mbedtls on the trusted-service recipe. Signed-off-by: Vishnu Banavath Signed-off-by: Jon Mason --- .../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"