Draft: Support Raspberry Pi Pico 2

.cargo/config.toml

@@ -1,8 +1,6 @@
-[target.thumbv6m-none-eabi]
-# This will make a UF2 and copy it to the RP2040's Mass Storage Device bootloader
-# runner = "elf2uf2-rs -d"
-# This will flash over SWD with any compatible probe it finds.
-runner = "probe-rs run --chip RP2040 --speed 10000"
+[target.thumbv8m.main-none-eabihf]
+# This will load the binary with picotool
+runner = "picotool load -v -u -x -t elf"
 rustflags = [
   # This is needed if your flash or ram addresses are not aligned to 0x10000 in memory.x
   # See https://github.com/rust-embedded/cortex-m-quickstart/pull/95
@@ -16,7 +14,7 @@ rustflags = [
 ]
 
 [build]
-target = "thumbv6m-none-eabi" # Cortex-M0 and Cortex-M0+
+target = "thumbv8m.main-none-eabihf" # Cortex-M33
 
 [env]
 DEFMT_LOG = { value = "info" }

.github/workflows/build.yml

@@ -24,15 +24,15 @@ jobs:
         run: |
           rustup toolchain install stable --profile minimal --no-self-update
           rustup default stable
-          rustup target add thumbv6m-none-eabi
+          rustup target add thumbv8m.main-none-eabihf
           echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV
           echo CARGO_TERM_COLOR=always >> $GITHUB_ENV
 
       - name: Build neotron-pico-bios
         run: |
           cargo build --release --verbose
-          mv ./target/thumbv6m-none-eabi/release/neotron-pico-bios ./target/thumbv6m-none-eabi/release/neotron-pico-bios.elf
-          elf2uf2-rs ./target/thumbv6m-none-eabi/release/neotron-pico-bios.elf
+          mv ./target/thumbv8m.main-none-eabihf/release/neotron-pico-bios ./target/thumbv8m.main-none-eabihf/release/neotron-pico-bios.elf
+          # elf2uf2-rs ./target/thumbv8m.main-none-eabihf/release/neotron-pico-bios.elf
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
@@ -41,15 +41,15 @@ jobs:
           name: Artifacts
           if-no-files-found: error
           path: |
-            ./target/thumbv6m-none-eabi/release/neotron-pico-bios.elf
-            ./target/thumbv6m-none-eabi/release/neotron-pico-bios.uf2
+            ./target/thumbv8m.main-none-eabihf/release/neotron-pico-bios.elf
+            ./target/thumbv8m.main-none-eabihf/release/neotron-pico-bios.uf2
 
       - name: Upload files to Release
         if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            ./target/thumbv6m-none-eabi/release/neotron-pico-bios.elf
-            ./target/thumbv6m-none-eabi/release/neotron-pico-bios.uf2
+            ./target/thumbv8m.main-none-eabihf/release/neotron-pico-bios.elf
+            ./target/thumbv8m.main-none-eabihf/release/neotron-pico-bios.uf2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/clippy.yml

@@ -19,8 +19,8 @@ jobs:
       - name: Add targets/components
         run: |
           rustup component add clippy
-          rustup target add thumbv6m-none-eabi
+          rustup target add thumbv8m.main-none-eabihf
 
       - name: Run Clippy
         run: |
-          cargo clippy --target=thumbv6m-none-eabi --all-features
+          cargo clippy --target=thumbv8m.main-none-eabihf --all-features

.vscode/launch.json

@@ -14,7 +14,7 @@
             "coreConfigs": [
                 {
                     // Change this to the binary you want to debug
-                    "programBinary": "${workspaceFolder}/target/thumbv6m-none-eabi/release/neotron-pico-bios",
+                    "programBinary": "${workspaceFolder}/target/thumbv8m.main-none-eabihf/release/neotron-pico-bios",
                     "rttEnabled": true
                 }
             ],

Cargo.toml

@@ -29,8 +29,7 @@ pc-keyboard = "0.7.0" # PS/2 scancode decoding
 pio = "0.2.1" # RP2040 PIO assembler
 pio-proc = "0.2" # Macros for RP2040 PIO assembler
 portable-atomic = { version = "1.10.0", features = ["critical-section"] } # Atomic CAS for non-CAS CPUs
-rp2040-boot2 = "0.3.0" # For the RP2040 bootloader
-rp2040-hal = { version = "0.11", features = [ "defmt", "rt", "critical-section-impl", "rom-func-cache" ] } # The Raspberry Pi RP2040 HAL (so we can turn defmt on)
+rp235x-hal = { version = "0.2", features = [ "defmt", "rt", "critical-section-impl", "rom-func-cache" ] } # The Raspberry Pi RP2350 HAL
 shared-bus = "0.3.1" # I2C Bus Sharing
 tlv320aic23 = "0.1.0" # CODEC register control