Merge pull request #35 from jannic-dev-forks/use_updated_boot2

Use rp2040-boot2 version 0.3 from git

Author: thejpster

Cargo.toml

@@ -11,13 +11,13 @@ version = "0.4.0"
 # Useful Cortex-M specific functions (e.g. SysTick)
 cortex-m = "0.7"
 # The Raspberry Pi Pico HAL
-rp-pico = "0.5"
+rp-pico = { version = "0.6", default-features = false, features = [ "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
 neotron-common-bios = "0.7.0"
 # For the RP2040 bootloader
-rp2040-boot2 = "0.2"
+rp2040-boot2 = "0.3.0"
 # For hardware abstraction traits
 embedded-hal ="0.2"
 # Gives us formatted PC-side logging
@@ -53,3 +53,6 @@ codegen-units = 1
 debug = true
 # better optimizations
 lto = true
+
+[patch.crates-io]
+rp2040-boot2 = { version = "0.3.0", git = "https://github.com/rp-rs/rp2040-boot2" }

src/main.rs

@@ -33,6 +33,14 @@
 #![no_std]
 #![no_main]
 
+// The boot2 feature of rp-pico is temporarily disabled, so the version
+// of rp2040-boot2 can be overridden. Therefore, BOOT2_FIRMWARE needs to be
+// defined here.
+#[link_section = ".boot2"]
+#[no_mangle]
+#[used]
+pub static BOOT2_FIRMWARE: [u8; 256] = rp2040_boot2::BOOT_LOADER_W25Q080;
+
 // -----------------------------------------------------------------------------
 // Sub-modules
 // -----------------------------------------------------------------------------
@@ -310,6 +318,10 @@ fn main() -> ! {
 
 	info!("Clocks OK");
 
+	info!("SCKDV: {}", unsafe {
+		(*rp_pico::pac::XIP_SSI::ptr()).baudr.read().bits()
+	});
+
 	// sio is the *Single-cycle Input/Output* peripheral. It has all our GPIO
 	// pins, as well as some mailboxes and other useful things for inter-core
 	// communications.