Merge upstream

2021-12-29 16:02:30 +01:00
parent 673d327f62
commit 9811f13f66
8 changed files with 54 additions and 76 deletions
--- a/builder/frameworks/arduino/mbed-core
+++ b/builder/frameworks/arduino/mbed-core
--- a/builder/main.py
+++ b/builder/main.py
@ -284,9 +284,9 @@ if upload_protocol == "mbed":
    ]
 elif upload_protocol == "picotool":
    env.Replace(
-        UPLOADER='"%s"' % join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"),
+        UPLOADER=join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"),
        UPLOADERFLAGS=["-v", "-D"],
-        UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES"
+        UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'
    )

    if "uploadfs" in COMMAND_LINE_TARGETS: