diff options
Diffstat (limited to 'embassy-boot/src/firmware_updater')
| -rw-r--r-- | embassy-boot/src/firmware_updater/asynch.rs | 8 | ||||
| -rw-r--r-- | embassy-boot/src/firmware_updater/blocking.rs | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/embassy-boot/src/firmware_updater/asynch.rs b/embassy-boot/src/firmware_updater/asynch.rs index 5634b48d4..668f16f16 100644 --- a/embassy-boot/src/firmware_updater/asynch.rs +++ b/embassy-boot/src/firmware_updater/asynch.rs | |||
| @@ -16,13 +16,13 @@ pub struct FirmwareUpdater<'d, DFU: NorFlash, STATE: NorFlash> { | |||
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | #[cfg(target_os = "none")] | 18 | #[cfg(target_os = "none")] |
| 19 | impl<'a, DFUFlash: NorFlash, StateFlash: NorFlash> | 19 | impl<'a, DFU: NorFlash, STATE: NorFlash> |
| 20 | FirmwareUpdaterConfig<Partition<'a, NoopRawMutex, DFUFlash>, Partition<'a, NoopRawMutex, StateFlash>> | 20 | FirmwareUpdaterConfig<Partition<'a, NoopRawMutex, DFU>, Partition<'a, NoopRawMutex, STATE>> |
| 21 | { | 21 | { |
| 22 | /// Create a firmware updater config from the flash and address symbols defined in the linkerfile | 22 | /// Create a firmware updater config from the flash and address symbols defined in the linkerfile |
| 23 | pub fn from_linkerfile( | 23 | pub fn from_linkerfile( |
| 24 | dfu_flash: &'a embassy_sync::mutex::Mutex<NoopRawMutex, DFUFlash>, | 24 | dfu_flash: &'a embassy_sync::mutex::Mutex<NoopRawMutex, DFU>, |
| 25 | state_flash: &'a embassy_sync::mutex::Mutex<NoopRawMutex, StateFlash>, | 25 | state_flash: &'a embassy_sync::mutex::Mutex<NoopRawMutex, STATE>, |
| 26 | ) -> Self { | 26 | ) -> Self { |
| 27 | extern "C" { | 27 | extern "C" { |
| 28 | static __bootloader_state_start: u32; | 28 | static __bootloader_state_start: u32; |
diff --git a/embassy-boot/src/firmware_updater/blocking.rs b/embassy-boot/src/firmware_updater/blocking.rs index 3814b6c31..cf850fce3 100644 --- a/embassy-boot/src/firmware_updater/blocking.rs +++ b/embassy-boot/src/firmware_updater/blocking.rs | |||
| @@ -16,16 +16,13 @@ pub struct BlockingFirmwareUpdater<'d, DFU: NorFlash, STATE: NorFlash> { | |||
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | #[cfg(target_os = "none")] | 18 | #[cfg(target_os = "none")] |
| 19 | impl<'a, DFUFlash: NorFlash, StateFlash: NorFlash> | 19 | impl<'a, DFU: NorFlash, STATE: NorFlash> |
| 20 | FirmwareUpdaterConfig< | 20 | FirmwareUpdaterConfig<BlockingPartition<'a, NoopRawMutex, DFU>, BlockingPartition<'a, NoopRawMutex, STATE>> |
| 21 | BlockingPartition<'a, NoopRawMutex, DFUFlash>, | ||
| 22 | BlockingPartition<'a, NoopRawMutex, StateFlash>, | ||
| 23 | > | ||
| 24 | { | 21 | { |
| 25 | /// Create a firmware updater config from the flash and address symbols defined in the linkerfile | 22 | /// Create a firmware updater config from the flash and address symbols defined in the linkerfile |
| 26 | pub fn from_linkerfile_blocking( | 23 | pub fn from_linkerfile_blocking( |
| 27 | dfu_flash: &'a embassy_sync::blocking_mutex::Mutex<NoopRawMutex, core::cell::RefCell<DFUFlash>>, | 24 | dfu_flash: &'a embassy_sync::blocking_mutex::Mutex<NoopRawMutex, core::cell::RefCell<DFU>>, |
| 28 | state_flash: &'a embassy_sync::blocking_mutex::Mutex<NoopRawMutex, core::cell::RefCell<StateFlash>>, | 25 | state_flash: &'a embassy_sync::blocking_mutex::Mutex<NoopRawMutex, core::cell::RefCell<STATE>>, |
| 29 | ) -> Self { | 26 | ) -> Self { |
| 30 | extern "C" { | 27 | extern "C" { |
| 31 | static __bootloader_state_start: u32; | 28 | static __bootloader_state_start: u32; |
