Skip to content

Commit 01bad68

Browse files
Damian-Nordicnordicjm
authored andcommitted
[nrf noup] zephyr: Restore default RTC user channel count
The default value of CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT for nRF52 SOCs has been changed from 0 to 3, but it makes MCUBoot get stuck on erasing flash pages when swapping two images. Restore the previous value until the RTC issue is resolved (see NCSDK-14427) Signed-off-by: Damian Krolik <[email protected]> Signed-off-by: Torsten Rasmussen <[email protected]> Signed-off-by: Jamie McCrae <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> (cherry picked from commit 3957a30)
1 parent 610e812 commit 01bad68

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

boot/zephyr/prj.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ CONFIG_LOG_DEFAULT_LEVEL=0
3232
CONFIG_MCUBOOT_LOG_LEVEL_INF=y
3333
### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y
3434
CONFIG_CBPRINTF_NANO=y
35+
<<<<<<< HEAD
3536
### Use picolibc to reduce flash usage
3637
CONFIG_PICOLIBC=y
3738
### Disable malloc arena because we don't need it
3839
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
40+
CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0

0 commit comments

Comments
 (0)