nrfconnect · nordicjm · Sep 30, 2025 · Sep 12, 2025 · Sep 25, 2025 · Sep 25, 2025
diff --git a/boards/ezurio/bl54l15_dvk/Kconfig.defconfig b/boards/ezurio/bl54l15_dvk/Kconfig.defconfig
@@ -6,13 +6,6 @@
 DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
 DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
 
-if BOARD_BL54L15_DVK_NRF54L10_CPUAPP || BOARD_BL54L15_DVK_NRF54L15_CPUAPP
-
-config ROM_START_OFFSET
-	default 0x800 if BOOTLOADER_MCUBOOT
-
-endif # BOARD_BL54L15_DVK_NRF54L10_CPUAPP || BOARD_BL54L15_DVK_NRF54L15_CPUAPP
-
 if BOARD_BL54L15_DVK_NRF54L10_CPUAPP_NS || BOARD_BL54L15_DVK_NRF54L15_CPUAPP_NS
 
 config HAS_BT_CTLR

diff --git a/boards/ezurio/bl54l15u_dvk/Kconfig.defconfig b/boards/ezurio/bl54l15u_dvk/Kconfig.defconfig
@@ -6,13 +6,6 @@
 DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
 DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
 
-if BOARD_BL54L15U_DVK_NRF54L15_CPUAPP
-
-config ROM_START_OFFSET
-	default 0x800 if BOOTLOADER_MCUBOOT
-
-endif # BOARD_BL54L15U_DVK_NRF54L15_CPUAPP
-
 if BOARD_BL54L15U_DVK_NRF54L15_CPUAPP_NS
 
 config HAS_BT_CTLR

diff --git a/boards/nordic/nrf54l15dk/Kconfig.defconfig b/boards/nordic/nrf54l15dk/Kconfig.defconfig
@@ -4,16 +4,6 @@
 config HW_STACK_PROTECTION
 	default ARCH_HAS_STACK_PROTECTION
 
-if BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
-	BOARD_NRF54L15DK_NRF54L15_CPUAPP
-
-config ROM_START_OFFSET
-	default 0 if PARTITION_MANAGER_ENABLED
-	default 0x800 if BOOTLOADER_MCUBOOT
-
-endif # BOARD_NRF54L15DK_NRF54L05_CPUAPP || BOARD_NRF54L15DK_NRF54L10_CPUAPP || \
-	# BOARD_NRF54L15DK_NRF54L15_CPUAPP
-
 if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || BOARD_NRF54L15DK_NRF54L10_CPUAPP_NS
 
 config BOARD_NRF54L15DK

diff --git a/boards/nordic/nrf54lm20dk/Kconfig.defconfig b/boards/nordic/nrf54lm20dk/Kconfig.defconfig
@@ -6,8 +6,4 @@ if BOARD_NRF54LM20DK_NRF54LM20A_CPUAPP
 config HW_STACK_PROTECTION
 	default ARCH_HAS_STACK_PROTECTION
 
-config ROM_START_OFFSET
-	default 0 if PARTITION_MANAGER_ENABLED
-	default 0x800 if BOOTLOADER_MCUBOOT
-
 endif # BOARD_NRF54LM20DK_NRF54LM20A_CPUAPP
diff --git a/boards/panasonic/panb611evb/Kconfig.defconfig b/boards/panasonic/panb611evb/Kconfig.defconfig
@@ -5,13 +5,6 @@
 DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
 DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
 
-if BOARD_PANB611EVB_NRF54L15_CPUAPP
-
-config ROM_START_OFFSET
-	default 0x800 if BOOTLOADER_MCUBOOT
-
-endif # BOARD_PANB611EVB_NRF54L15_CPUAPP
-
 if BOARD_PANB611EVB_NRF54L15_CPUAPP_NS
 
 config HAS_BT_CTLR

diff --git a/boards/raytac/an54l15q_db/Kconfig.defconfig b/boards/raytac/an54l15q_db/Kconfig.defconfig
@@ -6,13 +6,6 @@
 DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
 DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
 
-if BOARD_RAYTAC_AN54L15Q_DB_NRF54L15_CPUAPP
-
-config ROM_START_OFFSET
-	default 0x800 if BOOTLOADER_MCUBOOT
-
-endif # BOARD_RAYTAC_AN54L15Q_DB_NRF54L15_CPUAPP
-
 if BOARD_RAYTAC_AN54L15Q_DB_NRF54L15_CPUAPP_NS
 
 config HAS_BT_CTLR

diff --git a/boards/seeed/xiao_nrf54l15/Kconfig.defconfig b/boards/seeed/xiao_nrf54l15/Kconfig.defconfig
@@ -5,7 +5,4 @@ if BOARD_XIAO_NRF54L15_NRF54L15_CPUAPP
 config HAS_BT_CTLR
 	default BT
 
-config ROM_START_OFFSET
-	default 0x800 if BOOTLOADER_MCUBOOT
-
 endif # BOARD_XIAO_NRF54L15_NRF54L15_CPUAPP
diff --git a/boards/we/ophelia4ev/Kconfig.defconfig b/boards/we/ophelia4ev/Kconfig.defconfig
@@ -1,9 +1,5 @@
 # Copyright (c) 2025 Würth Elektronik eiSos GmbH & Co. KG
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_OPHELIA4EV_NRF54L15_CPUAPP
-
-config ROM_START_OFFSET
-	default 0x800 if BOOTLOADER_MCUBOOT
-
-endif # BOARD_OPHELIA4EV_NRF54L15_CPUAPP
+config HW_STACK_PROTECTION
+	default ARCH_HAS_STACK_PROTECTION
diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp.dts
@@ -15,14 +15,20 @@
 	chosen {
 		zephyr,console = &uart20;
 		zephyr,shell-uart = &uart20;
-		zephyr,code-partition = &slot0_partition;
-		zephyr,flash = &cpuapp_rram;
-		zephyr,sram = &cpuapp_sram;
 		zephyr,uart-mcumgr = &uart20;
 		zephyr,bt-mon-uart = &uart20;
 		zephyr,bt-c2h-uart = &uart20;
 		zephyr,flash-controller = &rram_controller;
+		zephyr,flash = &cpuapp_rram;
 		zephyr,ieee802154 = &ieee802154;
+		zephyr,boot-mode = &boot_mode0;
+		zephyr,code-partition = &slot0_partition;
+		zephyr,sram = &cpuapp_sram;
+	};
+
+	aliases {
+		mcuboot-button0 = &button0;
+		mcuboot-led0 = &led0;
 	};
 };
 
@@ -32,7 +38,7 @@
 
 &lfxo {
 	load-capacitors = "internal";
-	load-capacitance-femtofarad = <15500>;
+	load-capacitance-femtofarad = <17000>;
 };
 
 &hfxo {
@@ -63,6 +69,10 @@
 	status = "okay";
 };
 
+&nfct {
+	status = "okay";
+};
+
 &gpio0 {
 	status = "okay";
 };
@@ -99,6 +109,16 @@
 	status = "okay";
 };
 
+&gpregret1 {
+	status = "okay";
+
+	boot_mode0: boot_mode@0 {
+		compatible = "zephyr,retention";
+		status = "okay";
+		reg = <0x0 0x1>;
+	};
+};
+
 &spi00 {
 	status = "okay";
 
@@ -126,6 +146,7 @@
 		has-dpd;
 		t-enter-dpd = <10000>;
 		t-exit-dpd = <35000>;
+		reset-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
 	};
 };
 

diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp_defconfig b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuapp_defconfig
@@ -14,8 +14,5 @@ CONFIG_GPIO=y
 # Enable MPU
 CONFIG_ARM_MPU=y
 
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
 # Use internal LFCLK
 CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
diff --git a/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr.yaml b/boards/we/ophelia4ev/ophelia4ev_nrf54l15_cpuflpr.yaml
@@ -15,4 +15,3 @@ supported:
   - gpio
   - i2c
   - spi
-  - watchdog
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig b/soc/nordic/nrf54l/Kconfig.defconfig
@@ -32,6 +32,10 @@ choice NULL_POINTER_EXCEPTION_DETECTION
 	default NULL_POINTER_EXCEPTION_DETECTION_NONE
 endchoice
 
+config ROM_START_OFFSET
+	default 0 if PARTITION_MANAGER_ENABLED
+	default 0x800 if BOOTLOADER_MCUBOOT
+
 endif # ARM
 
 if RISCV
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,4 +15,3 @@ supported: @@
       - gpio
       - i2c
       - spi
-      - watchdog