diff options
Diffstat (limited to 'embassy-boot/src/firmware_updater/asynch.rs')
| -rw-r--r-- | embassy-boot/src/firmware_updater/asynch.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/embassy-boot/src/firmware_updater/asynch.rs b/embassy-boot/src/firmware_updater/asynch.rs index 2e43e1cc1..668f16f16 100644 --- a/embassy-boot/src/firmware_updater/asynch.rs +++ b/embassy-boot/src/firmware_updater/asynch.rs | |||
| @@ -16,11 +16,14 @@ 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, FLASH: NorFlash> | 19 | impl<'a, DFU: NorFlash, STATE: NorFlash> |
| 20 | FirmwareUpdaterConfig<Partition<'a, NoopRawMutex, FLASH>, Partition<'a, NoopRawMutex, FLASH>> | 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(flash: &'a embassy_sync::mutex::Mutex<NoopRawMutex, FLASH>) -> Self { | 23 | pub fn from_linkerfile( |
| 24 | dfu_flash: &'a embassy_sync::mutex::Mutex<NoopRawMutex, DFU>, | ||
| 25 | state_flash: &'a embassy_sync::mutex::Mutex<NoopRawMutex, STATE>, | ||
| 26 | ) -> Self { | ||
| 24 | extern "C" { | 27 | extern "C" { |
| 25 | static __bootloader_state_start: u32; | 28 | static __bootloader_state_start: u32; |
| 26 | static __bootloader_state_end: u32; | 29 | static __bootloader_state_end: u32; |
| @@ -33,14 +36,14 @@ impl<'a, FLASH: NorFlash> | |||
| 33 | let end = &__bootloader_dfu_end as *const u32 as u32; | 36 | let end = &__bootloader_dfu_end as *const u32 as u32; |
| 34 | trace!("DFU: 0x{:x} - 0x{:x}", start, end); | 37 | trace!("DFU: 0x{:x} - 0x{:x}", start, end); |
| 35 | 38 | ||
| 36 | Partition::new(flash, start, end - start) | 39 | Partition::new(dfu_flash, start, end - start) |
| 37 | }; | 40 | }; |
| 38 | let state = unsafe { | 41 | let state = unsafe { |
| 39 | let start = &__bootloader_state_start as *const u32 as u32; | 42 | let start = &__bootloader_state_start as *const u32 as u32; |
| 40 | let end = &__bootloader_state_end as *const u32 as u32; | 43 | let end = &__bootloader_state_end as *const u32 as u32; |
| 41 | trace!("STATE: 0x{:x} - 0x{:x}", start, end); | 44 | trace!("STATE: 0x{:x} - 0x{:x}", start, end); |
| 42 | 45 | ||
| 43 | Partition::new(flash, start, end - start) | 46 | Partition::new(state_flash, start, end - start) |
| 44 | }; | 47 | }; |
| 45 | 48 | ||
| 46 | Self { dfu, state } | 49 | Self { dfu, state } |
