Skip to content

Commit 09a583a

Browse files
committed
Update to NCS v2.6.1 base app, and Memfault SDK v1.9.0
1 parent 98913e1 commit 09a583a

File tree

2 files changed

+15
-37
lines changed

2 files changed

+15
-37
lines changed

boards/nrf7002dk_nrf5340_cpuapp.conf

+13-35
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192
1818
CONFIG_MAIN_STACK_SIZE=4096
1919
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
2020
CONFIG_MAIN_STACK_SIZE=4096
21-
CONFIG_SHELL_STACK_SIZE=4096
2221
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
2322
CONFIG_NET_TX_STACK_SIZE=4096
2423
CONFIG_NET_RX_STACK_SIZE=4096
@@ -32,7 +31,6 @@ CONFIG_NET_UDP=y
3231
CONFIG_NET_SOCKETS_OFFLOAD=n
3332
CONFIG_NET_DHCPV4=y
3433
CONFIG_NET_CONTEXT_SNDTIMEO=y
35-
CONFIG_NET_MGMT_EVENT_STACK_SIZE=4096
3634
CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
3735
CONFIG_NET_STATISTICS=y
3836
CONFIG_NET_STATISTICS_WIFI=y
@@ -44,6 +42,7 @@ CONFIG_NET_CONTEXT_SYNC_RECV=y
4442

4543
# DNS
4644
CONFIG_DNS_RESOLVER=y
45+
CONFIG_NET_SOCKETS_DNS_TIMEOUT=30000
4746

4847
# printing of scan results puts pressure on queues in new locking
4948
# design in net_mgmt. So, use a typical number of networks in a crowded
@@ -61,10 +60,15 @@ CONFIG_NET_TC_TX_COUNT=1
6160
# Wi-Fi
6261
CONFIG_WIFI=y
6362
CONFIG_WIFI_NRF700X=y
64-
CONFIG_WIFI_LOG_LEVEL_ERR=y
63+
CONFIG_WIFI_NRF700X_LOG_LEVEL_ERR=y
6564
CONFIG_WIFI_MGMT_EXT=y
6665
CONFIG_NET_L2_WIFI_SHELL=y
6766
CONFIG_NET_SHELL=y
67+
CONFIG_WIFI_CREDENTIALS=y
68+
69+
# Shell
70+
CONFIG_SHELL=y
71+
CONFIG_SHELL_STACK_SIZE=6144
6872

6973
# WPA
7074
CONFIG_WPA_SUPP=y
@@ -75,22 +79,19 @@ CONFIG_NVS=y
7579
CONFIG_SETTINGS=y
7680
CONFIG_SETTINGS_NVS=y
7781

78-
# WiFi credentials
79-
CONFIG_WIFI_CREDENTIALS=y
80-
CONFIG_WIFI_CREDENTIALS_BACKEND_SETTINGS=y
81-
# CONFIG_WIFI_CREDENTIALS_STATIC=y
82-
# CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
83-
# CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
84-
8582
# Native network stack
8683
CONFIG_NRF_SECURITY=y
87-
CONFIG_PSA_CRYPTO_DRIVER_CC3XX=n
8884
CONFIG_MBEDTLS=y
8985
CONFIG_MBEDTLS_ENABLE_HEAP=y
9086
CONFIG_MBEDTLS_HEAP_SIZE=120000
9187
CONFIG_MBEDTLS_RSA_C=y
9288
CONFIG_MBEDTLS_SSL_SERVER_NAME_INDICATION=y
9389

90+
# PSA
91+
CONFIG_PSA_CRYPTO_DRIVER_CC3XX=n
92+
CONFIG_PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY=y
93+
CONFIG_PSA_WANT_RSA_KEY_SIZE_2048=y
94+
9495
# Certificate management
9596
CONFIG_MEMFAULT_ROOT_CERT_STORAGE_TLS_CREDENTIAL_STORAGE=y
9697
CONFIG_MEMFAULT_NCS_PROVISION_CERTIFICATES=y
@@ -102,30 +103,7 @@ CONFIG_PM_SINGLE_IMAGE=y
102103

103104
# Zephyr NET Connection Manager Connectivity layer.
104105
CONFIG_L2_WIFI_CONNECTIVITY=y
106+
CONFIG_L2_WIFI_CONNECTIVITY_AUTO_CONNECT=n
105107
CONFIG_L2_WIFI_CONNECTIVITY_AUTO_DOWN=n
106108

107109
CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=4096
108-
109-
##
110-
# FOTA Support
111-
CONFIG_SPI=y
112-
CONFIG_SPI_NOR=y
113-
CONFIG_SPI_NOR_SFDP_DEVICETREE=y
114-
CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
115-
116-
CONFIG_BOOTLOADER_MCUBOOT=y
117-
CONFIG_MCUBOOT_IMG_MANAGER=y
118-
119-
CONFIG_IMG_MANAGER=y
120-
CONFIG_STREAM_FLASH=y
121-
CONFIG_IMG_ERASE_PROGRESSIVELY=y
122-
123-
CONFIG_FOTA_DOWNLOAD=y
124-
CONFIG_DFU_TARGET=y
125-
126-
CONFIG_DOWNLOAD_CLIENT=y
127-
CONFIG_DOWNLOAD_CLIENT_STACK_SIZE=4096
128-
129-
CONFIG_MEMFAULT_NRF_CONNECT_SDK=y
130-
CONFIG_MEMFAULT_FOTA=y
131-
CONFIG_DOWNLOAD_CLIENT_MAX_FILENAME_SIZE=400

west.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ manifest:
44
- name: sdk-nrf
55
path: nrf
66
url: https://github.com/nrfconnect/sdk-nrf.git
7-
revision: v2.5.1
7+
revision: v2.6.1
88
import: true
99

1010
- name: memfault-firmware-sdk
1111
url: https://github.com/memfault/memfault-firmware-sdk
1212
path: modules/lib/memfault-firmware-sdk
13-
revision: 1.6.2
13+
revision: 1.9.0

0 commit comments

Comments
 (0)