mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-07 04:58:57 +00:00
Code Issues Projects Releases Wiki Activity

arm/trusted-firmware-m: upgrade to 1.1

Browse Source 
Change-Id: Id0c37b291b32072ebe61abcd908ed9a2ebf79365
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2020-12-18 17:34:27 +00:00
committed by Jon Mason
parent cff5aafc67
commit 5a44edaa0e
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/recipes-bsp/trusted-firmware-m/files/objcopy.patch
+20
View File
@@ -0,0 +1,20 @@
The BFD target elf32-little has no specified machine, which trips the
architecture sanity test. Use elf32-littlearm to set the machine
correctly.
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
diff --git a/cmake/Common/CompilerGNUARMCommon.cmake b/cmake/Common/CompilerGNUARMCommon.cmake
index 32e805bb..2d3ea8e4 100644
--- a/cmake/Common/CompilerGNUARMCommon.cmake
+++ b/cmake/Common/CompilerGNUARMCommon.cmake
@@ -196,7 +196,7 @@ function(compiler_generate_hex_output TARGET)
endfunction()
function(compiler_generate_elf_output TARGET)
- add_custom_command(TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_GNUARM_OBJCOPY} ARGS -O elf32-little $<TARGET_FILE:${TARGET}> $<TARGET_FILE_DIR:${TARGET}>/${TARGET}.elf)
+ add_custom_command(TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_GNUARM_OBJCOPY} ARGS -O elf32-littlearm $<TARGET_FILE:${TARGET}> $<TARGET_FILE_DIR:${TARGET}>/${TARGET}.elf)
endfunction()
# Function for creating a new target that preprocesses a .c file
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb → meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.1.bb
+19 -19
View File
@@ -10,23 +10,25 @@ PROVIDES = "virtual/trusted-firmware-m"
LICENSE = "BSD-3-Clause & Apachev2" LICENSE = "BSD-3-Clause & Apachev2"
LIC_FILES_CHKSUM ?= "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa" LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \
LIC_FILES_CHKSUM += "file://../mbed-crypto/LICENSE;md5=302d50a6369f5f22efdb674db908167a" file://../tf-m-tests/license.rst;md5=02d06ffb8d9f099ff4961c0cb0183a18 \
LIC_FILES_CHKSUM += "file://../CMSIS_5/LICENSE.txt;md5=c4082b6c254c9fb71136710391d9728b" file://../mbed-crypto/LICENSE;md5=302d50a6369f5f22efdb674db908167a \
file://../mcuboot/LICENSE;md5=b6ee33f1d12a5e6ee3de1e82fb51eeb8"
SRC_URI = "git://git.trustedfirmware.org/trusted-firmware-m.git;protocol=https;branch=master;name=tfm;destsuffix=${S}" SRC_URI = "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https;branch=master;name=tfm;destsuffix=${S} \
SRC_URI += "git://github.com/ARMmbed/mbed-crypto.git;protocol=https;branch=development;name=mbed-crypto;destsuffix=${S}/../mbed-crypto" git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https;branch=master;name=tfm-tests;destsuffix=${S}/../tf-m-tests \
SRC_URI += "https://github.com/ARM-software/CMSIS_5/releases/download/5.5.0/ARM.CMSIS.5.5.0.pack;name=cmsis;subdir=${S}/../CMSIS_5;downloadfilename=ARM.CMSIS.5.5.0.zip" git://github.com/ARMmbed/mbed-crypto.git;protocol=https;branch=development;name=mbed-crypto;destsuffix=${S}/../mbed-crypto \
git://github.com/JuulLabs-OSS/mcuboot.git;protocol=https;name=mcuboot;destsuffix=${S}/../mcuboot \
file://objcopy.patch"
SRC_URI[cmsis.md5sum] = "73b6cf6b4ab06ac099478e6cf983c08e" # TF-Mv1.1
SRC_URI[cmsis.sha256sum] = "fc6e46c77de29ed05ef3bfd4846a2da49b024bc8854c876ac053aaa8d348ac52" SRCREV_tfm = "a6b336c1509fd5f5522450e3cec0fcd6c060f9c8"
SRCREV_FORMAT = "tfm_mbed-crypto_cmsis"
# TF-Mv1.0
SRCREV_tfm = "0768982ea41b5e7d207445f19ee23e5d67d9c89b"
# mbedcrypto-3.0.1 # mbedcrypto-3.0.1
SRCREV_mbed-crypto = "1146b4e06011b69a6437e6b728f2af043a06ec19" SRCREV_mbed-crypto = "1146b4e06011b69a6437e6b728f2af043a06ec19"
SRCREV_cmsis = "5.5.0" # TF-Mv1.1
SRCREV_tfm-tests = "5a571808e7841f15cc966661a64dd6adb3b40f6c"
# v1.6.0
SRCREV_mcuboot = "50d24a57516f558dac72bef634723b60c5cfb46b"
UPSTREAM_CHECK_GITTAGREGEX = "^TF-Mv(?P<pver>\d+(\.\d+)+)$" UPSTREAM_CHECK_GITTAGREGEX = "^TF-Mv(?P<pver>\d+(\.\d+)+)$"
@@ -42,8 +44,10 @@ INHIBIT_DEFAULT_DEPS = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
DEPENDS += "cmake-native" DEPENDS += "cmake-native \
DEPENDS += "python3-cryptography-native python3-pyasn1-native python3-cbor-native" python3-cryptography-native \
python3-pyasn1-native \
python3-cbor-native"
S = "${WORKDIR}/git/tfm" S = "${WORKDIR}/git/tfm"
B = "${WORKDIR}/build" B = "${WORKDIR}/build"
@@ -91,10 +95,6 @@ LDFLAGS[unexport] = "1"
AS[unexport] = "1" AS[unexport] = "1"
LD[unexport] = "1" LD[unexport] = "1"
# This is needed because CMSIS_5 source package originally has .pack extension not .zip
# and bitbake checks this dependency based on file extension
do_unpack[depends] += "unzip-native:do_populate_sysroot"
do_configure[prefuncs] += "do_check_config" do_configure[prefuncs] += "do_check_config"
do_check_config() { do_check_config() {
if [ ! -f "${S}/configs/${TFM_CONFIG}" ]; then if [ ! -f "${S}/configs/${TFM_CONFIG}" ]; then