Skip to content

Commit bb15a51

Browse files
committed
readme: Update for latest trusted-firmware-m upmerge
Fixup SHAs, for trusted-firmware-m and tf-m-tests repositories. Removed non-relevant tag information. Remove information about mbed-crypto. Signed-off-by: Ioannis Glaropoulos <[email protected]>
1 parent ff42698 commit bb15a51

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

README.rst

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,16 @@ for ARMv8-M. The TF-M itself is provided under a BSD-3-Clause.
1010
It currently does not implement all the features of that architecture,
1111
however we expect the code to evolve along with the specifications.
1212

13-
This module in Zephyr has include TF-M and it's dependencies, they are:
13+
This module in Zephyr has included TF-M and it's dependencies, they are:
1414

1515
TF-M:
1616
repo: https://git.trustedfirmware.org/trusted-firmware-m.git
17-
tag: TF-Mv1.1
18-
commit: a6b336c1509fd5f5522450e3cec0fcd6c060f9c8
17+
commit: 8bebd05745a8b27dccc6403f0215fa6e39de3bc1
1918
BSD-3-Clause
2019

2120
TF-M Tests:
2221
repo: https://git.trustedfirmware.org/TF-M/tf-m-tests.git
23-
tag: TF-Mv1.1
24-
commit: 5a571808e7841f15cc966661a64dd6adb3b40f6c
22+
commit: 652bb8a1502c95bfd1ee8e44ccd1126ce74ae41f
2523
license: Apache 2.0
2624

2725
mcuboot:
@@ -30,12 +28,6 @@ mcuboot:
3028
commit: 50d24a57516f558dac72bef634723b60c5cfb46b
3129
license: Apache 2.0
3230

33-
mbed-crypto:
34-
repo: https://github.com/ARMmbed/mbed-crypto.git
35-
tag: 3.0.1
36-
commit: 1146b4e06011b69a6437e6b728f2af043a06ec19
37-
license: Apache 2.0
38-
3931
psa-arch-tests:
4032
repo: https://github.com/ARM-software/psa-arch-tests
4133
tag: v20.03_API1.0

init-git.sh

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#!/bin/sh
22

3-
TFM_GIT_SHA=TF-Mv1.1
4-
TFM_TESTS_GIT_SHA=TF-Mv1.1
3+
TFM_GIT_SHA=8bebd05745a8b27dccc6403f0215fa6e39de3bc1
4+
TFM_TESTS_GIT_SHA=652bb8a1502c95bfd1ee8e44ccd1126ce74ae41f
55
MCUBOOT_GIT_SHA=v1.6.0
6-
MBED_CRYPTO_GIT_SHA=mbedcrypto-3.0.1
76
PSA_ARCH_TESTS_GIT_SHA=v20.03_API1.0
87

98
if [ ! -d trusted-firmware-m/.git ]; then
@@ -14,14 +13,6 @@ if [ ! -d trusted-firmware-m/.git ]; then
1413
cd ..
1514
fi
1615

17-
if [ ! -d mbed-crypto/.git ]; then
18-
git clone https://github.com/ARMmbed/mbed-crypto.git -b ${MBED_CRYPTO_GIT_SHA} --bare mbed-crypto/.git
19-
cd mbed-crypto
20-
git init
21-
git checkout -f
22-
cd ..
23-
fi
24-
2516
if [ ! -d mcuboot/.git ]; then
2617
git clone https://github.com/JuulLabs-OSS/mcuboot.git -b v1.4.0 -b ${MCUBOOT_GIT_SHA} --bare mcuboot/.git
2718
cd mcuboot

0 commit comments

Comments
 (0)