manifest: Update to NCS 3.1.0

Update to NCS 3.1.0.

Signed-off-by: Jorgen Kvalvaag <[email protected]>

Author: jorgenmk

.github/workflows/build.yml

@@ -216,7 +216,7 @@ jobs:
       - name: Build nrf53 firmware
         working-directory: nrf/applications/connectivity_bridge
         run: |
-          west build -b thingy91x/nrf5340/cpuapp -p --sysbuild -- -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=3 -DCONFIG_BUILD_S1_VARIANT=y
+          west build -b thingy91x/nrf5340/cpuapp -p --sysbuild -- -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=3
 
       - name: Create partition manager report for nRF53 firmware
         working-directory: nrf/applications/connectivity_bridge/build
@@ -272,7 +272,10 @@ jobs:
           cp twister-out/thingy91x_nrf9151_ns/app/app.build.bootloader_update/dfu_mcuboot.zip \
             hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91-bootloader.zip
           rm -rf twister-out
-          west build -b thingy91x/nrf5340/cpuapp -p --sysbuild -d ../nrf/applications/connectivity_bridge/build-bl-update ../nrf/applications/connectivity_bridge -- -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=4 -DCONFIG_BUILD_S1_VARIANT=y
+          west build -b thingy91x/nrf5340/cpuapp -p --sysbuild \
+              -d ../nrf/applications/connectivity_bridge/build-bl-update \
+              ../nrf/applications/connectivity_bridge -- \
+              -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=4
           cp ../nrf/applications/connectivity_bridge/build-bl-update/dfu_mcuboot.zip \
             connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-bootloader.zip
 

app/Kconfig

@@ -6,6 +6,10 @@
 
 menu "Thingy Out-of-Box Application"
 
+config PM_PARTITION_SIZE_TFM_SRAM
+	hex
+	default 0x4000
+
 config APP_PAYLOAD_CHANNEL_BUFFER_MAX_SIZE
 	int "Payload maximum buffer size"
 	default 128

app/Kconfig.sysbuild

@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+config MCUBOOT_USE_ALL_AVAILABLE_RAM
+    default y
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

app/overlay-etb.conf

@@ -11,6 +11,6 @@ CONFIG_MEMFAULT_NCS_ETB_CAPTURE=y
 # Reduce logging to avoid filling up ETB with data not related to the crash
 CONFIG_FAULT_DUMP=0
 CONFIG_KERNEL_LOG_LEVEL_OFF=y
-CONFIG_PM_PARTITION_SIZE_MEMFAULT_STORAGE=0x40000
+CONFIG_PM_PARTITION_SIZE_MEMFAULT_STORAGE=0x30000
 CONFIG_MEMFAULT_COREDUMP_COLLECT_BSS_REGIONS=y
 CONFIG_MEMFAULT_COREDUMP_FULL_THREAD_STACKS=y

app/prj.conf

@@ -13,9 +13,6 @@ CONFIG_DK_LIBRARY=y
 CONFIG_ZVFS_OPEN_MAX=10
 CONFIG_PWM=y
 
-# Disable UART NRFX legacy shim to make the device boot.
-CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n
-
 # Heap and stacks
 CONFIG_MAIN_STACK_SIZE=4096
 # Extended AT host/monitor stack/heap sizes since some nrf_cloud credentials are longer than 1024 bytes.
@@ -76,6 +73,7 @@ CONFIG_SHELL_STACK_SIZE=1560
 CONFIG_AT_SHELL=y
 
 # nRF Cloud
+CONFIG_NRF_CLOUD=y
 CONFIG_NRF_CLOUD_COAP=y
 CONFIG_NRF_CLOUD_COAP_DISCONNECT_ON_FAILED_REQUEST=y
 CONFIG_MODEM_JWT=y
@@ -103,11 +101,9 @@ CONFIG_SETTINGS_FCB=y
 CONFIG_FCB=y
 
 # Download Client - used by FOTA and PGPS
-CONFIG_DOWNLOAD_CLIENT=y
-CONFIG_DOWNLOAD_CLIENT_HTTP_FRAG_SIZE_1024=y
-CONFIG_DOWNLOAD_CLIENT_STACK_SIZE=3072
-CONFIG_DOWNLOAD_CLIENT_BUF_SIZE=2048
-CONFIG_DOWNLOAD_CLIENT_MAX_HOSTNAME_SIZE=128
+CONFIG_DOWNLOADER=y
+CONFIG_DOWNLOADER_TRANSPORT_HTTP=n
+CONFIG_DOWNLOADER_STACK_SIZE=1664
 
 # Flash - Used by FOTA and PGPS
 CONFIG_FLASH=y
@@ -121,12 +117,12 @@ CONFIG_NRF_CLOUD_FOTA_POLL=y
 CONFIG_NRF_CLOUD_FOTA_POLL_LOG_LEVEL_DBG=y
 CONFIG_NRF_CLOUD_FOTA_FULL_MODEM_UPDATE=y
 CONFIG_NRF_CLOUD_FOTA_DOWNLOAD_FRAGMENT_SIZE=1700
-CONFIG_NRF_CLOUD_COAP_DOWNLOADS=n
+CONFIG_NRF_CLOUD_COAP_DOWNLOADS=y
 CONFIG_FOTA_DOWNLOAD=y
 CONFIG_FOTA_DOWNLOAD_PROGRESS_EVT=y
 CONFIG_FOTA_DL_TIMEOUT_MIN=30
 CONFIG_DFU_TARGET=y
-CONFIG_BUILD_S1_VARIANT=y
+
 # COAP client
 CONFIG_COAP_CLIENT_THREAD_PRIORITY=0
 CONFIG_COAP_CLIENT_BLOCK_SIZE=1024
@@ -241,7 +237,7 @@ CONFIG_APP_LOG_LEVEL_DBG=y
 
 # Fuel Gage
 CONFIG_NRF_FUEL_GAUGE=y
-CONFIG_NPM1300_CHARGER=y
+CONFIG_NPM13XX_CHARGER=y
 
 # Task Watchdog
 CONFIG_TASK_WDT=y

app/sample.yaml

@@ -30,4 +30,3 @@ tests:
     tags: ci_build
     extra_args:
       - mcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=3
-      - CONFIG_BUILD_S1_VARIANT=y

app/src/modules/battery/battery.c

@@ -7,7 +7,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/zbus/zbus.h>
-#include <zephyr/drivers/sensor/npm1300_charger.h>
+#include <zephyr/drivers/sensor/npm13xx_charger.h>
 #include <zephyr/sys/util.h>
 #include <nrf_fuel_gauge.h>
 #include <date_time.h>
@@ -193,7 +193,7 @@ static int charger_read_sensors(float *voltage, float *current, float *temp, int
 	sensor_channel_get(charger, SENSOR_CHAN_GAUGE_AVG_CURRENT, &value);
 	*current = (float)value.val1 + ((float)value.val2 / 1000000);
 
-	sensor_channel_get(charger, (enum sensor_channel)SENSOR_CHAN_NPM1300_CHARGER_STATUS,
+	sensor_channel_get(charger, (enum sensor_channel)SENSOR_CHAN_NPM13XX_CHARGER_STATUS,
 			   &value);
 	*chg_status = value.val1;
 
@@ -233,7 +233,7 @@ static void sample(int64_t *ref_time)
 				  NPM1300_CHG_STATUS_CC_MASK |
 				  NPM1300_CHG_STATUS_CV_MASK)) != 0;
 
-	state_of_charge = nrf_fuel_gauge_process(voltage, current, temp, delta, false, NULL);
+	state_of_charge = nrf_fuel_gauge_process(voltage, current, temp, delta, NULL);
 
 	LOG_DBG("State of charge: %f", (double)roundf(state_of_charge));
 	LOG_DBG("The battery is %s", charging ? "charging" : "not charging");

app/src/modules/trigger/trigger.c

@@ -136,7 +136,7 @@ static void frequent_poll_state_duration_timer_handler(struct k_timer * timer_id
 
 	LOG_DBG("Frequent poll duration timer expired");
 
-	err = zbus_chan_pub(&PRIV_TRIGGER_CHAN, &unused, K_SECONDS(1));
+	err = zbus_chan_pub(&PRIV_TRIGGER_CHAN, &unused, K_NO_WAIT);
 	if (err) {
 		LOG_ERR("zbus_chan_pub, error: %d", err);
 		SEND_FATAL_ERROR();

west.yml

@@ -14,5 +14,5 @@ manifest:
     - name: nrf
       remote: ncs
       repo-path: sdk-nrf
-      revision: v2.8.0-rc2
+      revision: v3.1.0
       import: true