Skip to content

Revert "[nrf noup] zephyr: Restore default RTC user channel count" #518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 27, 2025
Merged

Revert "[nrf noup] zephyr: Restore default RTC user channel count" #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2af8b31
Revert "[nrf noup] boot: zephyr: Add NCS boot banner"
nordicjm Aug 26, 2025
73b97c0
Revert "[nrf noup] zephyr: Restore default RTC user channel count"
nordicjm Aug 26, 2025
f7b0ac7
[nrf noup] boot: zephyr: Add NCS boot banner
nordicjm Jun 11, 2024
5f9bb85
[nrf noup] boot: zephyr: firmware_loader: Allow GPIO usage in BM
nordicjm Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boot/zephyr/Kconfig.firmware_loader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ menu "Firmware loader entrance methods"

menuconfig BOOT_FIRMWARE_LOADER_ENTRANCE_GPIO
bool "GPIO"
depends on GPIO
depends on GPIO || NCS_BM
help
Use a GPIO to enter firmware loader mode.

Expand Down
1 change: 0 additions & 1 deletion boot/zephyr/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ CONFIG_CBPRINTF_NANO=y
CONFIG_PICOLIBC=y
### Disable malloc arena because we don't need it
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0

# NCS boot banner
CONFIG_NCS_APPLICATION_BOOT_BANNER_STRING="MCUboot"