commit d2b1853f0236b40526f455117b16d83ab7c29bd0
author David Brown <david.brown@linaro.org> Wed Jul 12 09:51:31 2017 -0600
committer David Brown <davidb@davidb.org> Wed Jul 12 15:00:57 2017 -0600
tree f53cff2b47de1b8d221b365505f34d583cb4f7e3
parent 82bf7c2d092b49c7422aeb1b369c3f6cf7b66164

sim: Move csupport into mcuboot-sys

This C code is also part of the binding.  Move it into the binding crate
to reflect this.

Signed-off-by: David Brown <david.brown@linaro.org>

sim/mcuboot-sys/build.rs

diff --git a/sim/mcuboot-sys/build.rs b/sim/mcuboot-sys/build.rs
index 4f4cf9e..1b3c7d4 100644
--- a/sim/mcuboot-sys/build.rs
+++ b/sim/mcuboot-sys/build.rs
@@ -55,7 +55,7 @@
     conf.file("../../boot/bootutil/src/loader.c");
     conf.file("../../boot/bootutil/src/caps.c");
     conf.file("../../boot/bootutil/src/bootutil_misc.c");
-    conf.file("../csupport/run.c");
+    conf.file("csupport/run.c");
     conf.include("../../boot/bootutil/include");
     conf.include("../../boot/zephyr/include");
     conf.debug(true);
@@ -64,7 +64,7 @@
     conf.compile("libbootutil.a");
 
     walk_dir("../../boot").unwrap();
-    walk_dir("../csupport").unwrap();
+    walk_dir("csupport").unwrap();
     walk_dir("mbedtls/include").unwrap();
     walk_dir("mbedtls/library").unwrap();
 }

sim/mcuboot-sys/csupport/run.c

diff --git a/sim/csupport/run.c b/sim/mcuboot-sys/csupport/run.c
similarity index 98%
rename from sim/csupport/run.c
rename to sim/mcuboot-sys/csupport/run.c
index 5a817cc..261f24a 100644
--- a/sim/csupport/run.c
+++ b/sim/mcuboot-sys/csupport/run.c
@@ -8,7 +8,7 @@
 #include <bootutil/image.h>
 #include "flash_map/flash_map.h"
 
-#include "../../boot/bootutil/src/bootutil_priv.h"
+#include "../../../boot/bootutil/src/bootutil_priv.h"
 
 #define BOOT_LOG_LEVEL BOOT_LOG_LEVEL_ERROR
 #include <bootutil/bootutil_log.h>