michaelh/zephyr
1
0
Fork 0
Code Releases Activity

manifest: Point to tip of master after snapshot

Browse source 
PR https://github.com/zephyrproject-rtos/mcuboot/pull/8 was mistakenly
merged instead of pushed, which made the last 4 commits of zephyr's
mcuboot divergen in SHA with respect to the upstream ones.
In order to preserve the status of the zephyr mcuboot repo as an
exact mirror of the upstream one, a snapshot has been taken to preserve
the current SHA (0f4463caec3c3a8fac1350d0d6dfbee678a8ce06) and then the
master branch has been reset to the upstream equivalent
(7e7b4ad1999bf148f88059195f8d2e1d3dccf190). This commit switches the
pointer to the latter, but the mcuboot code itself is identical.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2020-03-31 12:26:52 +02:00 • committed by Carles Cufí
commit 4fd014ca26
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
west.yml
View file

@ -83,7 +83,7 @@ manifest:
revision: cf7020eb4c7ef93319f2d6d2403a21e12a879bf6 revision: cf7020eb4c7ef93319f2d6d2403a21e12a879bf6
path: modules/crypto/mbedtls path: modules/crypto/mbedtls
- name: mcuboot - name: mcuboot
revision: 0f4463caec3c3a8fac1350d0d6dfbee678a8ce06 revision: 7e7b4ad1999bf148f88059195f8d2e1d3dccf190
path: bootloader/mcuboot path: bootloader/mcuboot
- name: mcumgr - name: mcumgr
revision: dcf32c7f340a10e6e6482feb311cb4fa71953fd3 revision: dcf32c7f340a10e6e6482feb311cb4fa71953fd3