Merge pull request #2 from mbrossard/fixes

A few fixes and one enhancement

Author: ithinuel

.github/workflows/ci_checks.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          target: thumbv6m-none-eabi
+          target: thumbv8m.main-none-eabihf
       - run: cargo install flip-link
       - run: cargo build --all
       - run: cargo build --all --release
@@ -43,7 +43,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
-          target: thumbv6m-none-eabi
+          target: thumbv8m.main-none-eabihf
       - run: cargo clippy --all-features -- --deny=warnings
   formatting:
     name: Formatting
@@ -55,5 +55,5 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
-          target: thumbv6m-none-eabi
+          target: thumbv8m.main-none-eabihf
       - run: cargo fmt -- --check

Cargo.toml

@@ -17,7 +17,11 @@ panic-probe = { version = "1", features = ["print-defmt"] }
 #rp-pico2 = "0.9" # TODO: Do we have that crate already ?
 
 # If you're not going to use a Board Support Package you'll need these:
-rp235x-hal = { version="0.3", features=["rt", "critical-section-impl"] }
+rp235x-hal = { version = "0.3", features = [
+    "rt",
+    "critical-section-impl",
+    "binary-info",
+] }
 
 # cargo build/run
 [profile.dev]

Embed.toml

@@ -18,9 +18,9 @@ enabled = true
 halt_afterwards = false
 
 [default.general]
-chip = "RP2040"
+chip = "RP235x"
 log_level = "WARN"
-# RP2040 does not support connect_under_reset
+# RP2350 does not support connect_under_reset?
 connect_under_reset = false
 
 [default.rtt]

cargo-generate/Cargo.toml

@@ -17,7 +17,11 @@ panic-probe = { version = "1", features = ["print-defmt"] }
 #rp-pico2 = "0.9" # TODO: Do we have that crate already ?
 
 # If you're not going to use a Board Support Package you'll need these:
-rp235x-hal = { version="0.3", features=["rt", "critical-section-impl"] }
+rp235x-hal = { version = "0.3", features = [
+    "rt",
+    "critical-section-impl",
+    "binary-info",
+] }
 
 # cargo build/run
 [profile.dev]

memory.x

@@ -73,5 +73,3 @@ SECTIONS {
 
 PROVIDE(start_to_end = __end_block_addr - __start_block_addr);
 PROVIDE(end_to_start = __start_block_addr - __end_block_addr);
-
-

src/main.rs

@@ -52,10 +52,10 @@ fn main() -> ! {
         &mut pac.RESETS,
     );
 
-    // This is the correct pin on the Raspberry Pico board. On other boards, even if they have an
+    // This is the correct pin on the Raspberry Pico 2 board. On other boards, even if they have an
     // on-board LED, it might need to be changed.
     //
-    // Notably, on the Pico W, the LED is not connected to any of the RP2040 GPIOs but to the cyw43 module instead.
+    // Notably, on the Pico 2 W, the LED is not connected to any of the RP2350 GPIOs but to the cyw43 module instead.
     // One way to do that is by using [embassy](https://github.com/embassy-rs/embassy/blob/main/examples/rp/src/bin/wifi_blinky.rs)
     //
     // If you have a Pico W and want to toggle a LED with a simple GPIO output pin, you can connect an external
@@ -73,4 +73,15 @@ fn main() -> ! {
     }
 }
 
+/// Program metadata for `picotool info`
+#[link_section = ".bi_entries"]
+#[used]
+pub static PICOTOOL_ENTRIES: [rp235x_hal::binary_info::EntryAddr; 5] = [
+    rp235x_hal::binary_info::rp_cargo_bin_name!(),
+    rp235x_hal::binary_info::rp_cargo_version!(),
+    rp235x_hal::binary_info::rp_program_description!(c"RP2350 Template"),
+    rp235x_hal::binary_info::rp_cargo_homepage_url!(),
+    rp235x_hal::binary_info::rp_program_build_attribute!(),
+];
+
 // End of file