Runs on the Pico 2.

Tested showing 640x480@4bpp images and running the neotracker with DAMAGE.MOD.

Author: thejpster

.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.lock

@@ -11,7 +11,8 @@ version = "0.7.0"
 # Useful Cortex-M specific functions (e.g. SysTick)
 cortex-m = "0.7"
 # The Raspberry Pi RP2040 HAL (so we can turn defmt on)
-rp2040-hal = { version = "0.10", features = [ "defmt", "rt", "critical-section-impl", "rom-func-cache" ] }
+# rp2040-hal = { version = "0.10", features = [ "defmt", "rt", "critical-section-impl", "rom-func-cache" ] }
+rp235x-hal = { git = "https://github.com/rp-rs/rp-hal", branch = "add-rp235x", features = [ "defmt", "rt", "critical-section-impl", "rom-func-cache" ]}
 # Cortex-M run-time (or start-up) code
 cortex-m-rt = "0.7"
 # The BIOS to OS API

Cargo.toml

@@ -8,24 +8,18 @@
 
 MEMORY {
     /*
-     * This is bootloader for the RP2040. It must live at the start of the
-       external flash chip.
+     * The Pico 2 has 4096 KiB of external Flash Memory. We allow ourselves 128
+     * KiB for the BIOS, leaving the rest for the OS and any user applications.
      */
-    BOOT2 : ORIGIN = 0x10000000, LENGTH = 0x100
+    FLASH : ORIGIN = 0x10000000, LENGTH = 128K
     /*
-     * The Pico has 2048 KiB of external Flash Memory. We allow ourselves 128
-     * KiB for the BIOS, leaving the rest
-     * for the OS and any user applications.
+     * This is the remainder of the 4096 KiB flash chip.
      */
-    FLASH : ORIGIN = 0x10000100, LENGTH = 128K - 0x100
-    /*
-     * This is the remainder of the 2048 KiB flash chip.
-     */
-    FLASH_OS : ORIGIN = 0x10020000, LENGTH = 2048K - 128K
+    FLASH_OS : ORIGIN = 0x10020000, LENGTH = 4096K - 128K
     /*
      * This is the bottom of the four striped banks of SRAM in the RP2040.
      */
-    RAM_OS : ORIGIN = 0x20000000, LENGTH = 0x42000 - 0x9300
+    RAM_OS : ORIGIN = 0x20000000, LENGTH = 0x82000 - 0x9300
     /*
      * This is the top of the four striped banks of SRAM in the RP2040, plus
      * SRAM_BANK4 and SRAM_BANK5.
@@ -36,7 +30,7 @@ MEMORY {
      * 0x9300 should be the (size of .data + size of .bss + size of .uninit +
      * 0x2000 for the stack).
      */
-    RAM : ORIGIN = 0x20042000 - 0x9300, LENGTH = 0x9300
+    RAM : ORIGIN = 0x20082000 - 0x9300, LENGTH = 0x9300
 }
 
 /*
@@ -48,17 +42,55 @@ _ram_os_start = ORIGIN(RAM_OS);
 _ram_os_len = LENGTH(RAM_OS);
 
 SECTIONS {
-    /* ### RP2040 Boot loader */
-    .boot2 ORIGIN(BOOT2) :
+    /* ### Boot ROM info
+     *
+     * Goes after .vector_table, to keep it in the first 4K of flash
+     * where the Boot ROM (and picotool) can find it
+     */
+    .start_block : ALIGN(4)
+    {
+        __start_block_addr = .;
+        KEEP(*(.start_block));
+    } > FLASH
+
+} INSERT AFTER .vector_table;
+
+/* move .text to start /after/ the boot info */
+_stext = ADDR(.start_block) + SIZEOF(.start_block);
+
+SECTIONS {
+    /* ### Picotool 'Binary Info' Entries
+     *
+     * Picotool looks through this block (as we have pointers to it in our
+     * header) to find interesting information.
+     */
+    .bi_entries : ALIGN(4)
     {
-        KEEP(*(.boot2));
-    } > BOOT2
+        /* We put this in the header */
+        __bi_entries_start = .;
+        /* Here are the entries */
+        KEEP(*(.bi_entries));
+        /* Keep this block a nice round size */
+        . = ALIGN(4);
+        /* We put this in the header */
+        __bi_entries_end = .;
+    } > FLASH
+} INSERT AFTER .text;
 
-    /* ### Neotron OS */
-    .flash_os ORIGIN(FLASH_OS) :
+SECTIONS {
+    /* ### Boot ROM extra info
+     *
+     * Goes after everything in our program, so it can contain a signature.
+     */
+    .end_block : ALIGN(4)
     {
-        KEEP(*(.flash_os));
-    } > FLASH_OS
-} INSERT BEFORE .text;
+        __end_block_addr = .;
+        KEEP(*(.end_block));
+    } > FLASH
+
+} INSERT AFTER .uninit;
+
+PROVIDE(start_to_end = __end_block_addr - __start_block_addr);
+PROVIDE(end_to_start = __start_block_addr - __end_block_addr);