nrfconnect · nordic-bami · Oct 21, 2025 · Oct 21, 2025 · Oct 24, 2025 · Oct 16, 2025
diff --git a/.github/test-spec.yml b/.github/test-spec.yml
diff --git a/.github/workflows/commit-tags.yml b/.github/workflows/commit-tags.yml
@@ -0,0 +1,31 @@
+name: Commit tags
+
+on:
+  pull_request:
+    types: [synchronize, opened, reopened, edited, labeled, unlabeled,
+            milestoned, demilestoned, assigned, unassigned, ready_for_review,
+            review_requested]
+
+permissions:
+  contents: read
+
+jobs:
+  commit_tags:
+    runs-on: ubuntu-22.04
+    name: Run commit tags checks on patch series (PR)
+    steps:
+    - name: Update PATH for west
+      run: |
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+    - name: Checkout the code
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+
+    - name: Run the commit tags
+      uses: nrfconnect/action-commit-tags@main
+      with:
+        target: .
+        upstream: zephyrproject-rtos/zephyr/main
diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml
@@ -34,8 +34,8 @@ jobs:
         git config --global user.name "Your Name"
         git remote -v
         # Ensure there's no merge commits in the PR
-        [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
-        (echo "::error ::Merge commits not allowed, rebase instead";false)
+        #[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
+        #(echo "::error ::Merge commits not allowed, rebase instead";false)
         rm -fr ".git/rebase-apply"
         rm -fr ".git/rebase-merge"
         git rebase origin/${BASE_REF}
@@ -72,12 +72,9 @@ jobs:
         git log  --pretty=oneline | head -n 10
         # Increase rename limit to allow for large PRs
         git config diff.renameLimit 10000
-        excludes="-e KconfigBasic -e SysbuildKconfigBasic -e ClangFormat"
-        # The signed-off-by check for dependabot should be skipped
-        if [ "${{ github.actor }}" == "dependabot[bot]" ]; then
-          excludes="$excludes -e Identity"
-        fi
-        ./scripts/ci/check_compliance.py --annotate $excludes -c origin/${BASE_REF}..
+        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e SysbuildKconfigBasic \
+        -e Kconfig -e SysbuildKconfig -e KconfigBasicNoModules -e SysbuildKconfigBasicNoModules \
+        -e ModulesMaintainers -c origin/${BASE_REF}..
 
     - name: upload-results
       uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2

diff --git a/.github/workflows/manifest-PR.yml b/.github/workflows/manifest-PR.yml
@@ -0,0 +1,19 @@
+name: handle manifest PR
+on:
+  pull_request_target:
+    types: [opened, synchronize, closed, reopened]
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  call-manifest-pr-action:
+    runs-on: ubuntu-latest
+    steps:
+      - name: handle manifest PR
+        uses: nrfconnect/action-manifest-pr@main
+        with:
+          token: ${{ secrets.NCS_GITHUB_TOKEN }}
+          manifest-pr-title-details: ${{ github.event.pull_request.title }}
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,5 @@
+@Library("CI_LIB") _
+
+def pipeline = new ncs.sdk_zephyr.Main()
+
+pipeline.run(JOB_NAME)
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
@@ -6,7 +6,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 source "Kconfig.constants"
-source "$(KCONFIG_ENV_FILE)"
 
 osource "$(APPLICATION_SOURCE_DIR)/VERSION"
 

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
@@ -1147,7 +1147,6 @@ Documentation:
     - doc/images/Zephyr-Kite-in-tree.png
     - doc/index-tex.rst
     - doc/index.rst
-    - doc/kconfig.rst
     - doc/templates/sample.tmpl
     - doc/templates/board.tmpl
     - boards/index.rst

diff --git a/arch/arm/core/cortex_m/pm_s2ram.c b/arch/arm/core/cortex_m/pm_s2ram.c
@@ -28,7 +28,7 @@ __noinit
 #endif
 _cpu_context_t _cpu_context;
 
-#ifndef CONFIG_PM_S2RAM_CUSTOM_MARKING
+#ifndef CONFIG_HAS_PM_S2RAM_CUSTOM_MARKING
 /**
  * S2RAM Marker
  */
@@ -50,4 +50,4 @@ bool pm_s2ram_mark_check_and_clear(void)
 	return false;
 }
 
-#endif /* CONFIG_PM_S2RAM_CUSTOM_MARKING */
+#endif /* CONFIG_HAS_PM_S2RAM_CUSTOM_MARKING */
diff --git a/arch/arm/core/cortex_m/reset.S b/arch/arm/core/cortex_m/reset.S
@@ -35,6 +35,10 @@ GTEXT(z_arm_init_arch_hw_at_boot)
 #if defined(CONFIG_PM_S2RAM)
 GTEXT(arch_pm_s2ram_resume)
 #endif
+#if defined(CONFIG_SOC_EARLY_RESET_HOOK)
+GTEXT(soc_early_reset_hook)
+#endif
+
 
 /*
  * PACBTI Mask for CONTROL register:
@@ -100,6 +104,10 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
 
 #endif /* CONFIG_INIT_ARCH_HW_AT_BOOT */
 
+#if defined(CONFIG_SOC_EARLY_RESET_HOOK)
+    /* Call custom code that executes before any stack is set up or RAM memory is accessed */
+    bl soc_early_reset_hook
+#endif
 #if defined(CONFIG_PM_S2RAM)
     /*
      * Temporarily set MSP to interrupt stack so that arch_pm_s2ram_resume can

diff --git a/arch/arm/core/mpu/arm_mpu_regions.c b/arch/arm/core/mpu/arm_mpu_regions.c
@@ -8,6 +8,9 @@
 #include <zephyr/arch/arm/mpu/arm_mpu.h>
 
 #include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#if USE_PARTITION_MANAGER
+#include <pm_config.h>
+#endif
 
 static const struct arm_mpu_region mpu_regions[] = {
 #ifdef CONFIG_XIP
@@ -24,13 +27,23 @@ static const struct arm_mpu_region mpu_regions[] = {
 
 	/* Region 1 */
 	MPU_REGION_ENTRY("SRAM_0",
+#if USE_PARTITION_MANAGER
+			 PM_SRAM_ADDRESS,
+#if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
+			 REGION_RAM_ATTR(PM_SRAM_ADDRESS, PM_SRAM_SIZE)),
+#else
+			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
+#endif
+#else
 			 CONFIG_SRAM_BASE_ADDRESS,
 #if defined(CONFIG_ARMV8_M_BASELINE) || defined(CONFIG_ARMV8_M_MAINLINE)
 			 REGION_RAM_ATTR(CONFIG_SRAM_BASE_ADDRESS, \
 				 CONFIG_SRAM_SIZE * 1024)),
 #else
 			 REGION_RAM_ATTR(REGION_SRAM_SIZE)),
 #endif
+
+#endif /* USE_PARTITION_MANAGER */
 };
 
 const struct arm_mpu_config mpu_config = {

diff --git a/arch/common/CMakeLists.txt b/arch/common/CMakeLists.txt
@@ -109,6 +109,9 @@ if (CONFIG_GEN_ISR_TABLES)
   add_dependencies(isr_tables zephyr_generated_headers)
   target_link_libraries(isr_tables zephyr_interface)
   zephyr_library_link_libraries(isr_tables)
+
+  zephyr_link_libraries($<TARGET_PROPERTY:linker,undefined>_sw_isr_table)
+  zephyr_link_libraries($<TARGET_PROPERTY:linker,undefined>_irq_vector_table)
 endif()
 
 if(CONFIG_COVERAGE)

diff --git a/arch/riscv/core/irq_manage.c b/arch/riscv/core/irq_manage.c
@@ -10,6 +10,7 @@
 #include <zephyr/arch/riscv/csr.h>
 #include <zephyr/irq_multilevel.h>
 #include <zephyr/sw_isr_table.h>
+#include <zephyr/pm/pm.h>
 
 #ifdef CONFIG_RISCV_HAS_PLIC
 #include <zephyr/drivers/interrupt_controller/riscv_plic.h>
@@ -75,3 +76,19 @@ int arch_irq_disconnect_dynamic(unsigned int irq, unsigned int priority,
 }
 #endif /* CONFIG_SHARED_INTERRUPTS */
 #endif /* CONFIG_DYNAMIC_INTERRUPTS */
+
+#ifdef CONFIG_PM
+void arch_isr_direct_pm(void)
+{
+	unsigned int key;
+
+	key = irq_lock();
+
+	if (_kernel.idle) {
+		_kernel.idle = 0;
+		pm_system_resume();
+	}
+
+	irq_unlock(key);
+}
+#endif
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/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns_defconfig b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns_defconfig
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
 # from the non secure application directly. This needs to be set
 # otherwise nrfx will try to configure them, resulting in a bus
 # fault.
-CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
+CONFIG_NRF_SKIP_CLOCK_CONFIG=y
diff --git a/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns_defconfig b/boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns_defconfig
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
 # from the non secure application directly. This needs to be set
 # otherwise nrfx will try to configure them, resulting in a bus
 # fault.
-CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
+CONFIG_NRF_SKIP_CLOCK_CONFIG=y
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/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns_defconfig b/boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns_defconfig
@@ -34,4 +34,4 @@ CONFIG_TFM_LOG_LEVEL_SILENCE=n
 # from the non secure application directly. This needs to be set
 # otherwise nrfx will try to configure them, resulting in a bus
 # fault.
-CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG=y
+CONFIG_NRF_SKIP_CLOCK_CONFIG=y
diff --git a/boards/index.rst b/boards/index.rst
@@ -12,33 +12,8 @@ template available under :zephyr_file:`doc/templates/board.tmpl`.
 Shields are hardware add-ons that can be stacked on top of a board to add extra functionality.
 Refer to the :ref:`shield_porting_guide` for more information on how to port a shield.
 
-.. admonition:: Search Tips
-   :class: dropdown
-
-   * Use the form below to filter the list of supported boards and shields. If a field is left
-     empty, it will not be used in the filtering process.
-
-   * Filtering by name and vendor is available for both boards and shields. The rest of the fields
-     apply only to boards.
-
-   * A board/shield must meet **all** criteria selected across different fields. For example, if you
-     select both a vendor and an architecture, only boards that match both will be displayed. Within
-     a single field, selecting multiple options (such as two architectures) will show boards
-     matching **either** option.
-
-   * The list of supported hardware features for each board is automatically generated using
-     information from the Devicetree. It may not be reflecting the full list of supported features
-     since some of them may not be enabled by default.
-
-   * Can't find your exact board? Don't worry! If a similar board with the same or a closely related
-     MCU exists, you can use it as a :ref:`starting point <create-your-board-directory>` for adding
-     support for your own board.
-
 .. toctree::
    :maxdepth: 2
    :glob:
-   :hidden:
 
    */index
-
-.. zephyr:board-catalog::
diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig
@@ -13,6 +13,7 @@ config MAX_THREAD_BYTES
 	default 3 if USERSPACE
 
 config ROM_START_OFFSET
+	default 0 if NCS_MCUBOOT_BOOTLOADER_SIGN_MERGED_BINARY
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 if !USE_DT_CODE_PARTITION
@@ -39,6 +40,7 @@ config MAX_THREAD_BYTES
 	default 3 if USERSPACE
 
 config ROM_START_OFFSET
+	default 0 if NCS_MCUBOOT_BOOTLOADER_SIGN_MERGED_BINARY
 	default 0x800 if BOOTLOADER_MCUBOOT
 
 endif # BOARD_NRF54H20DK_NRF54H20_CPURAD
diff --git a/boards/nordic/nrf54h20dk/Kconfig.sysbuild b/boards/nordic/nrf54h20dk/Kconfig.sysbuild
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF54H20DK_NRF54H20_CPURAD
+
+config NRF_DEFAULT_EMPTY
+	default y
+
+endif # BOARD_NRF54H20DK_NRF54H20_CPURAD
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
@@ -14,3 +14,43 @@ board:
     default: "0.9.0"
     revisions:
     - name: "0.9.0"
+runners:
+  run_once:
+    '--recover':
+    - runners:
+      - nrfutil
+      run: first
+      groups:
+      - boards:
+        - [email protected]/nrf54h20/cpuapp
+        - [email protected]/nrf54h20/cpurad
+        - [email protected]/nrf54h20/cpuppr
+        - [email protected]/nrf54h20/cpuppr/xip
+        - [email protected]/nrf54h20/cpuflpr
+        - [email protected]/nrf54h20/cpuflpr/xip
+    '--erase':
+    - runners:
+      - jlink
+      - nrfutil
+      run: first
+      groups:
+      - boards:
+        - [email protected]/nrf54h20/cpuapp
+        - [email protected]/nrf54h20/cpurad
+        - [email protected]/nrf54h20/cpuppr
+        - [email protected]/nrf54h20/cpuppr/xip
+        - [email protected]/nrf54h20/cpuflpr
+        - [email protected]/nrf54h20/cpuflpr/xip
+    '--reset':
+    - runners:
+      - jlink
+      - nrfutil
+      run: last
+      groups:
+      - boards:
+        - [email protected]/nrf54h20/cpuapp
+        - [email protected]/nrf54h20/cpurad
+        - [email protected]/nrf54h20/cpuppr
+        - [email protected]/nrf54h20/cpuppr/xip
+        - [email protected]/nrf54h20/cpuflpr
+        - [email protected]/nrf54h20/cpuflpr/xip
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -174,5 +174,34 @@
 		secondary_periphconf_partition: partition@1c0000 {
 			reg = <0x1c0000 DT_SIZE_K(8)>;
 		};
+
+		/* NB: A gap has been left here for future partitions */
+
+		/* 0x1fd000 was chosen for secure_storage_partition such that
+		 * there is no more space after secure_storage_partition.
+		 */
+		secure_storage_partition: partition@1fd000 {
+			compatible = "fixed-subpartitions";
+			reg = <0x1fd000 DT_SIZE_K(12)>;
+			ranges = <0x0 0x1fd000 0x3000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			cpuapp_crypto_partition: partition@0 {
+				reg = <0x0 DT_SIZE_K(4)>;
+			};
+
+			cpurad_crypto_partition: partition@1000 {
+				reg = <0x1000 DT_SIZE_K(4)>;
+			};
+
+			cpuapp_its_partition: partition@2000 {
+				reg = <0x2000 DT_SIZE_K(2)>;
+			};
+
+			cpurad_its_partition: partition@2800 {
+				reg = <0x2800 DT_SIZE_K(2)>;
+			};
+		};
 	};
 };