RP235x: switch to using picotool

elf2uf2-rs doesn't work on RP2350. See JoNil/elf2uf2-rs#33
rp-rs · Aug 22, 2024 · 17296c7 · 17296c7
1 parent 86b4e69
commit 17296c7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 33 deletions.
diff --git a/rp235x-hal-examples/.cargo/config.toml b/rp235x-hal-examples/.cargo/config.toml
@@ -31,7 +31,8 @@ rustflags = [
     "-C", "target-cpu=cortex-m33",
 ]
 
-# Use picotool for loading, as probe-rs doesn't support RP2350 yet:
+# Use picotool for loading.
+#
 # Load an elf, skipping unchanged flash sectors, verify it, and execute it
 runner = "picotool load -u -v -x -t elf"
 
@@ -48,14 +49,10 @@ rustflags = [
     "-C", "link-arg=-Tdefmt.x",
 ]
 
-# This runner will make a UF2 file and then copy it to a mounted RP2040 in USB
-# Bootloader mode:
-runner = "elf2uf2-rs -d"
-
-# Alternatively, use picotool for loading.
+# Use picotool for loading.
 #
 # Load an elf, skipping unchanged flash sectors, verify it, and execute it
-# runner = "picotool load -u -v -x -t elf"
+runner = "picotool load -u -v -x -t elf"
 
 # This is the soft-float ABI for RISC-V mode.
 #
@@ -78,11 +75,7 @@ rustflags = [
     "-C", "link-arg=-Tdefmt.x",
 ]
 
-# This runner will make a UF2 file and then copy it to a mounted RP2040 in USB
-# Bootloader mode:
-runner = "elf2uf2-rs -d"
-
-# Alternatively, use picotool for loading.
+# Use picotool for loading.
 #
 # Load an elf, skipping unchanged flash sectors, verify it, and execute it
-# runner = "picotool load -u -v -x -t elf"
+runner = "picotool load -u -v -x -t elf"
diff --git a/rp235x-hal-examples/README.md b/rp235x-hal-examples/README.md
@@ -82,25 +82,24 @@ $ file ./target/thumbv8m.main-none-eabihf/debug/blinky
 ```
 
 You can also 'run' an example, which thanks to our supplied
-[`.cargo/config.toml`](./.cargo/config.toml) will invoke [`elf2uf2-rs`] to copy
-it to an RP235x in USB Bootloader mode. You should install that if
-you don't have it already.
-
-```console
-$ cargo install elf2uf2-rs --locked
-```
-
-[`elf2uf2-rs`]: https://github.com/JoNil/elf2uf2-rs
+[`.cargo/config.toml`](./.cargo/config.toml) will invoke Raspberry Pi's
+`picotool` to copy it to an RP235x in USB Bootloader mode. You should install
+that if you don't have it already, from
+<https://github.com/raspberrypi/pico-sdk-tools/releases>.
 
 ```console
 $ cargo run --bin blinky --target=thumbv8m.main-none-eabihf
    Compiling rp235x-hal v0.10.0 (/home/user/rp-hal/rp235x-hal)
    Compiling rp235x-hal-examples v0.1.0 (/home/user/rp-hal/rp235x-hal-examples)
     Finished `dev` profile [unoptimized + debuginfo] target(s) in 1.62s
-     Running `elf2uf2-rs -d target/thumbv8m.main-none-eabihf/debug/blinky`
-Found pico uf2 disk /media/user/RP235x
-Transfering program to pico
-88.50 KB / 88.50 KB [=====================================] 100.00 % 430.77 KB/s
+     Running `picotool load -u -v -x -t elf target/thumbv8m.main-none-eabihf/debug/blinky`
+Family id 'rp2350-arm-s' can be downloaded in absolute space:
+  00000000->02000000
+Loading into Flash: [==============================]  100%
+Verifying Flash:    [==============================]  100%
+  OK
+
+The device was rebooted to start the application.
 ```
 
 It is currently possible to build *some* of the examples in RISC-V mode. See
@@ -113,15 +112,18 @@ $ cargo build --bin blinky --target=riscv32imac-unknown-none-elf
     Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.06s
 $ file ./target/riscv32imac-unknown-none-elf/debug/blinky
 ./target/riscv32imac-unknown-none-elf/debug/blinky: ELF 32-bit LSB executable, UCB RISC-V, RVC, soft-float ABI, version 1 (SYSV), statically linked, with debug_info, not stripped
+$ cargo run --bin blinky --target=riscv32imac-unknown-none-elf
+    Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.06s
+     Running `picotool load -u -v -x -t elf target/riscv32imac-unknown-none-elf/debug/blinky`
+Family id 'rp2350-riscv' can be downloaded in absolute space:
+  00000000->02000000
+Loading into Flash: [==============================]  100%
+Verifying Flash:    [==============================]  100%
+  OK
+
+The device was rebooted to start the application.
 ```
 
-You cannot use `cargo run` with a RISC-V example because [`elf2uf2-rs`] doesn't
-know about RISC-V binaries yet. If you look in
-[`.cargo/config.toml`](./.cargo/config.toml) you'll see some alternative runner
-definitions which are commented out. For RISC-V mode, try the `picotool` runner
-- but you'll have to install the official Raspberry Pi Pico SDK first in order
-to get a copy of `picotool`, which is why we don't recommend it by default.
-
 <!-- ROADMAP -->
 ## Roadmap