Merge

builder/main.py

@@ -45,7 +45,7 @@ def generate_uf2(target, source, env):
     env.Execute(
         " ".join(
             [
-                join(platform.get_package_dir("tool-rp2040tools") or "", "elf2uf2"),
+                "elf2uf2",
                 '"%s"' % elf_file,
                 '"%s"' % elf_file.replace(".elf", ".uf2"),
             ]
@@ -284,7 +284,7 @@ if upload_protocol == "mbed":
     ]
 elif upload_protocol == "picotool":
     env.Replace(
-        UPLOADER=join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"),
+        UPLOADER="rp2040load",
         UPLOADERFLAGS=["-v", "-D"],
         UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES"
     )