Skip to content
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

boot: zephyr: Update changed Nordic family Kconfig #1913

Merged
merged 1 commit into from
Mar 7, 2024
Merged

boot: zephyr: Update changed Nordic family Kconfig #1913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions boot/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ config BOOT_VALIDATE_SLOT0_ONCE

config BOOT_PREFER_SWAP_MOVE
bool "Prefer the newer swap move algorithm"
default y if SOC_FAMILY_NRF
default y if SOC_FAMILY_NORDIC_NRF
default y if !$(dt_nodelabel_enabled,scratch_partition)
help
If y, the BOOT_IMAGE_UPGRADE_MODE will default to using
Expand Down Expand Up @@ -661,13 +661,13 @@ endchoice
config BOOT_WATCHDOG_FEED
bool "Feed the watchdog while doing swap"
default y if WATCHDOG
default y if SOC_FAMILY_NRF
default y if SOC_FAMILY_NORDIC_NRF
# for nRF nrfx based implementation is available
imply NRFX_WDT if SOC_FAMILY_NRF
imply NRFX_WDT0 if SOC_FAMILY_NRF
imply NRFX_WDT1 if SOC_FAMILY_NRF
imply NRFX_WDT30 if SOC_FAMILY_NRF
imply NRFX_WDT31 if SOC_FAMILY_NRF
imply NRFX_WDT if SOC_FAMILY_NORDIC_NRF
imply NRFX_WDT0 if SOC_FAMILY_NORDIC_NRF
imply NRFX_WDT1 if SOC_FAMILY_NORDIC_NRF
imply NRFX_WDT30 if SOC_FAMILY_NORDIC_NRF
imply NRFX_WDT31 if SOC_FAMILY_NORDIC_NRF
help
Enables implementation of MCUBOOT_WATCHDOG_FEED() macro which is
used to feed watchdog while doing time consuming operations.
Expand Down Expand Up @@ -721,7 +721,7 @@ comment "Zephyr configuration options"
config MULTITHREADING
default y if BOOT_SERIAL_CDC_ACM #usb driver requires MULTITHREADING
default y if BOOT_USB_DFU_GPIO || BOOT_USB_DFU_WAIT
default n if SOC_FAMILY_NRF
default n if SOC_FAMILY_NORDIC_NRF
default n if SOC_FAMILY_ESPRESSIF_ESP32 && MCUBOOT
default y

Expand Down
2 changes: 1 addition & 1 deletion boot/zephyr/Kconfig.serial_recovery
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ config BOOT_SERIAL_MAX_RECEIVE_SIZE

config BOOT_ERASE_PROGRESSIVELY
bool "Erase flash progressively when receiving new firmware"
default y if SOC_FAMILY_NRF
default y if SOC_FAMILY_NORDIC_NRF
help
If enabled, flash is erased as necessary when receiving new firmware,
instead of erasing the whole image slot at once. This is necessary
Expand Down
4 changes: 2 additions & 2 deletions boot/zephyr/include/io/io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <stddef.h>

#ifdef CONFIG_SOC_FAMILY_NRF
#ifdef CONFIG_SOC_FAMILY_NORDIC_NRF
#include <helpers/nrfx_reset_reason.h>
#endif

Expand Down Expand Up @@ -62,7 +62,7 @@ bool io_detect_pin_reset(void);
*/
bool io_detect_boot_mode(void);

#ifdef CONFIG_SOC_FAMILY_NRF
#ifdef CONFIG_SOC_FAMILY_NORDIC_NRF
static inline bool io_boot_skip_serial_recovery()
{
uint32_t rr = nrfx_reset_reason_get();
Expand Down
Loading