nrfconnect · rlubos · Jul 31, 2025 · Jul 28, 2025 · Jul 28, 2025 · Jul 28, 2025
diff --git a/boards/nordic/nrf21540dk/Kconfig.defconfig b/boards/nordic/nrf21540dk/Kconfig.defconfig
@@ -5,4 +5,7 @@
 
 if BOARD_NRF21540DK
 
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
 endif # BOARD_NRF21540DK
diff --git a/boards/nordic/nrf21540dk/nrf21540dk_nrf52840_defconfig b/boards/nordic/nrf21540dk/nrf21540dk_nrf52840_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/boards/nordic/nrf52833dk/Kconfig.defconfig b/boards/nordic/nrf52833dk/Kconfig.defconfig
@@ -5,4 +5,7 @@
 
 if BOARD_NRF52833DK
 
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
 endif # BOARD_NRF52833DK
diff --git a/boards/nordic/nrf52833dk/nrf52833dk_nrf52820_defconfig b/boards/nordic/nrf52833dk/nrf52833dk_nrf52820_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/boards/nordic/nrf52833dk/nrf52833dk_nrf52833_defconfig b/boards/nordic/nrf52833dk/nrf52833dk_nrf52833_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/boards/nordic/nrf52840dk/Kconfig.defconfig b/boards/nordic/nrf52840dk/Kconfig.defconfig
@@ -5,4 +5,7 @@
 
 if BOARD_NRF52840DK
 
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
 endif # BOARD_NRF52840DK
diff --git a/boards/nordic/nrf52840dk/nrf52840dk_nrf52811_defconfig b/boards/nordic/nrf52840dk/nrf52840dk_nrf52811_defconfig
@@ -5,9 +5,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # Enable UART
 CONFIG_SERIAL=y
 

diff --git a/boards/nordic/nrf52840dk/nrf52840dk_nrf52840_defconfig b/boards/nordic/nrf52840dk/nrf52840dk_nrf52840_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/boards/nordic/nrf52840dongle/Kconfig.defconfig b/boards/nordic/nrf52840dongle/Kconfig.defconfig
@@ -6,6 +6,9 @@
 
 if BOARD_NRF52840DONGLE
 
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
 # To let the nRF5 bootloader load an application, the application
 # must be linked after Nordic MBR, that is factory-programmed on the board.
 

diff --git a/boards/nordic/nrf52840dongle/nrf52840dongle_nrf52840_defconfig b/boards/nordic/nrf52840dongle/nrf52840dongle_nrf52840_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/boards/nordic/nrf52dk/Kconfig.defconfig b/boards/nordic/nrf52dk/Kconfig.defconfig
@@ -0,0 +1,11 @@
+# nRF52 DK board configuration
+
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF52DK
+
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
+endif # BOARD_NRF52DK
diff --git a/boards/nordic/nrf52dk/nrf52dk_nrf52805_defconfig b/boards/nordic/nrf52dk/nrf52dk_nrf52805_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # Enable GPIO
 CONFIG_GPIO=y
 

diff --git a/boards/nordic/nrf52dk/nrf52dk_nrf52810_defconfig b/boards/nordic/nrf52dk/nrf52dk_nrf52810_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/boards/nordic/nrf52dk/nrf52dk_nrf52832_defconfig b/boards/nordic/nrf52dk/nrf52dk_nrf52832_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/boards/nordic/nrf5340_audio_dk/Kconfig.defconfig b/boards/nordic/nrf5340_audio_dk/Kconfig.defconfig
@@ -3,6 +3,9 @@
 # Copyright (c) 2019 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
 if BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP || BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP_NS
 
 # Code Partition:

diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_defconfig b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_defconfig
@@ -3,8 +3,6 @@
 
 CONFIG_ARM_MPU=y
 
-CONFIG_HW_STACK_PROTECTION=y
-
 CONFIG_ARM_TRUSTZONE_M=y
 
 CONFIG_GPIO=y

diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_ns_defconfig
@@ -3,8 +3,6 @@
 
 CONFIG_ARM_MPU=y
 
-CONFIG_HW_STACK_PROTECTION=y
-
 CONFIG_ARM_TRUSTZONE_M=y
 CONFIG_TRUSTED_EXECUTION_NONSECURE=y
 

diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet_defconfig b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # Enable GPIO
 CONFIG_GPIO=y
 

diff --git a/boards/nordic/nrf5340dk/Kconfig.defconfig b/boards/nordic/nrf5340dk/Kconfig.defconfig
@@ -3,7 +3,10 @@
 # Copyright (c) 2019-2020 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if  BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
+if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 
 # Code Partition:
 #
@@ -29,29 +32,19 @@ if  BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 # For the non-secure version of the board, the firmware image SRAM is
 # always restricted to the allocated non-secure SRAM partition.
 #
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
 
 if BOARD_NRF5340DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE
 
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
 
 config SRAM_SIZE
 	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)
 
 endif # BOARD_NRF5340DK_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE
 
-if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
-
-config FLASH_LOAD_OFFSET
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-endif # BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+config BOARD_NRF5340DK
+	select USE_DT_CODE_PARTITION if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 
 config BT_HCI_IPC
 	default y if BT
@@ -60,8 +53,4 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	int
 	default 4096 if BT_HCI_IPC
 
-endif #  BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
-
-if BOARD_NRF5340DK_NRF5340_CPUNET
-
-endif # BOARD_NRF5340DK_NRF5340_CPUNET
+endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_defconfig b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # Enable TrustZone-M
 CONFIG_ARM_TRUSTZONE_M=y
 

diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns_defconfig b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # Enable TrustZone-M
 CONFIG_ARM_TRUSTZONE_M=y
 

diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet_defconfig b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet_defconfig
@@ -3,9 +3,6 @@
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig
@@ -1,6 +1,9 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
 if BOARD_NRF54H20DK_NRF54H20_CPUAPP
 
 config BT_HCI_IPC

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_defconfig b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_defconfig
@@ -11,9 +11,6 @@ CONFIG_UART_CONSOLE=y
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # MPU-based null-pointer dereferencing detection cannot be applied
 # as the (0x0 - 0x400) region is unmapped for this target.
 CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_defconfig b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_defconfig
@@ -13,9 +13,6 @@ CONFIG_USE_DT_CODE_PARTITION=y
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # MPU-based null-pointer dereferencing detection cannot be applied
 # as the (0x0 - 0x400) region is unmapped for this target.
 CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y

diff --git a/boards/nordic/nrf54l09pdk/Kconfig.defconfig b/boards/nordic/nrf54l09pdk/Kconfig.defconfig
@@ -3,6 +3,9 @@
 
 if BOARD_NRF54L09PDK_NRF54L09_CPUAPP
 
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
 config ROM_START_OFFSET
 	default 0x800 if BOOTLOADER_MCUBOOT
 

diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp_defconfig b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09_cpuapp_defconfig
@@ -13,6 +13,3 @@ CONFIG_GPIO=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -1,9 +1,8 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-# Workaround for not being able to have commas in macro arguments
-DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
-DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
 
 if BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
 	BOARD_NRF54L15DK_NRF54L15_CPUAPP
@@ -17,15 +16,13 @@ endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP ||
 
 if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS
 
+config BOARD_NRF54L15DK
+	select USE_DT_CODE_PARTITION if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || \
+		BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS
+
 config BT_CTLR
 	default BT
 
-config FLASH_LOAD_OFFSET
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
-config FLASH_LOAD_SIZE
-	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
-
 # By default, if we build for a Non-Secure version of the board,
 # enable building with TF-M as the Secure Execution Environment.
 config BUILD_WITH_TFM

diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp_defconfig
@@ -13,6 +13,3 @@ CONFIG_GPIO=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_defconfig
@@ -13,6 +13,3 @@ CONFIG_GPIO=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l10_cpuapp_ns_defconfig
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_ARM_MPU=y
-CONFIG_HW_STACK_PROTECTION=y
 CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
 CONFIG_ARM_TRUSTZONE_M=y
 

diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_defconfig
@@ -13,6 +13,3 @@ CONFIG_GPIO=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp_ns_defconfig
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_ARM_MPU=y
-CONFIG_HW_STACK_PROTECTION=y
 CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
 CONFIG_ARM_TRUSTZONE_M=y
 

diff --git a/boards/nordic/nrf54l20pdk/Kconfig.defconfig b/boards/nordic/nrf54l20pdk/Kconfig.defconfig
@@ -3,6 +3,9 @@
 
 if BOARD_NRF54L20PDK_NRF54L20_CPUAPP
 
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
+
 config ROM_START_OFFSET
 	default 0x800 if BOOTLOADER_MCUBOOT
 

diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp_defconfig b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20_cpuapp_defconfig
@@ -13,6 +13,3 @@ CONFIG_GPIO=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y