Fix merge conflict

2022-04-12 19:40:50 +02:00
parent e920ef32c3 e08da697f0
commit 091af0ecd9
9 changed files with 34 additions and 27 deletions
--- a/builder/main.py
+++ b/builder/main.py
@ -378,6 +378,8 @@ elif upload_protocol in debug_tools:
        UPLOADER="openocd",
        UPLOADERFLAGS=openocd_args,
        UPLOADCMD="$UPLOADER $UPLOADERFLAGS")
+    if not board.get("upload").get("offset_address"):
+        upload_source = target_elf
    upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]

 # custom upload tool