OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move mbedtls submodule from sim to ext 

Move the external mbedtls submodule out of the sim/mcuboot-sys directory
into the ext directory.  This will allow the same copy of mbed TLS to be
used by other board support packages, instead of having to make a
duplicate clone.

Signed-off-by: David Brown <david.brown@linaro.org>
This commit is contained in:
David Brown 2019-10-11 10:32:36 -06:00 committed by David Brown
parent b748f6fa2a
commit f984b95735
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "sim/mbedtls"] [submodule "sim/mbedtls"]
path = sim/mcuboot-sys/mbedtls path = ext/mbedtls
url = https://github.com/ARMmbed/mbedtls url = https://github.com/ARMmbed/mbedtls

0
sim/mcuboot-sys/mbedtls → ext/mbedtls
View File

72
sim/mcuboot-sys/build.rs
View File

@ -56,15 +56,15 @@ fn main() {
} }
conf.define("MCUBOOT_USE_MBED_TLS", None); conf.define("MCUBOOT_USE_MBED_TLS", None);
conf.include("mbedtls/include"); conf.include("../../ext/mbedtls/include");
conf.file("mbedtls/library/sha256.c"); conf.file("../../ext/mbedtls/library/sha256.c");
conf.file("csupport/keys.c"); conf.file("csupport/keys.c");
conf.file("mbedtls/library/rsa.c"); conf.file("../../ext/mbedtls/library/rsa.c");
conf.file("mbedtls/library/bignum.c"); conf.file("../../ext/mbedtls/library/bignum.c");
conf.file("mbedtls/library/platform.c"); conf.file("../../ext/mbedtls/library/platform.c");
conf.file("mbedtls/library/platform_util.c"); conf.file("../../ext/mbedtls/library/platform_util.c");
conf.file("mbedtls/library/asn1parse.c"); conf.file("../../ext/mbedtls/library/asn1parse.c");
} else if sig_ecdsa { } else if sig_ecdsa {
conf.define("MCUBOOT_SIGN_EC256", None); conf.define("MCUBOOT_SIGN_EC256", None);
conf.define("MCUBOOT_USE_TINYCRYPT", None); conf.define("MCUBOOT_USE_TINYCRYPT", None);
@ -88,20 +88,20 @@ fn main() {
conf.define("MCUBOOT_SIGN_ED25519", None); conf.define("MCUBOOT_SIGN_ED25519", None);
conf.define("MCUBOOT_USE_MBED_TLS", None); conf.define("MCUBOOT_USE_MBED_TLS", None);
conf.include("mbedtls/include"); conf.include("../../ext/mbedtls/include");
conf.file("mbedtls/library/sha256.c"); conf.file("../../ext/mbedtls/library/sha256.c");
conf.file("mbedtls/library/sha512.c"); conf.file("../../ext/mbedtls/library/sha512.c");
conf.file("csupport/keys.c"); conf.file("csupport/keys.c");
conf.file("../../ext/fiat/src/curve25519.c"); conf.file("../../ext/fiat/src/curve25519.c");
conf.file("mbedtls/library/platform.c"); conf.file("../../ext/mbedtls/library/platform.c");
conf.file("mbedtls/library/platform_util.c"); conf.file("../../ext/mbedtls/library/platform_util.c");
conf.file("mbedtls/library/asn1parse.c"); conf.file("../../ext/mbedtls/library/asn1parse.c");
} else { } else {
// Neither signature type, only verify sha256. The default // Neither signature type, only verify sha256. The default
// configuration file bundled with mbedTLS is sufficient. // configuration file bundled with mbedTLS is sufficient.
conf.define("MCUBOOT_USE_MBED_TLS", None); conf.define("MCUBOOT_USE_MBED_TLS", None);
conf.include("mbedtls/include"); conf.include("../../ext/mbedtls/include");
conf.file("mbedtls/library/sha256.c"); conf.file("../../ext/mbedtls/library/sha256.c");
} }
if overwrite_only { if overwrite_only {
@ -117,18 +117,18 @@ fn main() {
conf.file("../../boot/bootutil/src/encrypted.c"); conf.file("../../boot/bootutil/src/encrypted.c");
conf.file("csupport/keys.c"); conf.file("csupport/keys.c");
conf.include("mbedtls/include"); conf.include("../../ext/mbedtls/include");
conf.file("mbedtls/library/sha256.c"); conf.file("../../ext/mbedtls/library/sha256.c");
conf.file("mbedtls/library/platform.c"); conf.file("../../ext/mbedtls/library/platform.c");
conf.file("mbedtls/library/platform_util.c"); conf.file("../../ext/mbedtls/library/platform_util.c");
conf.file("mbedtls/library/rsa.c"); conf.file("../../ext/mbedtls/library/rsa.c");
conf.file("mbedtls/library/rsa_internal.c"); conf.file("../../ext/mbedtls/library/rsa_internal.c");
conf.file("mbedtls/library/md.c"); conf.file("../../ext/mbedtls/library/md.c");
conf.file("mbedtls/library/md_wrap.c"); conf.file("../../ext/mbedtls/library/md_wrap.c");
conf.file("mbedtls/library/aes.c"); conf.file("../../ext/mbedtls/library/aes.c");
conf.file("mbedtls/library/bignum.c"); conf.file("../../ext/mbedtls/library/bignum.c");
conf.file("mbedtls/library/asn1parse.c"); conf.file("../../ext/mbedtls/library/asn1parse.c");
} }
if enc_kw { if enc_kw {
@ -139,17 +139,17 @@ fn main() {
conf.file("csupport/keys.c"); conf.file("csupport/keys.c");
if sig_rsa || sig_rsa3072 { if sig_rsa || sig_rsa3072 {
conf.file("mbedtls/library/sha256.c"); conf.file("../../ext/mbedtls/library/sha256.c");
} }
/* Simulator uses Mbed-TLS to wrap keys */ /* Simulator uses Mbed-TLS to wrap keys */
conf.include("mbedtls/include"); conf.include("../../ext/mbedtls/include");
conf.file("mbedtls/library/platform.c"); conf.file("../../ext/mbedtls/library/platform.c");
conf.file("mbedtls/library/platform_util.c"); conf.file("../../ext/mbedtls/library/platform_util.c");
conf.file("mbedtls/library/nist_kw.c"); conf.file("../../ext/mbedtls/library/nist_kw.c");
conf.file("mbedtls/library/cipher.c"); conf.file("../../ext/mbedtls/library/cipher.c");
conf.file("mbedtls/library/cipher_wrap.c"); conf.file("../../ext/mbedtls/library/cipher_wrap.c");
conf.file("mbedtls/library/aes.c"); conf.file("../../ext/mbedtls/library/aes.c");
if sig_ecdsa { if sig_ecdsa {
conf.define("MCUBOOT_USE_TINYCRYPT", None); conf.define("MCUBOOT_USE_TINYCRYPT", None);
@ -210,8 +210,8 @@ fn main() {
walk_dir("../../ext/tinycrypt/lib/source").unwrap(); walk_dir("../../ext/tinycrypt/lib/source").unwrap();
walk_dir("../../ext/mbedtls-asn1").unwrap(); walk_dir("../../ext/mbedtls-asn1").unwrap();
walk_dir("csupport").unwrap(); walk_dir("csupport").unwrap();
walk_dir("mbedtls/include").unwrap(); walk_dir("../../ext/mbedtls/include").unwrap();
walk_dir("mbedtls/library").unwrap(); walk_dir("../../ext/mbedtls/library").unwrap();
} }
// Output the names of all files within a directory so that Cargo knows when to rebuild. // Output the names of all files within a directory so that Cargo knows when to rebuild.