From ac9c7758913beb8870719d4caaaba57933a4adb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Kr=C3=B3lik?=
 <66667989+Damian-Nordic@users.noreply.github.com>
Date: Fri, 9 Jul 2021 20:28:19 +0200
Subject: [PATCH] [nrfconnect] Update nRF Connect version (#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>
---
 config/nrfconnect/.nrfconnect-recommended-revision        | 2 +-
 config/nrfconnect/chip-module/CMakeLists.txt              | 8 +++++---
 .../docker/images/chip-build-nrf-platform/Dockerfile      | 6 ++++--
 integrations/docker/images/chip-build/version             | 2 +-
 src/platform/OpenThread/OpenThreadUtils.cpp               | 5 +++++
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/config/nrfconnect/.nrfconnect-recommended-revision b/config/nrfconnect/.nrfconnect-recommended-revision
index ca034d72135e1d..09f7be2e8aea04 100644
--- 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
index c8d8d808b04021..fb308760159415 100644
--- 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
index 826dfb66a957a3..c658a5fa87225d 100644
--- 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
index 48c7cdb0aaa3c3..385186430a8f04 100644
--- 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
index 6a8a673a2f6250..43632428f8fa51 100644
--- 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];