Anjay-zephyr-client 24.11

Features - Added FOTA support for nRF7002DK board Improvements - Updated Zephyr to 3.6.0 - Updated sdk-nrf to 2.7.0 - Updated Anjay-zephyr to 3.8.1 - Added instruction for updating es-WiFi module for B-L475E-IOT01A Discovery kit
AVSystem · Nov 13, 2024 · 6f8f294 · 6f8f294
1 parent 7432d3b
commit 6f8f294
Show file tree

Hide file tree

Showing 51 changed files with 292 additions and 180 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 24.11 (November 13th, 2024)
+
+### Features
+- Added FOTA support for nRF7002DK board
+
+### Improvements
+- Updated Zephyr to 3.6.0
+- Updated sdk-nrf to 2.7.0
+- Updated Anjay-zephyr to 3.8.1
+- Added instruction for updating es-WiFi module for B-L475E-IOT01A Discovery kit
+
 ## 24.05 (May 28th, 2024)
 
 ### Improvements

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ The following examples are present:
     <tr>
       <td>demo/</td>
       <td>
-        Showcase example implementing all features and sensors available on board. Supports experimental <strong>factory provisioning</strong> feature of Anjay 3.0. Supported boards:<br>
+        Showcase example implementing all features and sensors available on board. Supports experimental <strong>factory provisioning</strong> feature of Anjay 3. Supported boards:<br>
         <a href="https://www.st.com/en/evaluation-tools/b-l475e-iot01a.html">B-L475E-IOT01A Discovery kit</a><br>
         <a href="https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF9160-DK">nRF9160 Development kit</a><br>
         <a href="https://www.nordicsemi.com/Products/Development-hardware/Nordic-Thingy-91">Nordic Thingy:91 Prototyping kit</a><br>
@@ -142,7 +142,7 @@ Now we can add the application to VSC workspace. Click on nRF Connect tab ->
 Application -> Add Application. Open the folder containing the `prj.conf` file
 (e.g. `Anjay-zephyr-client/demo`). In the Application section the demo
 application should show up. Click on "No build configuration" to add a
-configuration for the desired target, e.g. `nrf9160dk_nrf9160_ns` (you can have
+configuration for the desired target, e.g. `nrf9160dk/nrf9160/ns` (you can have
 multiple configurations for different targets). Choose your target and click
 "Build Configuration" in order to build the application. Next builds can be
 started by choosing Actions -> Build.
@@ -179,3 +179,26 @@ is available on IoT Developer Zone.
 > **__NOTE:__**
 > You may use any LwM2M Server compliant with LwM2M 1.0 TS. The server URI can
 > be changed in the example configuration options.
+
+## Updating es-WiFi module firmware on B-L475E-IOT01A Discovery kit to make FOTA work
+
+There are known issues with the older es-WiFi firmware, particularly in handling
+multiple socket connections, which manifest during pull FOTA operations. To get
+rid of these problems, a WiFi module firmware update is required.
+
+Please download `Inventek ISM 43362 Wi-Fi module firmware update` package from
+[ST website](https://www.st.com/en/evaluation-tools/b-l475e-iot01a.html#tools-software).
+If you are using Windows you can simple follow instructions from `readme.txt`.
+For Linux, please install the appropriate version of
+[STM32CubeProgrammer](https://www.st.com/en/development-tools/stm32cubeprog.html).
+Then follow steps 2 through 5 in `readme.txt`. Next, go to the
+`en.inventek_fw_updater.2.0/bin` directory, but do not run the `update_Wifi.bat`
+script. Instead, run (please update the path to `STM32_Programmer_CLI` and
+`/dev/ttyACM0` device port if necessary):
+
+```bash
+~/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin/STM32_Programmer_CLI -c port=SWD -e all -d ./InventekBootloaderPassthrough.bin 0x08000000 -v -hardrst
+sleep 10
+~/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin/STM32_Programmer_CLI -c port=/dev/ttyACM0 br=115200 p=EVEN db=8 sb=1 fc=OFF -e all
+~/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin/STM32_Programmer_CLI -c port=/dev/ttyACM0 br=115200 p=even db=8 sb=1 fc=OFF -d ./ISM43362_M3G_L44_SPI_C3.5.2.7.STM.bin 0x08000000 -v
+```
diff --git a/bubblemaker/README.md b/bubblemaker/README.md
@@ -2,8 +2,8 @@
 
 ## Supported hardware and overview
 This folder contains support for the following targets:
- - [nrf9160dk_nrf9160_ns](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/ug_nrf9160.html)
- - [nrf7002dk_nrf5340_cpuapp_ns](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/device_guides/working_with_nrf/nrf70/gs.html)
+ - [nrf9160dk/nrf9160/ns](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/ug_nrf9160.html)
+ - [nrf7002dk/nrf5340/cpuapp/ns](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/device_guides/working_with_nrf/nrf70/gs.html)
 
  The following LwM2M Objects are supported:
  - Security (/0)

diff --git a/bubblemaker/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/bubblemaker/boards/nrf7002dk_nrf5340_cpuapp_ns.conf
@@ -5,16 +5,13 @@ CONFIG_ANJAY_ZEPHYR_MODEL_NUMBER="nRF7002DK"
 # Anjay Settings
 CONFIG_ANJAY_COMPAT_MBEDTLS=y
 CONFIG_ANJAY_COMPAT_NET=y
-CONFIG_ANJAY_COMPAT_TIME=y
 CONFIG_ANJAY_LOG_LEVEL_INF=y
 CONFIG_ANJAY_WITH_NET_STATS=n
 CONFIG_ANJAY_WITH_SENML_JSON=y
 CONFIG_ANJAY_WITH_TRACE_LOGS=n
 CONFIG_ANJAY_WITH_ACCESS_CONTROL=n
 
 # General Settings
-CONFIG_NEWLIB_LIBC=y
-CONFIG_NEWLIB_LIBC_NANO=n
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
 CONFIG_LOG_MAX_LEVEL=3
@@ -29,6 +26,8 @@ CONFIG_DNS_RESOLVER=y
 CONFIG_WIFI=y
 CONFIG_WIFI_NRF700X=y
 CONFIG_WPA_SUPP=y
+CONFIG_WPA_SUPP_CRYPTO_PSA=y
+CONFIG_PSA_WANT_ALG_HMAC=y
 CONFIG_NET_L2_WIFI_MGMT=y
 CONFIG_NET_L2_WIFI_MGMT_LOG_LEVEL_ERR=y
 CONFIG_NET_L2_ETHERNET=y
@@ -45,15 +44,15 @@ CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 
 # Heap
-CONFIG_HEAP_MEM_POOL_SIZE=200000
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=150000
+CONFIG_HEAP_MEM_POOL_SIZE=150000
 
 # Bubblemaker
 CONFIG_SENSOR=y
 CONFIG_ADC=y
 CONFIG_W1=y
 
 CONFIG_LED_STRIP=y
-CONFIG_WS2812_STRIP=y
 CONFIG_SPI=y
 
 CONFIG_GPIO=y
diff --git a/bubblemaker/boards/nrf9160dk_nrf9160_ns.conf b/bubblemaker/boards/nrf9160dk_nrf9160_ns.conf
@@ -35,7 +35,6 @@ CONFIG_NRF_MODEM_LIB=y
 CONFIG_MODEM_INFO=y
 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_GPS_LOG_LEVEL_INF=y
 
@@ -57,7 +56,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=2048
 CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_IMG_MANAGER=y
 CONFIG_IMG_ERASE_PROGRESSIVELY=y
-CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="24.5.0"
+CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="24.11.0"
 
 # Shell settings
 CONFIG_SHELL_MINIMAL=y
@@ -81,7 +80,6 @@ CONFIG_ADC=y
 CONFIG_W1=y
 
 CONFIG_LED_STRIP=y
-CONFIG_WS2812_STRIP=y
 CONFIG_SPI=y
 
 CONFIG_GPIO=y

diff --git a/bubblemaker/boards/nrf9160dk_nrf9160_ns_intflash.conf b/bubblemaker/boards/nrf9160dk_nrf9160_ns_intflash.conf
@@ -35,7 +35,6 @@ CONFIG_NRF_MODEM_LIB=y
 CONFIG_MODEM_INFO=y
 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_GPS_LOG_LEVEL_INF=y
 
@@ -57,7 +56,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=2048
 CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_IMG_MANAGER=y
 CONFIG_IMG_ERASE_PROGRESSIVELY=y
-CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="24.5.0"
+CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="24.11.0"
 
 # Shell settings
 CONFIG_SHELL_MINIMAL=y
@@ -81,7 +80,6 @@ CONFIG_ADC=y
 CONFIG_W1=y
 
 CONFIG_LED_STRIP=y
-CONFIG_WS2812_STRIP=y
 CONFIG_SPI=y
 
 CONFIG_GPIO=y
diff --git a/bubblemaker/src/led_strip.c b/bubblemaker/src/led_strip.c
@@ -29,10 +29,7 @@ LOG_MODULE_REGISTER(led_strip);
 
 #define STRIP_NODE DT_ALIAS(led_strip)
 #define STRIP_NUM_PIXELS DT_PROP(STRIP_NODE, chain_length)
-#define RGB(_r, _g, _b)                                                                            \
-	{                                                                                          \
-		.r = (_r), .g = (_g), .b = (_b)                                                    \
-	}
+#define RGB(_r, _g, _b) { .r = (_r), .g = (_g), .b = (_b) }
 
 static struct k_thread led_strip_thread;
 static K_THREAD_STACK_DEFINE(led_strip_stack, 1024);

diff --git a/bubblemaker/src/peripherals.h b/bubblemaker/src/peripherals.h
@@ -33,18 +33,14 @@
 #define SWITCH_AVAILABLE_ANY (SWITCH_AVAILABLE(0) || SWITCH_AVAILABLE(1) || SWITCH_AVAILABLE(2))
 
 #define PUSH_BUTTON_GLUE_ITEM(num)                                                                 \
-	{                                                                                          \
-		.device = DEVICE_DT_GET(DT_GPIO_CTLR(PUSH_BUTTON_NODE(num), gpios)),               \
-		.gpio_pin = DT_GPIO_PIN(PUSH_BUTTON_NODE(num), gpios),                             \
-		.gpio_flags = (GPIO_INPUT | DT_GPIO_FLAGS(PUSH_BUTTON_NODE(num), gpios))           \
-	}
+	{ .device = DEVICE_DT_GET(DT_GPIO_CTLR(PUSH_BUTTON_NODE(num), gpios)),                     \
+	  .gpio_pin = DT_GPIO_PIN(PUSH_BUTTON_NODE(num), gpios),                                   \
+	  .gpio_flags = (GPIO_INPUT | DT_GPIO_FLAGS(PUSH_BUTTON_NODE(num), gpios)) }
 
 #define SWITCH_BUTTON_GLUE_ITEM(num)                                                               \
-	{                                                                                          \
-		.device = DEVICE_DT_GET(DT_GPIO_CTLR(SWITCH_NODE(num), gpios)),                    \
-		.gpio_pin = DT_GPIO_PIN(SWITCH_NODE(num), gpios),                                  \
-		.gpio_flags = (GPIO_INPUT | DT_GPIO_FLAGS(SWITCH_NODE(num), gpios))                \
-	}
+	{ .device = DEVICE_DT_GET(DT_GPIO_CTLR(SWITCH_NODE(num), gpios)),                          \
+	  .gpio_pin = DT_GPIO_PIN(SWITCH_NODE(num), gpios),                                        \
+	  .gpio_flags = (GPIO_INPUT | DT_GPIO_FLAGS(SWITCH_NODE(num), gpios)) }
 
 #define TEMPERATURE_0_NODE DT_ALIAS(temperature_0)
 #define TEMPERATURE_0_AVAILABLE DT_NODE_HAS_STATUS(TEMPERATURE_0_NODE, okay)

diff --git a/bubblemaker/src/sensors.c b/bubblemaker/src/sensors.c
@@ -38,10 +38,6 @@ LOG_MODULE_REGISTER(sensor);
 #define ACIDITY_0_AVAILABLE ADC_HAS_SENSOR(acidity0)
 #define ACIDITY_1_AVAILABLE ADC_HAS_SENSOR(acidity1)
 
-#define ADC_DT_SPEC_GET_BY_NAME(NodeId, Name)                                                      \
-	ADC_DT_SPEC_STRUCT(DT_IO_CHANNELS_CTLR_BY_NAME(NodeId, Name),                              \
-			   DT_IO_CHANNELS_INPUT_BY_NAME(NodeId, Name))
-
 enum adc_channels {
 #if PRESSURE_0_AVAILABLE
 	ADC_CHANNEL_PRESSURE_0,

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.5.0
+    revision: v2.7.0
     import: true
   - name: Anjay-zephyr
     submodules: true
     remote: anjay
-    revision: 3.8.0
+    revision: 3.8.1
     path: modules/lib/anjay
diff --git a/demo/CMakeLists.txt b/demo/CMakeLists.txt
@@ -31,7 +31,9 @@ if(CONFIG_PARTITION_MANAGER_ENABLED)
                 set(pm_missing_message "${pm_missing_message}, build type: ${CONF_FILE_BUILD_TYPE}")
             endif()
 
-            message(FATAL_ERROR "${pm_missing_message}")
+            if(NOT SKIP_PM_CHECK)
+                message(FATAL_ERROR "${pm_missing_message}. If you want to skip this warning, temporarily pass -DSKIP_PM_CHECK=ON to CMake args.")
+            endif()
         endif()
     endif()
 endif()

diff --git a/demo/README.md b/demo/README.md
@@ -18,7 +18,7 @@ The following LwM2M Objects are supported by default:
 | Thingy:91 | Connectivity Monitoring (/4)<br>**Firmware Update (/5)**<br>Location (/6)<br>Temperature (/3303)<br>Humidity (/3304)<br>Accelerometer (/3313)<br>Barometer (/3315)<br>Buzzer (/3338)<br>Push button (/3347)<br>LED color light (/3420)<br>ECID-Signal Measurement Information (/10256)<br>GNSS Assistance (/33625) (experimental)<br>Ground Fix Location (/33626) (experimental, to enable in Kconfig)<br>Advanced Firmware Update (/33629) (experimental, to enable in Kconfig) |
 | DevEdge | **Firmware Update (/5)**<br>Location (/6)<br>Illuminance (/3301)<br>Temperature (/3303)<br>Accelerometer (/3313)<br>Barometer (/3315)<br>Push button (/3347) |
 | nRF52840DK | Push button (/3347) |
-| nRF7002DK | Light Control (/3311)<br>Push button (/3347) |
+| nRF7002DK | **Firmware Update (/5)**<br>Light Control (/3311)<br>Push button (/3347) |
 | Arduino Nano 33 BLE Sense Lite | Temperature (/3303)<br>Barometer (/3315) |
 > **__NOTE:__**
 > Lite version of `Arduino Nano 33 BLE Sense` does NOT contain HTS221 sensor.
@@ -43,9 +43,9 @@ west config manifest.path Anjay-zephyr-client/demo
 west config manifest.file west-nrf.yml
 west update
 ```
-Now you can compile the project using `west build -b nrf9160dk_nrf9160_ns`, `west build -b thingy91_nrf9160_ns`, `west build -b nrf7002dk_nrf5340_cpuapp_ns`, `west build -b nrf52840dk_nrf52840` or `west build -b arduino_nano_33_ble_sense` in `demo` directory, respectively. The last two commands compiles project for use with the OpenThread network, more about this can be found in the section [Connecting to the LwM2M Server with OpenThread](#connecting-to-the-lwm2m-server-with-openthread).
+Now you can compile the project using `west build -b nrf9160dk/nrf9160/ns`, `west build -b thingy91/nrf9160/ns`, `west build -b nrf7002dk/nrf5340/cpuapp/ns`, `west build -b nrf52840dk/nrf52840` or `west build -b arduino_nano_33_ble/nrf52840/sense` in `demo` directory, respectively. The last two commands compiles project for use with the OpenThread network, more about this can be found in the section [Connecting to the LwM2M Server with OpenThread](#connecting-to-the-lwm2m-server-with-openthread).
 
-By default, building for `nrf9160dk_nrf9160_ns` target is intended for nRF9160DK hardware revision 0.14.0. In order to protect against further NCS updates, we can provide the revision explicitly, by calling `west build -b nrf9160dk_nrf9160_ns@0.14.0`.
+By default, building for `nrf9160dk/nrf9160/ns` target is intended for nRF9160DK hardware revision 0.14.0. In order to protect against further NCS updates, we can provide the revision explicitly, by calling `west build -b nrf9160dk@0.14.0/nrf9160/ns`.
 
 ### Compilation guide for T-Mobile DevEdge
 
@@ -115,15 +115,15 @@ The preferred bearer can be saved onto persistent storage (among other settings)
 
 ### Compiling for external and internal flash usage
 
-Revision 0.14.0 of nRF9160DK and all subsequent ones put the MCUboot secondary partition on the external flash instead of dividing the internal flash space. If you want to utilize internal flash memory instead, use `0.7.0` revision, by calling `west build -b nrf9160dk_nrf9160_ns@0.7.0 -- -DCONF_FILE=prj_intflash.conf`.
+Revision 0.14.0 of nRF9160DK and all subsequent ones put the MCUboot secondary partition on the external flash instead of dividing the internal flash space. If you want to utilize internal flash memory instead, use `0.7.0` revision, by calling `west build -b nrf9160dk@0.7.0/nrf9160/ns -- -DFILE_SUFFIX=intflash`.
 
 ### Compiling with software-based cryptography
 
 On Nordic boards, security is provided using the (D)TLS sockets implemented in modem firmware and provided by nrfxlib.
 
 However, on nRF9160DK revisions 0.14.0 and up, it is possible to switch to software-based implementation based on Mbed TLS instead. This is not recommended due to lowered security and performance, but may be desirable if you require some specific (D)TLS features (e.g. ciphersuites and DTLS Connection ID support) that are not supported by the modem.
 
-To compile in this configuration, use `west build -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE=overlay_nrf_mbedtls.conf`.
+To compile in this configuration, use `west build -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE=overlay_nrf_mbedtls.conf`.
 
 ### Compiling with experimental Advanced Firmware Update object
 
@@ -135,11 +135,11 @@ to Firmware Update (/5) object, which allows for upgrading both application firm
 
 Binaries used to update the application are the same as those used in default Firmware Update (/5) object. nRF9160 firmware can be found [here](https://www.nordicsemi.com/Products/nRF9160/Download#infotabs).
 
-To compile in this configuration, use `west build -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE=overlay_nrf9160_afu.conf`.
+To compile in this configuration, use `west build -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE=overlay_nrf9160_afu.conf`.
 
 Additionally, on nRF9160DK revisions 0.14.0 and up, it's possible to also update modem firmware using [full firmware packages](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.4.0/nrfxlib/nrf_modem/doc/bootloader.html).
 
-To compile in this configuration, use `west build -b nrf9160dk_nrf9160_ns -- -DEXTRA_CONF_FILE=overlay_nrf9160_afu_full.conf`.
+To compile in this configuration, use `west build -b nrf9160dk/nrf9160/ns -- -DEXTRA_CONF_FILE=overlay_nrf9160_afu_full.conf`.
 
 ## Flashing the target
 
@@ -244,7 +244,7 @@ where `<BOARD>` should be replaced by the selected board from `boards/` director
 
 This feature works with nrf9160dk starting from revision v0.14.0. For this board use configuration which utilizes external flash chip and software-based cryptography:
 ```
-west build -b nrf9160dk_nrf9160_ns -p -- -DEXTRA_CONF_FILE="overlay_nrf_mbedtls.conf"
+west build -b nrf9160dk/nrf9160/ns -p -- -DEXTRA_CONF_FILE="overlay_nrf_mbedtls.conf"
 ```
 
 After that, certificate and private key based on SECP256R1 curve can be provided through shell interface in PEM format. To generate them use following commands (to use certificate and private key with Coiote DM you must specify a common name that is the same as the client endpoint name):
@@ -309,7 +309,7 @@ Currently the script is designed only for Nordic boards, and it was tested with
 Example script invocation from the `demo` for provisioning some nRF 9160DK board directory may look like:
 
 ```bash
-../tools/provisioning-tool/ptool.py -b nrf9160dk_nrf9160_ns -s <SERIAL> -c ../tools/provisioning-tool/configs/endpoint_cfg -t <TOKEN> -S ../tools/provisioning-tool/configs/lwm2m_server.json
+../tools/provisioning-tool/ptool.py -b nrf9160dk/nrf9160/ns -s <SERIAL> -c ../tools/provisioning-tool/configs/endpoint_cfg -t <TOKEN> -S ../tools/provisioning-tool/configs/lwm2m_server.json
 ```
 
 where `<SERIAL>` should be replaced by our board's serial number and `<TOKEN>` should be replaced by some valid authentication token for the Coiote server provided in the `lwm2m_server.json` file.
@@ -348,7 +348,7 @@ Once you have the server certificate, you can now provision the board. Example
 script invocation may look like:
 
 ```bash
-../tools/provisioning-tool/ptool.py -b nrf9160dk_nrf9160_ns -s <SERIAL> -c ../tools/provisioning-tool/configs/endpoint_cfg_cert -p eu-cloud-cert.der -C ../tools/provisioning-tool/configs/cert_info.json
+../tools/provisioning-tool/ptool.py -b nrf9160dk/nrf9160/ns -s <SERIAL> -c ../tools/provisioning-tool/configs/endpoint_cfg_cert -p eu-cloud-cert.der -C ../tools/provisioning-tool/configs/cert_info.json
 ```
 
 > **__NOTE:__**

diff --git a/demo/boards/arduino_nano_33_ble_sense.conf b/demo/boards/arduino_nano_33_ble_sense.conf
@@ -42,11 +42,9 @@ CONFIG_OPENTHREAD_JOINER_PSKD="J01NME"
 CONFIG_OPENTHREAD_FTD=y
 
 # MbedTLS and security
-CONFIG_MBEDTLS=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED=y
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
+CONFIG_MBEDTLS_CTR_DRBG_C=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
-CONFIG_MBEDTLS_DTLS=y
-CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_HEAP_SIZE=15360
 
 # Sensors

diff --git a/demo/boards/disco_l475_iot1.conf b/demo/boards/disco_l475_iot1.conf
@@ -20,11 +20,7 @@ CONFIG_NET_L2_WIFI_MGMT=y
 CONFIG_NET_L2_WIFI_MGMT_LOG_LEVEL_ERR=y
 
 # MbedTLS and security
-CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_CIPHER_CCM_ENABLED=y
-CONFIG_MBEDTLS_DTLS=y
-CONFIG_MBEDTLS_ENTROPY_ENABLED=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED=y
 CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR=y
 CONFIG_ENTROPY_STM32_RNG=y
 
@@ -47,4 +43,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_IMGTOOL_SIGN_VERSION="24.5.0"
+CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="24.11.0"
diff --git a/demo/boards/esp32_devkitc_wroom.conf b/demo/boards/esp32_devkitc_wroom.conf
@@ -19,8 +19,6 @@ CONFIG_DNS_RESOLVER=y
 
 # MbedTLS and security
 CONFIG_ANJAY_COMPAT_MBEDTLS=y
-CONFIG_MBEDTLS=y
-CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
 

diff --git a/demo/boards/nrf52840dk_nrf52840.conf b/demo/boards/nrf52840dk_nrf52840.conf
@@ -42,11 +42,9 @@ CONFIG_OPENTHREAD_JOINER_PSKD="J01NME"
 CONFIG_OPENTHREAD_FTD=y
 
 # MbedTLS and security
-CONFIG_MBEDTLS=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED=y
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
+CONFIG_MBEDTLS_CTR_DRBG_C=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
-CONFIG_MBEDTLS_DTLS=y
-CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_HEAP_SIZE=12288
 
 # Shell settings