Update deps

FranciscoLlobet · Feb 23, 2024 · 8cdd437 · 8cdd437
1 parent 4bdf246
commit 8cdd437
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/build_mcuboot.zig b/build_mcuboot.zig
@@ -2,27 +2,25 @@ const std = @import("std");
 const microzig = @import("microzig");
 
 const include_path = [_][]const u8{
-    "csrc/mcuboot/mcuboot/boot/bootutil/include",
-    "csrc/mcuboot/mcuboot/boot/zig-freertos",
+    "csrc/mcuboot/boot/bootutil/include",
+    "csrc/mcuboot/boot/zig-freertos",
 };
 
 const source_path = [_][]const u8{
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/boot_record.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/bootutil_misc.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/bootutil_public.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/caps.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/encrypted.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/fault_injection_hardening.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/image_ecdsa.c",
-    // "csrc/mcuboot/mcuboot/boot/bootutil/src/image_ed25519.c",
-    // "csrc/mcuboot/mcuboot/boot/bootutil/src/image_rsa.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/image_validate.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/loader.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/swap_misc.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/swap_move.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/swap_scratch.c",
-    "csrc/mcuboot/mcuboot/boot/bootutil/src/tlv.c",
+    "csrc/mcuboot/boot/bootutil/src/boot_record.c",
+    "csrc/mcuboot/boot/bootutil/src/bootutil_misc.c",
+    "csrc/mcuboot/boot/bootutil/src/bootutil_public.c",
+    "csrc/mcuboot/boot/bootutil/src/caps.c",
+    "csrc/mcuboot/boot/bootutil/src/encrypted.c",
+    "csrc/mcuboot/boot/bootutil/src/fault_injection_hardening.c",
+    "csrc/mcuboot/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c",
+    "csrc/mcuboot/boot/bootutil/src/image_ecdsa.c",
+    "csrc/mcuboot/boot/bootutil/src/image_validate.c",
+    "csrc/mcuboot/boot/bootutil/src/loader.c",
+    "csrc/mcuboot/boot/bootutil/src/swap_misc.c",
+    "csrc/mcuboot/boot/bootutil/src/swap_move.c",
+    "csrc/mcuboot/boot/bootutil/src/swap_scratch.c",
+    "csrc/mcuboot/boot/bootutil/src/tlv.c",
 };
 
 const c_flags = [_][]const u8{ "-DEFM32GG390F1024", "-O2", "-fdata-sections", "-ffunction-sections" };

diff --git a/dodo.py b/dodo.py
@@ -17,7 +17,7 @@
 LWM2M_BIN = "lwm2m.bin"
 MQTT_BIN = "mqtt.bin"
 
-IMG_TOOL = Path.cwd() / "csrc" / "mcuboot" / "mcuboot" / "scripts" / "imgtool.py"
+IMG_TOOL = Path.cwd() / "csrc" / "mcuboot" / "scripts" / "imgtool.py"
 
 MISO_FW_VERSION = "0.1.2"
 

diff --git a/tasks.py b/tasks.py
@@ -9,7 +9,7 @@
 SIG_FW_DIR = Path.cwd() / "signed"
 
 MCU_BOOT_DEPS = (
-    Path.cwd() / "csrc" / "mcuboot" / "mcuboot" / "scripts" / "requirements.txt"
+    Path.cwd() / "csrc" / "mcuboot" / "scripts" / "requirements.txt"
 )