boot: zephyr: Update changed Nordic family Kconfig

Updates a Kconfig that was renamed

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

boot/zephyr/Kconfig

@@ -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
@@ -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.
@@ -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
 

boot/zephyr/Kconfig.serial_recovery

@@ -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

boot/zephyr/include/io/io.h

@@ -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
 
@@ -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();