Merge pull request #47 from umts/ncs-2.8.0

Version 0.9.0 - NCS version 2.8.0
umts · Jan 2, 2025 · 81f3d7e · 81f3d7e
2 parents 822093a + 8a68200
commit 81f3d7e
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ZEPHYR_SDK_INSTALL_PATH: /opt/toolchains
-      ZSDK_VERSION: 0.16.9
+      ZSDK_VERSION: 0.17.0
     container:
       image: ghcr.io/zephyrproject-rtos/ci-base:v0.26-branch
       env:
@@ -107,7 +107,7 @@ jobs:
         if: ${{ inputs.release_build }}
         env:
           BOARD: circuitdojo_feather/nrf9160/ns
-        run: west build --sysbuild ./app -p -- -DFILE_SUFFIX=release
+        run: west build --sysbuild ./app -p -- -DFILE_SUFFIX=release -DCMAKE_BUILD_TYPE=Release
 
       - name: Extract branch name
         shell: bash

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -12,7 +12,9 @@
         "build",
         "--sysbuild",
         "${workspaceFolder}/app",
-        "${input:build-opts}"
+        "${input:build-opts}",
+        "--",
+        "-DCMAKE_BUILD_TYPE=Release"
       ],
       "options": {
         "env": {

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -12,4 +12,4 @@ FILE(GLOB_RECURSE app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
 target_compile_definitions(app PRIVATE _POSIX_C_SOURCE=200809L)
 
-SET_SOURCE_FILES_PROPERTIES( ${app_sources} PROPERTIES COMPILE_FLAGS -fanalyzer )
+SET_SOURCE_FILES_PROPERTIES( ${app_sources} APPEND PROPERTIES COMPILE_FLAGS -fanalyzer )
diff --git a/app/VERSION b/app/VERSION
@@ -1,5 +1,5 @@
 VERSION_MAJOR = 0
-VERSION_MINOR = 8
+VERSION_MINOR = 9
 PATCHLEVEL = 0
 VERSION_TWEAK = 0
 EXTRAVERSION = stable
diff --git a/app/boards/circuitdojo_feather_nrf9160_ns.conf b/app/boards/circuitdojo_feather_nrf9160_ns.conf
@@ -26,25 +26,28 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_IPV6_NBR_CACHE=n
 CONFIG_NET_IPV6_MLD=n
 
-# Setup LTE
+# NRF LTE link control library
 CONFIG_LTE_LINK_CONTROL=y
+
+# LTE Power Saving Mode
+CONFIG_LTE_LC_PSM_MODULE=y
 CONFIG_LTE_PSM_REQ=y
-# Active time set to 0 so we can go right to PSM
-CONFIG_LTE_PSM_REQ_RAT="00000000"
-CONFIG_LTE_EDRX_REQ=y
-# PTW set to the minimum value, 1.27s, to conserve power
-CONFIG_LTE_PTW_VALUE_LTE_M="0000"
-# RAI is only supported for NBIoT currently
-# CONFIG_LTE_RAI_REQ=y
+# Request periodic TAU of 12 hours
+CONFIG_LTE_PSM_REQ_RPTAU="00101100"
+# Set Requested Active Time (RAT) to 10 seconds.
+CONFIG_LTE_PSM_REQ_RAT="00000101"
 
 # Neopixels over SPI
 CONFIG_SPI=y
 CONFIG_LED_STRIP=y
 
-# TFM
+# TFM options
 CONFIG_BUILD_WITH_TFM=y
-CONFIG_TFM_SECURE_UART_SHARE_INSTANCE=y
+CONFIG_TFM_CMAKE_BUILD_TYPE_RELEASE=y
+
+# TFM logging requirements
 CONFIG_TFM_SECURE_UART0=y
+CONFIG_TFM_SECURE_UART_SHARE_INSTANCE=y
 
 # External SPI Flash
 CONFIG_NVS=y

diff --git a/app/boards/circuitdojo_feather_nrf9160_ns_release.conf b/app/boards/circuitdojo_feather_nrf9160_ns_release.conf
@@ -26,25 +26,27 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_IPV6_NBR_CACHE=n
 CONFIG_NET_IPV6_MLD=n
 
-# Setup LTE
+# NRF LTE link control library
 CONFIG_LTE_LINK_CONTROL=y
+
+# LTE Power Saving Mode
+CONFIG_LTE_LC_PSM_MODULE=y
 CONFIG_LTE_PSM_REQ=y
-# Active time set to 0 so we can go right to PSM
-CONFIG_LTE_PSM_REQ_RAT="00000000"
-CONFIG_LTE_EDRX_REQ=y
-# PTW set to the minimum value, 1.27s, to conserve power
-CONFIG_LTE_PTW_VALUE_LTE_M="0000"
-# RAI is only supported for NBIoT currently
-# CONFIG_LTE_RAI_REQ=y
+# Request periodic TAU of 12 hours
+CONFIG_LTE_PSM_REQ_RPTAU="00101100"
+# Set Requested Active Time (RAT) to 10 seconds.
+CONFIG_LTE_PSM_REQ_RAT="00000101"
 
 # Neopixels over SPI
 CONFIG_SPI=y
 CONFIG_LED_STRIP=y
 
-# TFM
+# TFM options
 CONFIG_BUILD_WITH_TFM=y
-CONFIG_TFM_LOG_LEVEL_SILENCE=y
 CONFIG_TFM_CMAKE_BUILD_TYPE_RELEASE=y
+
+# TFM logging requirements
+CONFIG_TFM_LOG_LEVEL_SILENCE=y
 CONFIG_TFM_EXCEPTION_INFO_DUMP=n
 
 # External SPI Flash

diff --git a/app/prj.conf b/app/prj.conf
@@ -86,11 +86,16 @@ CONFIG_MCUMGR_GRP_OS=y
 CONFIG_IMG_ENABLE_IMAGE_CHECK=y
 
 # Hardening
+CONFIG_FORTIFY_SOURCE_COMPILE_TIME=y
 CONFIG_STACK_SENTINEL=y
 CONFIG_OVERRIDE_FRAME_POINTER_DEFAULT=y
 CONFIG_STACK_CANARIES=y
 CONFIG_STACK_POINTER_RANDOM=100
 
+# Enforce C standards
+CONFIG_STD_C23=y
+CONFIG_MISRA_SANE=y
+
 # Logging
 CONFIG_LOG=y
 CONFIG_LOG_MODE_DEFERRED=y

diff --git a/app/prj_release.conf b/app/prj_release.conf
@@ -86,6 +86,7 @@ CONFIG_MCUMGR_GRP_OS=y
 CONFIG_IMG_ENABLE_IMAGE_CHECK=y
 
 # Hardening
+CONFIG_FORTIFY_SOURCE_COMPILE_TIME=y
 CONFIG_STACK_SENTINEL=y
 CONFIG_OVERRIDE_FRAME_POINTER_DEFAULT=y
 CONFIG_STACK_CANARIES=y
@@ -98,6 +99,10 @@ CONFIG_EXCEPTION_DEBUG=n
 CONFIG_PRINTK=n
 CONFIG_NCS_BOOT_BANNER=n
 
+# Enforce C standards
+CONFIG_STD_C23=y
+CONFIG_MISRA_SANE=y
+
 # Logging
 CONFIG_LOG=n
 

diff --git a/app/src/net/lte_manager.c b/app/src/net/lte_manager.c
@@ -140,7 +140,7 @@ int lte_disconnect(void) {
   /* A small delay for the TCP connection teardown */
   k_sleep(K_SECONDS(1));
 
-  err = nrf_modem_lib_shutdown();
+  err = lte_lc_power_off();
   if (err) {
     LOG_ERR("Failed to shutdown nrf modem. Err: %d", err);
     return err;

diff --git a/app/sysbuild/mcuboot/boards/circuitdojo_feather_nrf9160.conf b/app/sysbuild/mcuboot/boards/circuitdojo_feather_nrf9160.conf
@@ -46,6 +46,3 @@ CONFIG_USE_SEGGER_RTT=y
 CONFIG_LOG_BACKEND_RTT=y
 CONFIG_LOG_BACKEND_UART=n
 CONFIG_SEGGER_RTT_MODE_NO_BLOCK_TRIM=y
-
-# Debugging
-CONFIG_DEBUG=n
diff --git a/app/sysbuild/mcuboot/boards/circuitdojo_feather_nrf9160_release.conf b/app/sysbuild/mcuboot/boards/circuitdojo_feather_nrf9160_release.conf
@@ -37,6 +37,3 @@ CONFIG_UART_CONSOLE=n
 
 # Logging
 CONFIG_LOG=n
-
-# Debugging
-CONFIG_DEBUG=n
diff --git a/app/sysbuild/mcuboot/prj.conf b/app/sysbuild/mcuboot/prj.conf
@@ -43,3 +43,7 @@ CONFIG_MINIMAL_LIBC=y
 CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0
 
 CONFIG_NCS_BOOT_BANNER=n
+
+CONFIG_DEBUG=n
+
+CONFIG_SPEED_OPTIMIZATIONS=y
diff --git a/app/sysbuild/mcuboot/prj_release.conf b/app/sysbuild/mcuboot/prj_release.conf
@@ -21,3 +21,7 @@ CONFIG_BOOT_BANNER=n
 CONFIG_NCS_BOOT_BANNER=n
 CONFIG_EARLY_CONSOLE=n
 CONFIG_PRINTK=n
+
+CONFIG_DEBUG=n
+
+CONFIG_SPEED_OPTIMIZATIONS=y
diff --git a/app/west.yml b/app/west.yml
@@ -8,7 +8,7 @@ manifest:
     - name: nrf
       repo-path: sdk-nrf
       remote: ncs
-      revision: v2.7.0
+      revision: v2.8.0
       import:
          name-allowlist:
           - cmsis