upmerge_20241220

.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,7 @@ 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/prj.conf

@@ -102,12 +102,9 @@ CONFIG_SETTINGS=y
 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
+# Downloader - used by FOTA and PGPS
+CONFIG_DOWNLOADER=y
+CONFIG_DOWNLOADER_STACK_SIZE=4096
 
 # Flash - Used by FOTA and PGPS
 CONFIG_FLASH=y
@@ -121,12 +118,11 @@ 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
@@ -135,7 +131,7 @@ CONFIG_COAP_CLIENT_STACK_SIZE=2304
 CONFIG_COAP_EXTENDED_OPTIONS_LEN_VALUE=192
 
 # nRF Cloud
-CONFIG_NRF_CLOUD_CLIENT_ID_PREFIX="oob-"
+CONFIG_NRF_CLOUD_CLIENT_ID_PREFIX="oob2-"
 CONFIG_NRF_CLOUD_COAP_SEC_TAG=4242
 
 #Required if device is provisioned to nRF Cloud using attestation token
@@ -266,3 +262,17 @@ CONFIG_NRF_MODEM_LIB_TRACE_STACK_SIZE=1024
 CONFIG_NRF_MODEM_LIB_TRACE_FLASH_SECTORS=255
 # Modem trace flash partition size with 255 sectors of 4KB each
 CONFIG_NRF_MODEM_LIB_TRACE_BACKEND_FLASH_PARTITION_SIZE=0xFF000
+
+CONFIG_NRF_CLOUD_COAP_SEC_TAG=2147483667
+CONFIG_NRF_CLOUD_COAP_JWT_SEC_TAG=4242
+CONFIG_NRF_CLOUD_SEC_TAG=4242
+
+CONFIG_RESET_ON_FATAL_ERROR=n
+CONFIG_ETB_TRACE=y
+CONFIG_ETB_TRACE_LOW_POWER=n # power saving is not needed for debugging
+# 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_DEBUG_THREAD_INFO=y
+CONFIG_THREAD_NAME=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

west.yml

@@ -14,5 +14,5 @@ manifest:
     - name: nrf
       remote: ncs
       repo-path: sdk-nrf
-      revision: v2.8.0-rc2
+      revision: pull/19720/head
       import: true