Port functionality to updated flash-algorithm crate

Author: mbrossard

Cargo.toml

@@ -7,7 +7,7 @@ version = "0.1.0"
 
 [dependencies]
 cortex-m = "0.7.0"
-flash-algorithm = { version = "0.4.0", default-features = false, features = [
+flash-algorithm = { version = "0.5.0", default-features = false, features = [
     "panic-handler",
 ] }
 

build.sh

@@ -9,6 +9,7 @@ else
     BASE64_FLAGS="-w0"
 fi
 
+# cargo build --release --features device_description
 cargo build --release
 ELF=target/thumbv6m-none-eabi/release/flash-algo
 

link.x

@@ -52,6 +52,16 @@ SECTIONS {
         . = ALIGN(4);
     }
 
+    /* Description of the flash algorithm */
+    DeviceData . : {
+        /* The device data content is only for external tools,
+         * and usually not referenced by the code.
+         *
+         * The KEEP statement ensures it's not removed by accident.
+         */
+        KEEP(*(DeviceData))
+    }
+
     /DISCARD/ : {
         /* Unused exception related info that only wastes space */
         *(.ARM.exidx);

src/main.rs

@@ -139,10 +139,14 @@ struct RP2Algo {
 }
 
 algorithm!(RP2Algo, {
+    device_name: "Raspberry Pi RP2",
+    device_type: DeviceType::ExtSpi,
     flash_address: 0x1000_0000,
     flash_size: 0x0100_0000,
     page_size: 0x100,
     empty_value: 0xFF,
+    program_time_out: 500, // 500 ms
+    erase_time_out: 5000, // 5 s
     sectors: [{
         size: 0x1000,
         address: 0x10000000,
@@ -152,55 +156,12 @@ algorithm!(RP2Algo, {
 const BLOCK_SIZE: u32 = 65536;
 const SECTOR_SIZE: u32 = 4096;
 const BLOCK_ERASE_CMD: u8 = 0xd8;
-const FLASH_BASE: u32 = 0x1000_0000;
-
-#[repr(C)]
-pub struct FlashDevice {
-    pub version: u16,
-    pub device_name: [u8; 128],
-    pub device_type: u16,
-    pub device_address: u32,
-    pub size_device: u32,
-    pub size_page: u32,
-    pub reserved: u32,
-    pub val_empty: u8,
-    pub timeout_program: u32,
-    pub timeout_erase: u32,
-    pub sectors: [u32; 4],
-}
 
 #[cfg(feature = "device_description")]
 #[no_mangle]
 #[link_section = ".PrgData"]
 pub static dummy: u32 = 0;
 
-#[cfg(feature = "device_description")]
-#[no_mangle]
-#[link_section = ".DevDscr"]
-pub static FlashDevice: FlashDevice = FlashDevice {
-    version: 1, // Version 1.01
-    device_name: [
-        0x52, 0x61, 0x73, 0x70, 0x65, 0x72, 0x72, 0x79, 0x20, 0x50, 0x69, 0x20, 0x52, 0x50, 0x32,
-        0x30, 0x34, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    ], // "Rasperry Pi RP2040"
-    device_type: 5, // External SPI
-    device_address: FLASH_BASE, // Default device start address
-    size_device: 16 * 1024 * 1024, // Total Size of device (16 MiB)
-    size_page: PAGE_SIZE, // Programming page size
-    reserved: 0, // Must be zero
-    val_empty: 0xFF, // Content of erase memory
-    timeout_program: 500, // 500 ms
-    timeout_erase: 5000, // 5 s
-    sectors: [SECTOR_SIZE, FLASH_BASE, 0xFFFFFFFF, 0xFFFFFFFF],
-};
-
 impl FlashAlgorithm for RP2Algo {
     fn new(_address: u32, _clock: u32, _function: Function) -> Result<Self, ErrorCode> {
         let funcs = ROMFuncs::load()?;