sim: Move mbedtls into mcuboot-sys

The mbedtls library is used by the binding crate, so move the submodule
into this directory as well.

Signed-off-by: David Brown <david.brown@linaro.org>
This commit is contained in:
David Brown 2017-07-12 09:49:31 -06:00 committed by David Brown
parent 6390277f64
commit 82bf7c2d09
3 changed files with 8 additions and 8 deletions

2
.gitmodules vendored
View File

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

View File

@ -34,12 +34,12 @@ fn main() {
conf.define("MCUBOOT_USE_MBED_TLS", None); conf.define("MCUBOOT_USE_MBED_TLS", None);
conf.define("MBEDTLS_CONFIG_FILE", Some("<config-boot.h>")); conf.define("MBEDTLS_CONFIG_FILE", Some("<config-boot.h>"));
conf.include("../mbedtls/include"); conf.include("mbedtls/include");
conf.file("../mbedtls/library/sha256.c"); conf.file("mbedtls/library/sha256.c");
conf.file("../mbedtls/library/rsa.c"); conf.file("mbedtls/library/rsa.c");
conf.file("../mbedtls/library/bignum.c"); conf.file("mbedtls/library/bignum.c");
conf.file("../mbedtls/library/asn1parse.c"); conf.file("mbedtls/library/asn1parse.c");
} }
if sig_ecdsa { if sig_ecdsa {
conf.define("MCUBOOT_SIGN_ECDSA", None); conf.define("MCUBOOT_SIGN_ECDSA", None);
@ -65,8 +65,8 @@ fn main() {
walk_dir("../../boot").unwrap(); walk_dir("../../boot").unwrap();
walk_dir("../csupport").unwrap(); walk_dir("../csupport").unwrap();
walk_dir("../mbedtls/include").unwrap(); walk_dir("mbedtls/include").unwrap();
walk_dir("../mbedtls/library").unwrap(); walk_dir("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.