Add bootloader to CI

2 files changed, 7 insertions, 19 deletions

diff --git a/embassy-boot/stm32/src/lib.rs b/embassy-boot/stm32/src/lib.rs
index d1754a310..68220780c 100644
--- a/embassy-boot/stm32/src/lib.rs
+++ b/embassy-boot/stm32/src/lib.rs
@@ -5,12 +5,13 @@
 mod fmt;
 
 pub use embassy_boot::{FirmwareUpdater, FlashProvider, Partition, SingleFlashProvider, State};
+use embassy_stm32::flash::{ERASE_SIZE, ERASE_VALUE, WRITE_SIZE};
 
-pub struct BootLoader<const PAGE_SIZE: usize> {
-    boot: embassy_boot::BootLoader<PAGE_SIZE>,
+pub struct BootLoader {
+    boot: embassy_boot::BootLoader<ERASE_SIZE, WRITE_SIZE, ERASE_VALUE>,
 }
 
-impl<const PAGE_SIZE: usize> BootLoader<PAGE_SIZE> {
+impl BootLoader {
     /// Create a new bootloader instance using parameters from linker script
     pub fn default() -> Self {
         extern "C" {
@@ -65,6 +66,7 @@ impl<const PAGE_SIZE: usize> BootLoader<PAGE_SIZE> {
 
     pub unsafe fn load(&mut self, start: usize) -> ! {
         trace!("Loading app at 0x{:x}", start);
+        #[allow(unused_mut)]
         let mut p = cortex_m::Peripherals::steal();
         #[cfg(not(feature = "thumbv6"))]
         p.SCB.invalidate_icache();
diff --git a/embassy-boot/stm32/src/main.rs b/embassy-boot/stm32/src/main.rs
index 6fe0fb66d..563bc55d3 100644
--- a/embassy-boot/stm32/src/main.rs
+++ b/embassy-boot/stm32/src/main.rs
@@ -9,9 +9,6 @@ use defmt_rtt as _;
 use embassy_boot_stm32::*;
 use embassy_stm32::flash::Flash;
 
-#[cfg(not(any(feature = "flash-2k", feature = "flash-256", feature = "flash-128")))]
-compile_error!("No flash size specified. Must specify exactly one of the following features: flash-2k, flash-256, flash-128");
-
 #[entry]
 fn main() -> ! {
     let p = embassy_stm32::init(Default::default());
@@ -24,15 +21,7 @@ fn main() -> ! {
         }
     */
 
-    #[cfg(feature = "flash-2k")]
-    let mut bl: BootLoader<2048> = BootLoader::default();
-
-    #[cfg(feature = "flash-256")]
-    let mut bl: BootLoader<256> = BootLoader::default();
-
-    #[cfg(feature = "flash-128")]
-    let mut bl: BootLoader<128> = BootLoader::default();
-
+    let mut bl = BootLoader::default();
     let mut flash = Flash::unlock(p.FLASH);
     let start = bl.prepare(&mut SingleFlashProvider::new(&mut flash));
     core::mem::drop(flash);
@@ -55,8 +44,5 @@ unsafe fn DefaultHandler(_: i16) -> ! {
 
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
-    unsafe {
-        cortex_m::asm::udf();
-        core::hint::unreachable_unchecked();
-    }
+    cortex_m::asm::udf();
 }