Commit 25a33819 authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski
Browse files

Synch up to upstream commit 1270880d 

Synchronized with:
https://github.com/mcu-tools/mcuboot/commit/1270880d2f717f9019742f5c450441aaf0504164



- boot_serial: refactoring and optimalization (mainly afects progresive erase implementation)
- migrate includes to <zephyr/...>
- switched DFU detection GPIO-pin configuration to be done through DTS.
  That pin is assigned thanks to `mcuboot-button0` pin-alias.
- boot_serial: Fix echo command code no longer compiling
- Added MCUboot status callback support, see `CONFIG_MCUBOOT_ACTION_HOOKS` Kconfig option.
- reworked LED usage, prefer DTS mcuboot-led0 alias over bootloader-led0 alias
- Added initial support for leverage RAM-LOAD mode with the zephyr-rtos port
- boot_serial: Upgrade from cddl-gen 0.1.0 to zcbor 0.4.0

- imgtool: Added support for providing the signature by 3rd party

Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parents 67cb0242 1270880d

.gitmodules

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ 
[submodule "boot/cypress/libs/cy-mbedtls-acceleration"]

	path = boot/cypress/libs/cy-mbedtls-acceleration

	url = https://github.com/cypresssemiconductorco/cy-mbedtls-acceleration.git

[submodule "ext/cddl-gen"]

	path = ext/cddl-gen

	url = https://github.com/NordicSemiconductor/cddl-gen.git

[submodule "boot/espressif/hal/esp-idf"]

	path = boot/espressif/hal/esp-idf

	url = https://github.com/espressif/esp-idf.git

.mbedignore

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ samples/* 
scripts/*

sim/*

testplan/*

ext/cddl_gen/*

ext/fiat/*

ext/mbedtls/*

ext/mbedtls-asn1/*

Cargo.lock

+101 −142
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ version = 3 


[[package]]

name = "aes"

version = "0.7.4"

version = "0.7.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "495ee669413bfbe9e8cace80f4d3d78e6d8c8d99579f97fb93bde351b185f2d4"

checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"

dependencies = [

 "cfg-if",

 "cipher",

 "cipher 0.3.0",

 "cpufeatures",

 "ctr",

 "opaque-debug",
@@ -48,14 +48,14 @@ dependencies = [ 
 "aes",

 "base64",

 "byteorder",

 "cipher",

 "cipher 0.4.3",

 "docopt",

 "env_logger",

 "libc",

 "log",

 "mcuboot-sys",

 "pem",

 "rand 0.8.4",

 "rand",

 "ring",

 "serde",

 "serde_derive",
@@ -66,9 +66,9 @@ dependencies = [ 


[[package]]

name = "bumpalo"

version = "3.7.0"

version = "3.9.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"

checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"



[[package]]

name = "byteorder"
@@ -78,9 +78,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" 


[[package]]

name = "cc"

version = "1.0.69"

version = "1.0.73"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"

checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"



[[package]]

name = "cfg-if"
@@ -97,22 +97,42 @@ dependencies = [ 
 "generic-array",

]



[[package]]

name = "cipher"

version = "0.4.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"

dependencies = [

 "crypto-common",

 "inout",

]



[[package]]

name = "cpufeatures"

version = "0.1.5"

version = "0.2.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"

checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"

dependencies = [

 "libc",

]



[[package]]

name = "crypto-common"

version = "0.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"

dependencies = [

 "generic-array",

 "typenum",

]



[[package]]

name = "ctr"

version = "0.7.0"

version = "0.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481"

checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"

dependencies = [

 "cipher",

 "cipher 0.3.0",

]



[[package]]
@@ -142,9 +162,9 @@ dependencies = [ 


[[package]]

name = "generic-array"

version = "0.14.4"

version = "0.14.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"

checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"

dependencies = [

 "typenum",

 "version_check",
@@ -152,24 +172,13 @@ dependencies = [ 


[[package]]

name = "getrandom"

version = "0.1.16"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"

dependencies = [

 "cfg-if",

 "libc",

 "wasi 0.9.0+wasi-snapshot-preview1",

]



[[package]]

name = "getrandom"

version = "0.2.3"

version = "0.2.6"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"

checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"

dependencies = [

 "cfg-if",

 "libc",

 "wasi 0.10.2+wasi-snapshot-preview1",

 "wasi",

]



[[package]]
@@ -187,11 +196,20 @@ version = "2.1.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"



[[package]]

name = "inout"

version = "0.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"

dependencies = [

 "generic-array",

]



[[package]]

name = "js-sys"

version = "0.3.53"

version = "0.3.57"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d"

checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"

dependencies = [

 "wasm-bindgen",

]
@@ -204,15 +222,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" 


[[package]]

name = "libc"

version = "0.2.99"

version = "0.2.122"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"

checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259"



[[package]]

name = "log"

version = "0.4.14"

version = "0.4.16"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"

checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"

dependencies = [

 "cfg-if",

]
@@ -235,9 +253,9 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" 


[[package]]

name = "once_cell"

version = "1.8.0"

version = "1.10.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"

checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"



[[package]]

name = "opaque-debug"
@@ -247,72 +265,46 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" 


[[package]]

name = "pem"

version = "0.8.3"

version = "1.0.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"

checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947"

dependencies = [

 "base64",

 "once_cell",

 "regex",

]



[[package]]

name = "ppv-lite86"

version = "0.2.10"

version = "0.2.16"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"

checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"



[[package]]

name = "proc-macro2"

version = "1.0.28"

version = "1.0.37"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"

checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"

dependencies = [

 "unicode-xid",

]



[[package]]

name = "quote"

version = "1.0.9"

version = "1.0.17"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"

checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58"

dependencies = [

 "proc-macro2",

]



[[package]]

name = "rand"

version = "0.7.3"

version = "0.8.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"

checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"

dependencies = [

 "getrandom 0.1.16",

 "libc",

 "rand_chacha 0.2.2",

 "rand_core 0.5.1",

 "rand_hc 0.2.0",

]



[[package]]

name = "rand"

version = "0.8.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"

dependencies = [

 "libc",

 "rand_chacha 0.3.1",

 "rand_core 0.6.3",

 "rand_hc 0.3.1",

]



[[package]]

name = "rand_chacha"

version = "0.2.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"

dependencies = [

 "ppv-lite86",

 "rand_core 0.5.1",

 "rand_chacha",

 "rand_core",

]



[[package]]
@@ -322,16 +314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"

dependencies = [

 "ppv-lite86",

 "rand_core 0.6.3",

]



[[package]]

name = "rand_core"

version = "0.5.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"

dependencies = [

 "getrandom 0.1.16",

 "rand_core",

]



[[package]]
@@ -340,32 +323,14 @@ version = "0.6.3" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"

dependencies = [

 "getrandom 0.2.3",

]



[[package]]

name = "rand_hc"

version = "0.2.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"

dependencies = [

 "rand_core 0.5.1",

]



[[package]]

name = "rand_hc"

version = "0.3.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"

dependencies = [

 "rand_core 0.6.3",

 "getrandom",

]



[[package]]

name = "regex"

version = "1.5.4"

version = "1.5.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"

checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"

dependencies = [

 "aho-corasick",

 "memchr",
@@ -395,18 +360,18 @@ dependencies = [ 


[[package]]

name = "serde"

version = "1.0.127"

version = "1.0.136"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"

checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"

dependencies = [

 "serde_derive",

]



[[package]]

name = "serde_derive"

version = "1.0.127"

version = "1.0.136"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"

checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"

dependencies = [

 "proc-macro2",

 "quote",
@@ -418,7 +383,7 @@ name = "simflash" 
version = "0.1.0"

dependencies = [

 "log",

 "rand 0.7.3",

 "rand",

 "thiserror",

]
@@ -436,9 +401,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" 


[[package]]

name = "syn"

version = "1.0.74"

version = "1.0.91"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"

checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"

dependencies = [

 "proc-macro2",

 "quote",
@@ -447,27 +412,27 @@ dependencies = [ 


[[package]]

name = "termcolor"

version = "1.1.2"

version = "1.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"

checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"

dependencies = [

 "winapi-util",

]



[[package]]

name = "thiserror"

version = "1.0.26"

version = "1.0.30"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"

checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"

dependencies = [

 "thiserror-impl",

]



[[package]]

name = "thiserror-impl"

version = "1.0.26"

version = "1.0.30"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"

checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"

dependencies = [

 "proc-macro2",

 "quote",
@@ -476,9 +441,9 @@ dependencies = [ 


[[package]]

name = "typenum"

version = "1.13.0"

version = "1.15.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"

checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"



[[package]]

name = "unicode-xid"
@@ -500,15 +465,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" 


[[package]]

name = "version_check"

version = "0.9.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"



[[package]]

name = "wasi"

version = "0.9.0+wasi-snapshot-preview1"

version = "0.9.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"

checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"



[[package]]

name = "wasi"
@@ -518,9 +477,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" 


[[package]]

name = "wasm-bindgen"

version = "0.2.76"

version = "0.2.80"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0"

checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"

dependencies = [

 "cfg-if",

 "wasm-bindgen-macro",
@@ -528,9 +487,9 @@ dependencies = [ 


[[package]]

name = "wasm-bindgen-backend"

version = "0.2.76"

version = "0.2.80"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041"

checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"

dependencies = [

 "bumpalo",

 "lazy_static",
@@ -543,9 +502,9 @@ dependencies = [ 


[[package]]

name = "wasm-bindgen-macro"

version = "0.2.76"

version = "0.2.80"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef"

checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"

dependencies = [

 "quote",

 "wasm-bindgen-macro-support",
@@ -553,9 +512,9 @@ dependencies = [ 


[[package]]

name = "wasm-bindgen-macro-support"

version = "0.2.76"

version = "0.2.80"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad"

checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"

dependencies = [

 "proc-macro2",

 "quote",
@@ -566,15 +525,15 @@ dependencies = [ 


[[package]]

name = "wasm-bindgen-shared"

version = "0.2.76"

version = "0.2.80"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"

checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"



[[package]]

name = "web-sys"

version = "0.3.53"

version = "0.3.57"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c"

checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"

dependencies = [

 "js-sys",

 "wasm-bindgen",

README.md

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ operating systems and SoCs: 
- [RIOT](docs/readme-riot.md)

- [Mbed OS](docs/readme-mbed.md)

- [Espressif](docs/readme-espressif.md)

- [Cypress/Infineon](boot/cypress/readme.md)

- [Cypress/Infineon](boot/cypress/README.md)



There are also instructions for the [Simulator](sim/README.rst).

boot/boot_serial/src/boot_serial.c

+220 −151

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE