Skip to content

mcuboot: Commit v1.7.0-rc1 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 10, 2020
Merged

mcuboot: Commit v1.7.0-rc1 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0eaa935
mcuboot: Remove so it can be fetched with west instead
oyvindronningstad Nov 19, 2020
5eaf95c
west.yml: Add initial west.yml with mcuboot v1.7.0-rc1
oyvindronningstad Dec 9, 2020
88c51f6
CMakeLists.txt: Use MCUBOOT_PATH downloaded via west
oyvindronningstad Nov 16, 2020
a247c0e
tfm: Clean up mcuboot references
oyvindronningstad Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ function(trusted_firmware_build)
${TFM_REGRESSION_ARG}
${TFM_PROFILE_ARG}
-DTFM_TEST_REPO_PATH=${ZEPHYR_TFM_MODULE_DIR}/tf-m-tests
-DMCUBOOT_PATH=${ZEPHYR_TFM_MODULE_DIR}/../tfm-mcuboot
-DTFM_TOOLCHAIN_PATH=${TFM_TOOLCHAIN_PATH}
-DTFM_TOOLCHAIN_PREFIX=${TFM_TOOLCHAIN_PREFIX}
BUILD_ALWAYS True
Expand Down
8 changes: 2 additions & 6 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,10 @@ TF-M Tests:
commit: ccda809801e529250b47c9ac470cf94daef1bb1b
license: Apache 2.0

mcuboot:
repo: https://github.com/JuulLabs-OSS/mcuboot.git
tag: v1.6.0
commit: 50d24a57516f558dac72bef634723b60c5cfb46b
license: Apache 2.0

psa-arch-tests:
repo: https://github.com/ARM-software/psa-arch-tests
tag: v20.03_API1.0
commit: 3d986e72d9e084bb45763849699718f474fb10ba
license: Apache 2.0

See also west.yml for more dependencies.
Copy link
Member

@ioannisg ioannisg Dec 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if you could add a more detailed comment here, to explain what happens with MCUboot, but it is not a must-do for this PR.

9 changes: 0 additions & 9 deletions init-git.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

TFM_GIT_SHA=TF-Mv1.2.0
TFM_TESTS_GIT_SHA=TF-Mv1.2.0
MCUBOOT_GIT_SHA=v1.6.0
PSA_ARCH_TESTS_GIT_SHA=v20.03_API1.0

if [ ! -d trusted-firmware-m/.git ]; then
Expand All @@ -13,14 +12,6 @@ if [ ! -d trusted-firmware-m/.git ]; then
cd ..
fi

if [ ! -d mcuboot/.git ]; then
git clone https://github.com/JuulLabs-OSS/mcuboot.git -b v1.4.0 -b ${MCUBOOT_GIT_SHA} --bare mcuboot/.git
cd mcuboot
git init
git checkout -f
cd ..
fi

if [ ! -d tf-m-tests/.git ]; then
git clone https://git.trustedfirmware.org/TF-M/tf-m-tests.git -b ${TFM_TESTS_GIT_SHA} --bare tf-m-tests/.git
cd tf-m-tests
Expand Down
27 changes: 0 additions & 27 deletions mcuboot/.gitignore
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions mcuboot/.gitmodules
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions mcuboot/.travis.yml
View file
Open in desktop

This file was deleted.

206 changes: 0 additions & 206 deletions mcuboot/LICENSE
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions mcuboot/NOTICE
View file
Open in desktop

This file was deleted.

Loading