diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2023-04-04 21:00:11 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-04-04 21:00:11 +0000 |
| commit | 064ec9581e33fdd42f89ff75984254ccfec3f6c2 (patch) | |
| tree | 55438e15f173ab3ce23f48ede11876e1a8aab23e /examples/boot/bootloader/nrf/src | |
| parent | 5923e143e35547b1972f2e48082e93dfbe1dadac (diff) | |
| parent | 84bfe9b8c93ea8634ce2192fb719034b5c13e5da (diff) | |
Merge #1329
1329: Reduce bootloader memory usage r=rmja a=rmja
By not requiring that the provided buffer must be able to contain one "erase-size" bytes.
This PR is the successor of #1314 and replaces it entirely.
Co-authored-by: Rasmus Melchior Jacobsen <[email protected]>
Diffstat (limited to 'examples/boot/bootloader/nrf/src')
| -rw-r--r-- | examples/boot/bootloader/nrf/src/main.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/examples/boot/bootloader/nrf/src/main.rs b/examples/boot/bootloader/nrf/src/main.rs index aca3b857a..8818a23b8 100644 --- a/examples/boot/bootloader/nrf/src/main.rs +++ b/examples/boot/bootloader/nrf/src/main.rs | |||
| @@ -27,9 +27,11 @@ fn main() -> ! { | |||
| 27 | wdt_config.run_during_sleep = true; | 27 | wdt_config.run_during_sleep = true; |
| 28 | wdt_config.run_during_debug_halt = false; | 28 | wdt_config.run_during_debug_halt = false; |
| 29 | 29 | ||
| 30 | let start = bl.prepare(&mut SingleFlashConfig::new(&mut BootFlash::<_, 4096>::new( | 30 | let start = bl.prepare(&mut SingleFlashConfig::new(&mut BootFlash::new(WatchdogFlash::start( |
| 31 | WatchdogFlash::start(Nvmc::new(p.NVMC), p.WDT, wdt_config), | 31 | Nvmc::new(p.NVMC), |
| 32 | ))); | 32 | p.WDT, |
| 33 | wdt_config, | ||
| 34 | )))); | ||
| 33 | unsafe { bl.load(start) } | 35 | unsafe { bl.load(start) } |
| 34 | } | 36 | } |
| 35 | 37 | ||
