aboutsummaryrefslogtreecommitdiff
path: root/embassy-boot/src/firmware_updater/blocking.rs
diff options
context:
space:
mode:
Diffstat (limited to 'embassy-boot/src/firmware_updater/blocking.rs')
-rw-r--r--embassy-boot/src/firmware_updater/blocking.rs43
1 files changed, 37 insertions, 6 deletions
diff --git a/embassy-boot/src/firmware_updater/blocking.rs b/embassy-boot/src/firmware_updater/blocking.rs
index 514070639..3e83366af 100644
--- a/embassy-boot/src/firmware_updater/blocking.rs
+++ b/embassy-boot/src/firmware_updater/blocking.rs
@@ -16,12 +16,43 @@ pub struct BlockingFirmwareUpdater<'d, DFU: NorFlash, STATE: NorFlash> {
16} 16}
17 17
18#[cfg(target_os = "none")] 18#[cfg(target_os = "none")]
19impl<'a, FLASH: NorFlash> 19impl<'a, DFU: NorFlash, STATE: NorFlash>
20 FirmwareUpdaterConfig<BlockingPartition<'a, NoopRawMutex, FLASH>, BlockingPartition<'a, NoopRawMutex, FLASH>> 20 FirmwareUpdaterConfig<BlockingPartition<'a, NoopRawMutex, DFU>, BlockingPartition<'a, NoopRawMutex, STATE>>
21{ 21{
22 /// Create a firmware updater config from the flash and address symbols defined in the linkerfile 22 /// Constructs a `FirmwareUpdaterConfig` instance from flash memory and address symbols defined in the linker file.
23 ///
24 /// This method initializes `BlockingPartition` instances for the DFU (Device Firmware Update), and state
25 /// partitions, leveraging start and end addresses specified by the linker. These partitions are critical
26 /// for managing firmware updates, application state, and boot operations within the bootloader.
27 ///
28 /// # Parameters
29 /// - `dfu_flash`: A reference to a mutex-protected `RefCell` for the DFU partition's flash interface.
30 /// - `state_flash`: A reference to a mutex-protected `RefCell` for the state partition's flash interface.
31 ///
32 /// # Safety
33 /// The method contains `unsafe` blocks for dereferencing raw pointers that represent the start and end addresses
34 /// of the bootloader's partitions in flash memory. It is crucial that these addresses are accurately defined
35 /// in the memory.x file to prevent undefined behavior.
36 ///
37 /// The caller must ensure that the memory regions defined by these symbols are valid and that the flash memory
38 /// interfaces provided are compatible with these regions.
39 ///
40 /// # Returns
41 /// A `FirmwareUpdaterConfig` instance with `BlockingPartition` instances for the DFU, and state partitions.
42 ///
43 /// # Example
44 /// ```ignore
45 /// // Assume `dfu_flash`, and `state_flash` share the same flash memory interface.
46 /// let layout = Flash::new_blocking(p.FLASH).into_blocking_regions();
47 /// let flash = Mutex::new(RefCell::new(layout.bank1_region));
48 ///
49 /// let config = FirmwareUpdaterConfig::from_linkerfile_blocking(&flash, &flash);
50 /// // `config` can now be used to create a `FirmwareUpdater` instance for managing boot operations.
51 /// ```
52 /// Working examples can be found in the bootloader examples folder.
23 pub fn from_linkerfile_blocking( 53 pub fn from_linkerfile_blocking(
24 flash: &'a embassy_sync::blocking_mutex::Mutex<NoopRawMutex, core::cell::RefCell<FLASH>>, 54 dfu_flash: &'a embassy_sync::blocking_mutex::Mutex<NoopRawMutex, core::cell::RefCell<DFU>>,
55 state_flash: &'a embassy_sync::blocking_mutex::Mutex<NoopRawMutex, core::cell::RefCell<STATE>>,
25 ) -> Self { 56 ) -> Self {
26 extern "C" { 57 extern "C" {
27 static __bootloader_state_start: u32; 58 static __bootloader_state_start: u32;
@@ -35,14 +66,14 @@ impl<'a, FLASH: NorFlash>
35 let end = &__bootloader_dfu_end as *const u32 as u32; 66 let end = &__bootloader_dfu_end as *const u32 as u32;
36 trace!("DFU: 0x{:x} - 0x{:x}", start, end); 67 trace!("DFU: 0x{:x} - 0x{:x}", start, end);
37 68
38 BlockingPartition::new(flash, start, end - start) 69 BlockingPartition::new(dfu_flash, start, end - start)
39 }; 70 };
40 let state = unsafe { 71 let state = unsafe {
41 let start = &__bootloader_state_start as *const u32 as u32; 72 let start = &__bootloader_state_start as *const u32 as u32;
42 let end = &__bootloader_state_end as *const u32 as u32; 73 let end = &__bootloader_state_end as *const u32 as u32;
43 trace!("STATE: 0x{:x} - 0x{:x}", start, end); 74 trace!("STATE: 0x{:x} - 0x{:x}", start, end);
44 75
45 BlockingPartition::new(flash, start, end - start) 76 BlockingPartition::new(state_flash, start, end - start)
46 }; 77 };
47 78
48 Self { dfu, state } 79 Self { dfu, state }