manifest: Update NCS reference to NCS 3.4.x

Update NCS reference to NCS 3.4.x, most notable changes:
 - Add DTS memory partitions for flash and SRAM, adopt the same
   partitioning for both the nRF9151 DK and Thingy:91 X.
 - Align MCUBoot configuration across the two boards and add MCUBoot
   bootloader FOTA test.
 - Bump version of Zephyr containers and address issues app size script
   as a consequence.
 - Documentation updates.

Signed-off-by: Simen S. Røstad <simen.rostad@nordicsemi.no>

Author: simensrostad

.github/actions/build-step/action.yml

@@ -62,12 +62,14 @@ runs:
             echo CONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y >> overlay-debug-att.conf
           fi
           params+=("-DEXTRA_CONF_FILE=overlay-debug-att.conf")
+          params+=("-DEXTRA_DTC_OVERLAY_FILE=overlay-upload-modem-traces-to-memfault.overlay")
         fi
         if [[ "${{ inputs.mqtt }}" == "true" ]]; then
           params+=("-DEXTRA_CONF_FILE=$(pwd)/../examples/modules/cloud/overlay-mqtt.conf")
         fi
         if [[ "${{ inputs.modem_trace }}" == "true" ]]; then
-          params+=("-Dapp_SNIPPET=nrf91-modem-trace-uart")
+          params+=("-DEXTRA_CONF_FILE=overlay-modem-trace-over-uart.conf")
+          params+=("-DEXTRA_DTC_OVERLAY_FILE=overlay-modem-trace-shmem.overlay")
         fi
         if [[ "${{ inputs.external_gnss }}" == "true" ]]; then
           echo "CONFIG_MODEM_ANTENNA_GNSS_EXTERNAL=y" > overlay-external-gnss.conf
@@ -113,10 +115,3 @@ runs:
           artifacts/asset-tracker-template-${{ inputs.version }}-${{ inputs.short_board }}-nrf91.elf
         cp ${{ inputs.path }}/build/dfu_application.zip \
           artifacts/asset-tracker-template-${{ inputs.version }}-${{ inputs.short_board }}-nrf91-dfu.zip
-        cd ${{ inputs.path }}/build
-        ninja partition_manager_report > partition_manager_report.txt
-
-    - name: Generate Partition Manager Report
-      shell: bash
-      run: |
-        sed '1d' ${{ inputs.path }}/build/partition_manager_report.txt > artifacts/pmr-${{ inputs.short_board }}-nrf91-default-${{ inputs.version }}.txt

.github/workflows/attach_release_assets.yml

@@ -38,7 +38,6 @@ jobs:
             fail_on_unmatched_files: true
             files: |
               asset-tracker-template-*.*
-              pmr-*-nrf91-*.txt
 
         - name: Trigger workflow that publishes symbol files to Memfault
           working-directory: .github/workflows

.github/workflows/build-and-target-test.yml

@@ -33,6 +33,12 @@ on:
         type: boolean
         required: false
         default: false
+      test_filter:
+        description: 'Pytest -k expression to isolate tests (e.g. "test_app_fota").
+                      Leave empty to run all tests for the selected devices.'
+        type: string
+        required: false
+        default: ""
 
   workflow_call:
     inputs:
@@ -157,3 +163,4 @@ jobs:
       artifact_run_id: ${{ needs.build.outputs.run_id }}
       devices: ${{ needs.setup.outputs.devices }}
       run_nightly_tests: ${{ needs.setup.outputs.run_nightly_tests == 'true' }}
+      pytest_args: ${{ inputs.test_filter != '' && format('-k "{0}"', inputs.test_filter) || '' }}

.github/workflows/build.yml

@@ -62,7 +62,7 @@ concurrency:
 jobs:
   build:
     runs-on: build_self_hosted
-    container: ghcr.io/zephyrproject-rtos/ci:v0.28.7
+    container: ghcr.io/zephyrproject-rtos/ci:v0.29.2
     env:
       CMAKE_PREFIX_PATH: /opt/toolchains
     outputs:
@@ -266,11 +266,6 @@ jobs:
           SIZE_COMMENT_PATH: ${{ github.workspace }}/size-comment.md
           CI_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
         run: |
-          # Add the first Zephyr SDK binutils path to PATH if it exists
-          SDK_BIN=$(ls -d /opt/toolchains/zephyr-sdk-*/arm-zephyr-eabi/bin 2>/dev/null | head -1)
-          [ -n "$SDK_BIN" ] && export PATH="$SDK_BIN:$PATH"
-
-          # Generate the diff comment
           bash asset-tracker-template/scripts/ci/pr-size-diff.sh
 
       - name: Post PR app-size sticky comment for thingy91x image

.github/workflows/sonarcloud.yml

@@ -22,7 +22,7 @@ jobs:
   build:
     name: Build and analyze
     runs-on: build_self_hosted
-    container: ghcr.io/zephyrproject-rtos/ci:v0.28.7
+    container: ghcr.io/zephyrproject-rtos/ci:v0.29.2
     env:
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
       CMAKE_PREFIX_PATH: /opt/toolchains

.github/workflows/target-test.yml

@@ -22,6 +22,12 @@ on:
         type: string
         required: true
         default: thingy91x
+      pytest_args:
+        description: Extra arguments appended verbatim to the pytest invocation.
+                     (e.g. "-k test_app_fota"). Leave empty for the default behaviour.
+        type: string
+        required: false
+        default: ""
 
   workflow_dispatch:
     inputs:
@@ -48,6 +54,12 @@ on:
         type: string
         required: true
         default: thingy91x
+      pytest_args:
+        description: Extra arguments appended verbatim to the pytest invocation.
+                     (e.g. "-k test_app_fota"). Leave empty for the default behaviour.
+        type: string
+        required: false
+        default: ""
 
 permissions:
   contents: read
@@ -161,7 +173,8 @@ jobs:
           pytest -v "${pytest_marker[@]}" \
             --junit-xml=results/test-results.xml \
             --html=results/test-results.html --self-contained-html \
-            ${PYTEST_PATH}
+            ${PYTEST_PATH} \
+            ${{ inputs.pytest_args }}
           
         shell: bash
         env:
@@ -175,6 +188,7 @@ jobs:
           MEMFAULT_ORGANIZATION_SLUG: ${{ vars.MEMFAULT_ORGANIZATION_SLUG }}
           MEMFAULT_PROJECT_SLUG: ${{ vars.MEMFAULT_PROJECT_SLUG }}
           APP_BUNDLEID: ${{ vars.APP_BUNDLEID }}
+          MCUBOOT_BUNDLEID: ${{ vars.MCUBOOT_BUNDLEID }}
 
       - name: Generate and Push Power Badge
         if: ${{ always() && matrix.device == 'ppk_thingy91x' }}

app/Kconfig.sysbuild

@@ -11,14 +11,20 @@ endchoice
 config SECURE_BOOT_APPCORE
 	default y if BOARD_NRF9151DK_NRF9151_NS
 
+# Shared NSIB (b0) signing key for all ATT sysbuild targets. Sysbuild signs images with this
+# key; b0 verifies them. Without this, sysbuild autogenerates a new debug key on each pristine
+# build. Not for production.
+config SECURE_BOOT_SIGNING_KEY_FILE
+	default "$(ZEPHYR_NRF_MODULE_DIR)/boards/nordic/thingy91x/nsib_signing_key.pem"
+
 config WIFI_NRF70
 	default y if BOARD_THINGY91X_NRF9151_NS
 
 choice WIFI_NRF70_OPER_MODES
 	default WIFI_NRF70_SCAN_ONLY if BOARD_THINGY91X_NRF9151_NS
 endchoice
 
-config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
-	default y if BOARD_NRF9151DK_NRF9151_NS
+config PARTITION_MANAGER
+	default n
 
 source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

app/boards/nrf9151dk_nrf9151_ns.conf

@@ -9,7 +9,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Location priority order
 CONFIG_LOCATION_REQUEST_DEFAULT_METHOD_FIRST_GNSS=y

app/boards/nrf9151dk_nrf9151_ns.overlay

@@ -4,46 +4,14 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#include "../dts/nrf9151dk_prelude.dtsi"
+/* Flash partitions (littlefs_storage, MCUboot slots, etc.): app/dts/att_flash_partitions.dtsi */
+#include "../dts/att_flash_partitions.dtsi"
+#include "../dts/att_sram_partitions.dtsi"
+
 / {
-	/* Configure partition manager to use gd25wb256 as the external flash */
 	chosen {
 		nordic,modem-trace-uart = &uart1;
-		nordic,pm-ext-flash = &gd25wb256;
-	};
-
-	aliases {
-		ext-flash = &gd25wb256;
-	};
-
-	fstab {
-		compatible = "zephyr,fstab";
-		lfs1: lfs1 {
-			compatible = "zephyr,fstab,littlefs";
-			mount-point = "/att_storage";
-			partition = <&littlefs_storage>;
-			automount;
-			read-size = <16>;
-			prog-size = <16>;
-			cache-size = <64>;
-			lookahead-size = <32>;
-			block-cycles = <512>;
-		};
-	};
-};
-
-&gd25wb256 {
-	status = "okay";
-
-	/* Partitions will be overridden by PM but needed for DTS parsing */
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		littlefs_storage: partition@0 {
-			label = "littlefs_storage";
-			reg = <0x00000000 0x00100000>;
-		};
 	};
 };
 

app/boards/thingy91x_nrf9151_ns.conf

@@ -4,6 +4,12 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+# External flash (MCUboot secondary on GD25)
+CONFIG_SPI=y
+CONFIG_SPI_NOR=y
+CONFIG_SPI_NOR_SFDP_DEVICETREE=y
+CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
+
 # Environmental module
 CONFIG_APP_ENVIRONMENTAL=y