[nrfconnect] Update nRF Connect version (project-chip#8242)

* [nrfconnect] Update nRF Connect version Bump supported nRF Connect SDK version, including the Docker image, and fix all related build issues. * Restyled by clang-format Co-authored-by: Restyled.io <commits@restyled.io>
Jagadish-NXP · Jul 9, 2021 · ac9c775 · ac9c775
1 parent 77c2e75
commit ac9c775
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/config/nrfconnect/.nrfconnect-recommended-revision b/config/nrfconnect/.nrfconnect-recommended-revision
@@ -1 +1 @@
-910c9ce5ba8ea30155b50b9d12f03ece7123a0c2
+55ae470380f17a949fe45b7686cf5c8743d5fb30
diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt
@@ -99,9 +99,11 @@ if (CONFIG_POSIX_API)
 endif()
 
 if (CONFIG_NORDIC_SECURITY_BACKEND)
-    # TODO: Remove when the missing dependency is fixed in nRF Connect SDK
-    zephyr_include_directories(${ZEPHYR_BASE}/../nrfxlib/crypto/nrf_cc310_platform/include)
-
+    zephyr_include_directories($<TARGET_PROPERTY:mbedtls_external,INTERFACE_INCLUDE_DIRECTORIES>)
+    zephyr_include_directories($<TARGET_PROPERTY:mbedcrypto_includes,INTERFACE_INCLUDE_DIRECTORIES>)
+    if(TARGET platform_cc3xx)
+        zephyr_include_directories($<TARGET_PROPERTY:platform_cc3xx,INTERFACE_INCLUDE_DIRECTORIES>)
+    endif()
     list(APPEND CHIP_CFLAGS -DMBEDTLS_CONFIG_FILE=<nrf-config.h>)
 endif()
 

diff --git a/integrations/docker/images/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/chip-build-nrf-platform/Dockerfile
@@ -2,7 +2,7 @@ ARG VERSION=latest
 FROM connectedhomeip/chip-build:${VERSION}
 
 # Compatible Nordic Connect SDK revision.
-ARG NCS_REVISION=910c9ce5ba8ea30155b50b9d12f03ece7123a0c2
+ARG NCS_REVISION=55ae470380f17a949fe45b7686cf5c8743d5fb30
 
 # ==================================================
 # nRF Connect SDK dependencies
@@ -27,11 +27,13 @@ RUN set -x \
 
 WORKDIR /opt/NordicSemiconductor/nrfconnect
 RUN set -x \
+    # python3-yaml package conflicts with nRF Python requirements
+    && (apt remove -fy python3-yaml && apt autoremove || exit 0) \
     && python3 -m pip install -U --no-cache-dir pip setuptools wheel cmake west \
     && west init -m https://github.com/nrfconnect/sdk-nrf --mr "$NCS_REVISION" \
     && west config update.narrow true \
     && west config update.fetch smart \
-    && west update -o=--depth=1 \
+    && west update -o=--depth=1 -n -f smart \
     && python3 -m pip install --no-cache-dir -r zephyr/scripts/requirements.txt \
     && python3 -m pip install --no-cache-dir -r nrf/scripts/requirements.txt \
     && python3 -m pip install --no-cache-dir -r bootloader/mcuboot/scripts/requirements.txt \

diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.4.30
+0.4.31
diff --git a/src/platform/OpenThread/OpenThreadUtils.cpp b/src/platform/OpenThread/OpenThreadUtils.cpp
@@ -95,8 +95,13 @@ void LogOpenThreadStateChange(otInstance * otInst, uint32_t flags)
 {
 #if CHIP_DETAIL_LOGGING
 
+#if OPENTHREAD_API_VERSION >= 126
+    const uint32_t kParamsChanged = (OT_CHANGED_THREAD_NETWORK_NAME | OT_CHANGED_THREAD_PANID | OT_CHANGED_THREAD_EXT_PANID |
+                                     OT_CHANGED_THREAD_CHANNEL | OT_CHANGED_NETWORK_KEY | OT_CHANGED_PSKC);
+#else
     const uint32_t kParamsChanged = (OT_CHANGED_THREAD_NETWORK_NAME | OT_CHANGED_THREAD_PANID | OT_CHANGED_THREAD_EXT_PANID |
                                      OT_CHANGED_THREAD_CHANNEL | OT_CHANGED_MASTER_KEY | OT_CHANGED_PSKC);
+#endif
 
     static char strBuf[64];