Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrfconnect] Update nRF Connect version #8242

Merged
merged 2 commits into from
Jul 9, 2021
Merged

[nrfconnect] Update nRF Connect version #8242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19c5f63
[nrfconnect] Update nRF Connect version
Damian-Nordic Jul 9, 2021
400dac9
Restyled by clang-format
restyled-commits Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/nrfconnect/.nrfconnect-recommended-revision
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
910c9ce5ba8ea30155b50b9d12f03ece7123a0c2
55ae470380f17a949fe45b7686cf5c8743d5fb30
8 changes: 5 additions & 3 deletions config/nrfconnect/chip-module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
6 changes: 4 additions & 2 deletions integrations/docker/images/chip-build-nrf-platform/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.30
0.4.31
5 changes: 5 additions & 0 deletions src/platform/OpenThread/OpenThreadUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down