Anjay-zephyr-client 23.11

Improvements: - Updated Zephyr to 3.5.0 - Updated sdk-nrf to 2.5.0 - Adjusted Kconfig options to make projects build on newest Zephyr and nCS versions
AVSystem · Nov 22, 2023 · 4618254 · 4618254
1 parent 892edd6
commit 4618254
Show file tree

Hide file tree

Showing 26 changed files with 55 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 23.11 (November 21st, 2023)
+
+### Improvements
+- Updated Zephyr to 3.5.0
+- Updated sdk-nrf to 2.5.0
+- Adjusted Kconfig options to make projects build on newest Zephyr and nCS versions
+
 ## 23.09.1 (September 22nd, 2023)
 
 ### Bugfixes
@@ -11,6 +18,7 @@
 - Added Bubblemaker app
 - Added tmo_dev_edge board as a target for demo and minimal samples with the possibility to switch
   preferred network bearer and perform firmware update using the external flash
+- Added support for Location object in `asset_tracker` application
 
 ## 23.06 (June 23rd, 2023)
 

diff --git a/bubblemaker/boards/nrf9160dk_nrf9160_ns.conf b/bubblemaker/boards/nrf9160dk_nrf9160_ns.conf
@@ -37,7 +37,6 @@ CONFIG_LTE_LINK_CONTROL=y
 CONFIG_LTE_NETWORK_MODE_LTE_M_GPS=y
 CONFIG_LTE_AUTO_INIT_AND_CONNECT=n
 CONFIG_LTE_NETWORK_TIMEOUT=600
-CONFIG_NRF_CLOUD_AGPS=y
 CONFIG_NRF_CLOUD_GPS_LOG_LEVEL_INF=y
 
 # Clock synchronization
@@ -49,6 +48,7 @@ CONFIG_DATE_TIME_NTP_QUERY_TIME_SECONDS=5
 # File system
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
+CONFIG_STREAM_FLASH=y
 
 # Heap
 CONFIG_HEAP_MEM_POOL_SIZE=2048
@@ -57,7 +57,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=2048
 CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_IMG_MANAGER=y
 CONFIG_IMG_ERASE_PROGRESSIVELY=y
-CONFIG_MCUBOOT_IMAGE_VERSION="23.9.1"
+CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="23.11.0"
 
 # Shell settings
 CONFIG_SHELL_MINIMAL=y

diff --git a/bubblemaker/west-nrf.yml b/bubblemaker/west-nrf.yml
@@ -23,10 +23,10 @@ manifest:
   - name: sdk-nrf
     path: nrf
     remote: ncs
-    revision: v2.3.0
+    revision: v2.5.0
     import: true
   - name: Anjay-zephyr
     submodules: true
     remote: anjay
-    revision: 3.5.0
+    revision: 3.6.1
     path: modules/lib/anjay
diff --git a/demo/boards/disco_l475_iot1.conf b/demo/boards/disco_l475_iot1.conf
@@ -2,6 +2,7 @@
 CONFIG_ANJAY_ZEPHYR_DEVICE_MANUFACTURER="STMicroelectronics"
 CONFIG_ANJAY_ZEPHYR_MODEL_NUMBER="B-L475E-IOT01A"
 CONFIG_ANJAY_ZEPHYR_FOTA=y
+CONFIG_ANJAY_ZEPHYR_THREAD_STACK_SIZE=6144
 
 # Networking
 CONFIG_ANJAY_COMPAT_MBEDTLS=y
@@ -10,6 +11,7 @@ CONFIG_ANJAY_COMPAT_NET=y
 # General settings
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_POSIX_API=y
+CONFIG_STREAM_FLASH=y
 
 # Networking
 CONFIG_WIFI=y
@@ -45,4 +47,4 @@ CONFIG_BOOTLOADER_MCUBOOT=y
 # Note: if relative paths are used here, it is treated as
 # relative to $WEST_TOPDIR (typically ~/zephyrproject)
 CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="bootloader/mcuboot/root-rsa-2048.pem"
-CONFIG_MCUBOOT_EXTRA_IMGTOOL_ARGS="--version 23.9.1"
+CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="23.11.0"
diff --git a/demo/boards/esp32.conf → demo/boards/esp32_devkitc_wroom.conf b/demo/boards/esp32.conf → demo/boards/esp32_devkitc_wroom.conf
diff --git a/demo/boards/esp32.overlay → demo/boards/esp32_devkitc_wroom.overlay b/demo/boards/esp32.overlay → demo/boards/esp32_devkitc_wroom.overlay
diff --git a/demo/boards/nrf9160dk_nrf9160_ns.conf b/demo/boards/nrf9160dk_nrf9160_ns.conf
@@ -37,7 +37,6 @@ CONFIG_LTE_LINK_CONTROL=y
 CONFIG_LTE_NETWORK_MODE_LTE_M_GPS=y
 CONFIG_LTE_AUTO_INIT_AND_CONNECT=n
 CONFIG_LTE_NETWORK_TIMEOUT=600
-CONFIG_NRF_CLOUD_AGPS=y
 CONFIG_NRF_CLOUD_GPS_LOG_LEVEL_INF=y
 
 # Clock synchronization
@@ -49,6 +48,7 @@ CONFIG_DATE_TIME_NTP_QUERY_TIME_SECONDS=5
 # File system
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
+CONFIG_STREAM_FLASH=y
 
 # Heap
 CONFIG_HEAP_MEM_POOL_SIZE=2048
@@ -57,7 +57,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=2048
 CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_IMG_MANAGER=y
 CONFIG_IMG_ERASE_PROGRESSIVELY=y
-CONFIG_MCUBOOT_IMAGE_VERSION="23.9.1"
+CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="23.11.0"
 
 # Shell settings
 CONFIG_SHELL_MINIMAL=y

diff --git a/demo/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay b/demo/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay
@@ -3,3 +3,7 @@
         nordic,pm-ext-flash = &mx25r64;
     };
 };
+
+&mx25r64 {
+    status = "ok";
+};
diff --git a/demo/boards/nrf9160dk_nrf9160_ns_extflash.conf b/demo/boards/nrf9160dk_nrf9160_ns_extflash.conf
@@ -37,6 +37,7 @@ CONFIG_DATE_TIME_NTP_QUERY_TIME_SECONDS=5
 # File system
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
+CONFIG_STREAM_FLASH=y
 
 # Heap
 CONFIG_HEAP_MEM_POOL_SIZE=2048
@@ -45,7 +46,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=2048
 CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_IMG_MANAGER=y
 CONFIG_IMG_ERASE_PROGRESSIVELY=y
-CONFIG_MCUBOOT_IMAGE_VERSION="23.9.1"
+CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="23.11.0"
 
 # External flash
 CONFIG_SPI=y

diff --git a/demo/boards/thingy91_nrf9160_ns.conf b/demo/boards/thingy91_nrf9160_ns.conf
@@ -26,6 +26,7 @@ CONFIG_LOG_RUNTIME_FILTERING=n
 CONFIG_LOG_CMDS=n
 CONFIG_LOG_MAX_LEVEL=3
 CONFIG_HWINFO=n
+CONFIG_CBPRINTF_NANO=y
 
 # Networking
 CONFIG_NET_NATIVE=n
@@ -40,7 +41,6 @@ CONFIG_LTE_LINK_CONTROL=y
 CONFIG_LTE_NETWORK_MODE_LTE_M_GPS=y
 CONFIG_LTE_AUTO_INIT_AND_CONNECT=n
 CONFIG_LTE_NETWORK_TIMEOUT=600
-CONFIG_NRF_CLOUD_AGPS=y
 
 # Clock synchronization
 CONFIG_DATE_TIME=y
@@ -52,6 +52,7 @@ CONFIG_DATE_TIME_NTP_QUERY_TIME_SECONDS=5
 # File system
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
+CONFIG_STREAM_FLASH=y
 
 # Heap
 CONFIG_HEAP_MEM_POOL_SIZE=2048
@@ -64,12 +65,13 @@ CONFIG_BME680=y
 CONFIG_ADXL362=y
 CONFIG_ADXL362_ACCEL_ODR_12_5=y
 CONFIG_ADXL362_ACCEL_RANGE_2G=y
+CONFIG_REGULATOR=n
 
 # MCUboot
 CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_IMG_MANAGER=y
 CONFIG_IMG_ERASE_PROGRESSIVELY=y
-CONFIG_MCUBOOT_IMAGE_VERSION="23.9.1"
+CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="23.11.0"
 
 # Shell settings
 CONFIG_SHELL_MINIMAL=y

diff --git a/demo/boards/tmo_dev_edge.conf b/demo/boards/tmo_dev_edge.conf
@@ -98,4 +98,4 @@ CONFIG_BOOTLOADER_MCUBOOT=y
 # Note: if relative paths are used here, it is treated as
 # relative to $WEST_TOPDIR (typically ~/zephyrproject)
 CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="bootloader/mcuboot/root-rsa-2048.pem"
-CONFIG_MCUBOOT_EXTRA_IMGTOOL_ARGS="--version 23.9.1"
+CONFIG_MCUBOOT_EXTRA_IMGTOOL_ARGS="--version 23.11.0"
diff --git a/demo/child_image/mcuboot/boards/nrf9160dk_nrf9160.conf b/demo/child_image/mcuboot/boards/nrf9160dk_nrf9160.conf
@@ -14,9 +14,6 @@ CONFIG_MAIN_STACK_SIZE=10240
 CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_SWAP_SAVE_ENCTLV=n
-CONFIG_BOOT_ENCRYPT_RSA=n
-CONFIG_BOOT_ENCRYPT_EC256=n
-CONFIG_BOOT_ENCRYPT_X25519=n
 
 CONFIG_BOOT_UPGRADE_ONLY=n
 CONFIG_BOOT_BOOTSTRAP=n

diff --git a/demo/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0_extflash.overlay b/demo/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0_extflash.overlay
@@ -3,3 +3,7 @@
         nordic,pm-ext-flash = &mx25r64;
     };
 };
+
+&mx25r64 {
+    status = "ok";
+};
diff --git a/demo/child_image/mcuboot/prj_extflash.conf b/demo/child_image/mcuboot/prj_extflash.conf
@@ -14,9 +14,6 @@ CONFIG_MAIN_STACK_SIZE=10240
 CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_SWAP_SAVE_ENCTLV=n
-CONFIG_BOOT_ENCRYPT_RSA=n
-CONFIG_BOOT_ENCRYPT_EC256=n
-CONFIG_BOOT_ENCRYPT_X25519=n
 
 CONFIG_BOOT_UPGRADE_ONLY=n
 CONFIG_BOOT_BOOTSTRAP=n

diff --git a/demo/overlay_nrf_mbedtls.conf b/demo/overlay_nrf_mbedtls.conf
@@ -5,11 +5,11 @@ CONFIG_NORDIC_SECURITY_BACKEND=n
 CONFIG_OBERON_BACKEND=n
 
 CONFIG_MBEDTLS_TLS_LIBRARY=y
-CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=n
 CONFIG_MBEDTLS_ENTROPY_C=y
 CONFIG_MBEDTLS_CIPHER_MODE_CBC=y
 CONFIG_MBEDTLS_DHM_C=y
 CONFIG_MBEDTLS_CTR_DRBG_C=y
+CONFIG_MBEDTLS_CCM_C=y
 CONFIG_MBEDTLS_ECP_C=y
 CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y

diff --git a/demo/west-nrf.yml b/demo/west-nrf.yml
@@ -23,10 +23,10 @@ manifest:
   - name: sdk-nrf
     path: nrf
     remote: ncs
-    revision: v2.3.0
+    revision: v2.5.0
     import: true
   - name: Anjay-zephyr
     submodules: true
     remote: anjay
-    revision: 3.5.0
+    revision: 3.6.1
     path: modules/lib/anjay
diff --git a/demo/west-t-mobile.yml b/demo/west-t-mobile.yml
@@ -28,7 +28,7 @@ manifest:
   - name: Anjay-zephyr
     submodules: true
     remote: anjay
-    revision: 3.5.0
+    revision: 3.6.1
     path: modules/lib/anjay
   - name: DevEdge-IoTDevKit-ZephyrSDK
     path: modules/lib/t-mobile-sdk

diff --git a/demo/west.yml b/demo/west.yml
@@ -23,17 +23,10 @@ manifest:
   - name: zephyr
     path: zephyr
     remote: zephyrproject-rtos
-    revision: v3.3.0
+    revision: v3.5.0
     import: true
   - name: Anjay-zephyr
     submodules: true
     remote: anjay
-    revision: 3.5.0
+    revision: 3.6.1
     path: modules/lib/anjay
-  - name: hal_espressif
-    path: modules/hal/espressif
-    remote: zephyrproject-rtos
-    revision: 2d505773ef94ff3c7b5facf43eb78d7c563720f1
-    west-commands: west/west-commands.yml
-    groups:
-    - hal
diff --git a/ei_demo/boards/thingy91_nrf9160_ns.conf b/ei_demo/boards/thingy91_nrf9160_ns.conf
@@ -37,6 +37,16 @@ CONFIG_MPU_ALLOW_FLASH_WRITE=y
 # Heap
 CONFIG_HEAP_MEM_POOL_SIZE=2048
 
+# Shell settings
+CONFIG_SHELL_MINIMAL=y
+CONFIG_SHELL_TAB=y
+CONFIG_SHELL_TAB_AUTOCOMPLETION=y
+CONFIG_DATE_SHELL=n
+CONFIG_DEVICE_SHELL=n
+CONFIG_DEVMEM_SHELL=n
+CONFIG_KERNEL_SHELL=y
+
 # Peripherals
 CONFIG_SENSOR=y
 CONFIG_ADXL362=y
+CONFIG_REGULATOR=n
diff --git a/ei_demo/ei_model.zip b/ei_demo/ei_model.zip
diff --git a/ei_demo/west-nrf.yml b/ei_demo/west-nrf.yml
@@ -23,10 +23,10 @@ manifest:
   - name: sdk-nrf
     path: nrf
     remote: ncs
-    revision: v2.3.0
+    revision: v2.5.0
     import: true
   - name: Anjay-zephyr
     submodules: true
     remote: anjay
-    revision: 3.5.0
+    revision: 3.6.1
     path: modules/lib/anjay
diff --git a/minimal/boards/esp32.conf → minimal/boards/esp32_devkitc_wroom.conf b/minimal/boards/esp32.conf → minimal/boards/esp32_devkitc_wroom.conf
diff --git a/minimal/boards/esp32.overlay → minimal/boards/esp32_devkitc_wroom.overlay b/minimal/boards/esp32.overlay → minimal/boards/esp32_devkitc_wroom.overlay
diff --git a/minimal/west-nrf.yml b/minimal/west-nrf.yml
@@ -23,10 +23,10 @@ manifest:
   - name: sdk-nrf
     path: nrf
     remote: ncs
-    revision: v2.3.0
+    revision: v2.5.0
     import: true
   - name: Anjay-zephyr
     submodules: true
     remote: anjay
-    revision: 3.5.0
+    revision: 3.6.1
     path: modules/lib/anjay
diff --git a/minimal/west-t-mobile.yml b/minimal/west-t-mobile.yml
@@ -28,7 +28,7 @@ manifest:
   - name: Anjay-zephyr
     submodules: true
     remote: anjay
-    revision: 3.5.0
+    revision: 3.6.1
     path: modules/lib/anjay
   - name: DevEdge-IoTDevKit-ZephyrSDK
     path: modules/lib/t-mobile-sdk

diff --git a/minimal/west.yml b/minimal/west.yml
@@ -23,17 +23,10 @@ manifest:
   - name: zephyr
     path: zephyr
     remote: zephyrproject-rtos
-    revision: v3.3.0
+    revision: v3.5.0
     import: true
   - name: Anjay-zephyr
     submodules: true
     remote: anjay
-    revision: 3.5.0
+    revision: 3.6.1
     path: modules/lib/anjay
-  - name: hal_espressif
-    path: modules/hal/espressif
-    remote: zephyrproject-rtos
-    revision: 2d505773ef94ff3c7b5facf43eb78d7c563720f1
-    west-commands: west/west-commands.yml
-    groups:
-    - hal