Merge pull request #219 from sorru94/support-zephyr-2.7.1

Support for Zephyr 3.7.1
astarte-platform · Dec 5, 2024 · 683fb61 · 683fb61
2 parents 59ef048 + 16b93cb
commit 683fb61
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 57 deletions.
diff --git a/e2e/prj.conf b/e2e/prj.conf
@@ -78,16 +78,12 @@ CONFIG_DNS_SERVER1="8.8.8.8" # Google DNS
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_BUILTIN=y
 CONFIG_MBEDTLS_ENABLE_HEAP=y
-# 55kB is the max absolute value, could be set much lower
 CONFIG_MBEDTLS_HEAP_SIZE=55000
-# 16384 is the max absolute value, could be set much lower
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
-CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y # Does not include writing
-CONFIG_MBEDTLS_PK_WRITE_C=y # Required for PEM writing (also needs MBEDTLS_PEM_WRITE_C)
+CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
+CONFIG_MBEDTLS_PK_WRITE_C=y
 CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y
-CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
-CONFIG_MBEDTLS_USER_CONFIG_FILE="../samples/astarte_app/include/tls-conf.h"
 CONFIG_MBEDTLS_TLS_VERSION_1_2=y
 CONFIG_MBEDTLS_CIPHER=y
 CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y

diff --git a/get_started.md b/get_started.md
@@ -109,16 +109,13 @@ CONFIG_MQTT_LIB_TLS=y
 
 # MbedTLS
 CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
 CONFIG_MBEDTLS_ENABLE_HEAP=y
-# 55kB is the max absolute value, could be set much lower
 CONFIG_MBEDTLS_HEAP_SIZE=55000
-# 16384 is the max absolute value, could be set much lower
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
-CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y # Does not include writing
-CONFIG_MBEDTLS_PK_WRITE_C=y # Required for PEM writing (also needs MBEDTLS_PEM_WRITE_C)
+CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
+CONFIG_MBEDTLS_PK_WRITE_C=y
 CONFIG_MBEDTLS_X509_CSR_WRITE_C=y
-CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
-CONFIG_MBEDTLS_USER_CONFIG_FILE="../samples/astarte_app/include/tls-conf.h"
 CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y
 CONFIG_MBEDTLS_TLS_VERSION_1_2=y

diff --git a/samples/astarte_app/include/tls-conf.h b/samples/astarte_app/include/tls-conf.h
diff --git a/samples/astarte_app/prj.conf b/samples/astarte_app/prj.conf
@@ -53,16 +53,12 @@ CONFIG_DNS_SERVER1="8.8.8.8" # Google DNS
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_BUILTIN=y
 CONFIG_MBEDTLS_ENABLE_HEAP=y
-# 55kB is the max absolute value, could be set much lower
 CONFIG_MBEDTLS_HEAP_SIZE=55000
-# 16384 is the max absolute value, could be set much lower
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
-CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y # Does not include writing
-CONFIG_MBEDTLS_PK_WRITE_C=y # Required for PEM writing (also needs MBEDTLS_PEM_WRITE_C)
+CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
+CONFIG_MBEDTLS_PK_WRITE_C=y
 CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y
-CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
-CONFIG_MBEDTLS_USER_CONFIG_FILE="../samples/astarte_app/include/tls-conf.h"
 CONFIG_MBEDTLS_TLS_VERSION_1_2=y
 CONFIG_MBEDTLS_CIPHER=y
 CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y

diff --git a/tests/lib/astarte_device_sdk/integration/device_caching/prj.conf b/tests/lib/astarte_device_sdk/integration/device_caching/prj.conf
@@ -39,8 +39,6 @@ CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
 CONFIG_MBEDTLS_PK_WRITE_C=y
 CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y
-CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
-CONFIG_MBEDTLS_USER_CONFIG_FILE="../../../../astarte-device-sdk-zephyr/tests/lib/astarte_device_sdk/integration/include/native-sim-tls-conf.h"
 CONFIG_MBEDTLS_TLS_VERSION_1_2=y
 CONFIG_MBEDTLS_CIPHER=y
 CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y

diff --git a/tests/lib/astarte_device_sdk/integration/introspection/prj.conf b/tests/lib/astarte_device_sdk/integration/introspection/prj.conf
@@ -20,8 +20,6 @@ CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
 CONFIG_MBEDTLS_PK_WRITE_C=y
 CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y
-CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
-CONFIG_MBEDTLS_USER_CONFIG_FILE="../../../../astarte-device-sdk-zephyr/tests/lib/astarte_device_sdk/integration/include/native-sim-tls-conf.h"
 CONFIG_MBEDTLS_TLS_VERSION_1_2=y
 CONFIG_MBEDTLS_CIPHER=y
 CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y

diff --git a/tests/lib/astarte_device_sdk/integration/kv_storage/prj.conf b/tests/lib/astarte_device_sdk/integration/kv_storage/prj.conf
@@ -39,8 +39,6 @@ CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
 CONFIG_MBEDTLS_PK_WRITE_C=y
 CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y
-CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
-CONFIG_MBEDTLS_USER_CONFIG_FILE="../../../../astarte-device-sdk-zephyr/tests/lib/astarte_device_sdk/integration/include/native-sim-tls-conf.h"
 CONFIG_MBEDTLS_TLS_VERSION_1_2=y
 CONFIG_MBEDTLS_CIPHER=y
 CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y

diff --git a/tests/lib/astarte_device_sdk/integration/uuid/prj.conf b/tests/lib/astarte_device_sdk/integration/uuid/prj.conf
@@ -18,8 +18,6 @@ CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
 CONFIG_MBEDTLS_PK_WRITE_C=y
 CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y
-CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
-CONFIG_MBEDTLS_USER_CONFIG_FILE="../../../../astarte-device-sdk-zephyr/tests/lib/astarte_device_sdk/integration/include/native-sim-tls-conf.h"
 CONFIG_MBEDTLS_TLS_VERSION_1_2=y
 CONFIG_MBEDTLS_CIPHER=y
 CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y

diff --git a/tests/lib/astarte_device_sdk/integration/zlib/prj.conf b/tests/lib/astarte_device_sdk/integration/zlib/prj.conf
@@ -19,8 +19,6 @@ CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
 CONFIG_MBEDTLS_PK_WRITE_C=y
 CONFIG_MBEDTLS_ENTROPY_ENABLED=y
 CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y
-CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
-CONFIG_MBEDTLS_USER_CONFIG_FILE="../../../../astarte-device-sdk-zephyr/tests/lib/astarte_device_sdk/integration/include/native-sim-tls-conf.h"
 CONFIG_MBEDTLS_TLS_VERSION_1_2=y
 CONFIG_MBEDTLS_CIPHER=y
 CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y

diff --git a/west-ci.yml b/west-ci.yml
@@ -15,7 +15,7 @@ manifest:
   projects:
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: v3.7.0
+      revision: v3.7.1
       import:
         # By using name-allowlist we can clone only the modules that are
         # strictly needed by the application.

diff --git a/west-e2e.yml b/west-e2e.yml
@@ -15,7 +15,7 @@ manifest:
   projects:
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: v3.7.0
+      revision: v3.7.1
       import:
         # By using name-allowlist we can clone only the modules that are
         # strictly needed by the application.

diff --git a/west.yml b/west.yml
@@ -15,7 +15,7 @@ manifest:
   projects:
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: v3.7.0
+      revision: v3.7.1
       import: true
     - name: zlib-zephyr
       remote: secomind