commit 2bff647d8fbc7ff4ac8eedb3700f576fe16d7a54
author David Brown <david.brown@linaro.org> Tue Mar 05 13:58:35 2019 -0700
committer David Brown <davidb@davidb.org> Wed Apr 17 11:20:21 2019 +0700
tree c102bf2ff22d7dfa9d6bff3f4df1878f8d9726c6
parent 06ef06e69c240536e0f4d878c031a57d33728376

sim: Add a K64fMulti flash device

This device is similar to the K64f device, but it is twice as large, and
has the extra partitions needed to test multi-image.

Signed-off-by: David Brown <david.brown@linaro.org>

sim/src/image.rs

diff --git a/sim/src/image.rs b/sim/src/image.rs
index c02a29f..58d5e25 100644
--- a/sim/src/image.rs
+++ b/sim/src/image.rs
@@ -279,6 +279,23 @@
                 flash.insert(1, dev1);
                 (flash, areadesc)
             }
+            DeviceName::K64fMulti => {
+                // NXP style flash, but larger, to support multiple images.
+                let dev = SimFlash::new(vec![4096; 256], align as usize, erased_val);
+
+                let dev_id = 0;
+                let mut areadesc = AreaDesc::new();
+                areadesc.add_flash_sectors(dev_id, &dev);
+                areadesc.add_image(0x020000, 0x020000, FlashId::Image0, dev_id);
+                areadesc.add_image(0x040000, 0x020000, FlashId::Image1, dev_id);
+                areadesc.add_image(0x060000, 0x001000, FlashId::ImageScratch, dev_id);
+                areadesc.add_image(0x080000, 0x020000, FlashId::Image2, dev_id);
+                areadesc.add_image(0x0a0000, 0x020000, FlashId::Image3, dev_id);
+
+                let mut flash = SimMultiFlash::new();
+                flash.insert(dev_id, dev);
+                (flash, areadesc)
+            }
         }
     }
 }

sim/src/lib.rs

diff --git a/sim/src/lib.rs b/sim/src/lib.rs
index 43a1e5a..1778713 100644
--- a/sim/src/lib.rs
+++ b/sim/src/lib.rs
@@ -45,12 +45,13 @@
 }
 
 #[derive(Copy, Clone, Debug, Deserialize)]
-pub enum DeviceName { Stm32f4, K64f, K64fBig, Nrf52840, Nrf52840SpiFlash, }
+pub enum DeviceName { Stm32f4, K64f, K64fBig, K64fMulti, Nrf52840, Nrf52840SpiFlash, }
 
 pub static ALL_DEVICES: &'static [DeviceName] = &[
     DeviceName::Stm32f4,
     DeviceName::K64f,
     DeviceName::K64fBig,
+    DeviceName::K64fMulti,
     DeviceName::Nrf52840,
     DeviceName::Nrf52840SpiFlash,
 ];
@@ -61,6 +62,7 @@
             DeviceName::Stm32f4 => "stm32f4",
             DeviceName::K64f => "k64f",
             DeviceName::K64fBig => "k64fbig",
+            DeviceName::K64fMulti => "k64fmulti",
             DeviceName::Nrf52840 => "nrf52840",
             DeviceName::Nrf52840SpiFlash => "Nrf52840SpiFlash",
         };