From 41718157deb111a592ec959cd26c705ca56580aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20S=2E=20R=C3=B8stad?= Date: Thu, 10 Oct 2024 15:02:39 +0200 Subject: [PATCH] samples: Re-add board support in Wi-Fi and NET samples Re-add board support in Wi-Fi and NET samples that was removed in the last upmerge. --- samples/debug/memfault/Kconfig.sysbuild | 10 +++++ .../boards/nrf7002dk_nrf5340_cpuapp.conf | 35 ++++++++---------- samples/debug/memfault/prj.conf | 1 + samples/debug/memfault/sample.yaml | 3 ++ .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 5 ++- samples/net/aws_iot/sample.yaml | 3 ++ .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 5 ++- samples/net/azure_iot_hub/prj.conf | 1 + samples/net/azure_iot_hub/sample.yaml | 4 ++ .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 3 ++ .../boards/thingy91x_nrf9151_ns.conf | 21 +++++++++++ samples/net/coap_client/sample.yaml | 4 ++ .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 9 +++-- samples/net/download/sample.yaml | 4 ++ .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 4 +- .../boards/thingy91x_nrf9151_ns.conf | 24 ++++++++++++ samples/net/http_server/sample.yaml | 8 ++++ .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 4 +- samples/net/https_client/sample.yaml | 2 + .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 5 ++- samples/net/mqtt/sample.yaml | 7 ++++ .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 4 +- .../net/udp/boards/thingy91x_nrf9151_ns.conf | 37 +++++++++++++++++++ .../udp/boards/thingy91x_nrf9151_ns.overlay | 18 +++++++++ samples/net/udp/sample.yaml | 4 ++ samples/wifi/provisioning/softap/prj.conf | 2 +- 26 files changed, 194 insertions(+), 33 deletions(-) create mode 100644 samples/debug/memfault/Kconfig.sysbuild create mode 100644 samples/net/coap_client/boards/thingy91x_nrf9151_ns.conf create mode 100644 samples/net/http_server/boards/thingy91x_nrf9151_ns.conf create mode 100644 samples/net/udp/boards/thingy91x_nrf9151_ns.conf create mode 100644 samples/net/udp/boards/thingy91x_nrf9151_ns.overlay diff --git a/samples/debug/memfault/Kconfig.sysbuild b/samples/debug/memfault/Kconfig.sysbuild new file mode 100644 index 000000000000..4517d14bd62a --- /dev/null +++ b/samples/debug/memfault/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +config WIFI_NRF70 + default y if BOARD_NRF7002DK_NRF5340_CPUAPP + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf index 24269e040bcf..0ac559d28855 100644 --- a/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf +++ b/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf @@ -6,35 +6,38 @@ # General CONFIG_POSIX_CLOCK=y -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 -CONFIG_HEAP_MEM_POOL_SIZE=153600 CONFIG_HW_STACK_PROTECTION=y CONFIG_HW_ID_LIBRARY=y CONFIG_HW_ID_LIBRARY_SOURCE_NET_MAC=y # Heap and stacks -CONFIG_HEAP_MEM_POOL_SIZE=8192 +CONFIG_HEAP_MEM_POOL_SIZE=153600 +CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_MAIN_STACK_SIZE=8192 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_NET_TX_STACK_SIZE=4096 CONFIG_NET_RX_STACK_SIZE=4096 +CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=4096 -# Network -CONFIG_NET_SOCKETS=y +# Network and NET sockets CONFIG_NET_L2_ETHERNET=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y -CONFIG_NET_SOCKETS_OFFLOAD=n CONFIG_NET_DHCPV4=y +CONFIG_NET_SOCKETS_OFFLOAD=n CONFIG_NET_CONTEXT_SNDTIMEO=y +CONFIG_NET_CONTEXT_SYNC_RECV=y +CONFIG_NET_SOCKETS_ENABLE_DTLS=n CONFIG_NET_SOCKETS_SOCKOPT_TLS=y +CONFIG_NET_SOCKETS=y +CONFIG_NET_SOCKETS_POLL_MAX=20 CONFIG_NET_STATISTICS=y CONFIG_NET_STATISTICS_WIFI=y CONFIG_NET_STATISTICS_USER_API=y CONFIG_NET_PKT_RX_COUNT=8 CONFIG_NET_PKT_TX_COUNT=8 CONFIG_NET_MAX_CONTEXTS=5 -CONFIG_NET_CONTEXT_SYNC_RECV=y +CONFIG_ZVFS_OPEN_MAX=25 # DNS CONFIG_DNS_RESOLVER=y @@ -44,19 +47,18 @@ CONFIG_NET_SOCKETS_DNS_TIMEOUT=30000 # design in net_mgmt. So, use a typical number of networks in a crowded # environment as the queue depth. CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=150 +CONFIG_NET_MGMT_EVENT_STACK_SIZE=4096 # Below section is the primary contributor to SRAM and is currently # not optimized for size. CONFIG_NET_BUF_RX_COUNT=16 CONFIG_NET_BUF_TX_COUNT=64 CONFIG_NET_BUF_DATA_SIZE=128 -CONFIG_HEAP_MEM_POOL_SIZE=153600 CONFIG_NET_TC_TX_COUNT=1 # Wi-Fi CONFIG_WIFI=y CONFIG_WIFI_NRF70=y -CONFIG_WIFI_NRF70_LOG_LEVEL_ERR=y CONFIG_WIFI_MGMT_EXT=y CONFIG_NET_L2_WIFI_SHELL=y CONFIG_NET_SHELL=y @@ -75,18 +77,15 @@ CONFIG_NVS=y CONFIG_SETTINGS=y CONFIG_SETTINGS_NVS=y -# Native network stack +# mbedTLS CONFIG_NRF_SECURITY=y CONFIG_MBEDTLS=y CONFIG_MBEDTLS_ENABLE_HEAP=y -CONFIG_MBEDTLS_HEAP_SIZE=120000 +CONFIG_MBEDTLS_HEAP_SIZE=81920 CONFIG_MBEDTLS_RSA_C=y +CONFIG_MBEDTLS_TLS_LIBRARY=y CONFIG_MBEDTLS_SSL_SERVER_NAME_INDICATION=y - -# PSA -CONFIG_PSA_CRYPTO_DRIVER_CC3XX=n -CONFIG_PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY=y -CONFIG_PSA_WANT_RSA_KEY_SIZE_2048=y +CONFIG_MBEDTLS_X509_CRT_PARSE_C=y # Certificate management CONFIG_MEMFAULT_ROOT_CERT_STORAGE_TLS_CREDENTIAL_STORAGE=y @@ -101,5 +100,3 @@ CONFIG_PM_SINGLE_IMAGE=y CONFIG_L2_WIFI_CONNECTIVITY=y CONFIG_L2_WIFI_CONNECTIVITY_AUTO_CONNECT=n CONFIG_L2_WIFI_CONNECTIVITY_AUTO_DOWN=n - -CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=4096 diff --git a/samples/debug/memfault/prj.conf b/samples/debug/memfault/prj.conf index 3e25a4f3100d..4263167372f0 100644 --- a/samples/debug/memfault/prj.conf +++ b/samples/debug/memfault/prj.conf @@ -6,6 +6,7 @@ # General config CONFIG_FPU=y +CONFIG_ASSERT=y # Logging CONFIG_LOG=y diff --git a/samples/debug/memfault/sample.yaml b/samples/debug/memfault/sample.yaml index d44e1f7aee36..fe753b43a980 100644 --- a/samples/debug/memfault/sample.yaml +++ b/samples/debug/memfault/sample.yaml @@ -11,6 +11,7 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns - nrf7002dk/nrf5340/cpuapp platform_allow: - nrf9160dk/nrf9160/ns @@ -32,10 +33,12 @@ tests: - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp tags: ci_build sysbuild ci_samples_debug diff --git a/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index efa830f60a6c..5739a8ac6f8b 100644 --- a/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -11,11 +11,12 @@ # General CONFIG_POSIX_CLOCK=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 -CONFIG_HEAP_MEM_POOL_SIZE=81920 -CONFIG_LOG_MODE_IMMEDIATE=y +CONFIG_HEAP_MEM_POOL_SIZE=120000 +CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_HW_STACK_PROTECTION=y CONFIG_HW_ID_LIBRARY_SOURCE_NET_MAC=y CONFIG_ZVFS_OPEN_MAX=25 +CONFIG_MAIN_STACK_SIZE=6144 # Optimize Wi-Fi stack to save some memory CONFIG_NRF70_RX_NUM_BUFS=16 diff --git a/samples/net/aws_iot/sample.yaml b/samples/net/aws_iot/sample.yaml index bff98553c810..93bca0078320 100644 --- a/samples/net/aws_iot/sample.yaml +++ b/samples/net/aws_iot/sample.yaml @@ -11,6 +11,8 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim platform_allow: - nrf9160dk/nrf9160/ns @@ -18,4 +20,5 @@ tests: - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim diff --git a/samples/net/azure_iot_hub/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/azure_iot_hub/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index 82396c1d11ba..68dc74ed2614 100644 --- a/samples/net/azure_iot_hub/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/azure_iot_hub/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -12,9 +12,10 @@ CONFIG_DK_LIBRARY=y CONFIG_ZVFS_OPEN_MAX=25 # Heap and stacks -CONFIG_MAIN_STACK_SIZE=4096 +CONFIG_MAIN_STACK_SIZE=6144 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 -CONFIG_HEAP_MEM_POOL_SIZE=81920 +CONFIG_HEAP_MEM_POOL_SIZE=120000 +CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_NET_RX_STACK_SIZE=2048 # Optimize Wi-Fi stack to save some memory diff --git a/samples/net/azure_iot_hub/prj.conf b/samples/net/azure_iot_hub/prj.conf index d3e70e89a2e6..db3dbaabfecf 100644 --- a/samples/net/azure_iot_hub/prj.conf +++ b/samples/net/azure_iot_hub/prj.conf @@ -6,6 +6,7 @@ # General config CONFIG_REBOOT=y +CONFIG_ASSERT=y # Logging CONFIG_LOG=y diff --git a/samples/net/azure_iot_hub/sample.yaml b/samples/net/azure_iot_hub/sample.yaml index 27955163bc9e..f42394ee5891 100644 --- a/samples/net/azure_iot_hub/sample.yaml +++ b/samples/net/azure_iot_hub/sample.yaml @@ -8,11 +8,13 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim tags: ci_build sysbuild ci_samples_net sample.net.azure_iot_hub.dps: @@ -22,10 +24,12 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns extra_args: OVERLAY_CONFIG=overlay-dps.conf extra_configs: - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="test-scope" diff --git a/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index 38676b40e7f4..05572bfaa625 100644 --- a/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -12,6 +12,9 @@ CONFIG_POSIX_CLOCK=y CONFIG_LOG_BUFFER_SIZE=4096 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 +CONFIG_MAIN_STACK_SIZE=6144 +CONFIG_HEAP_MEM_POOL_SIZE=120000 +CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y # Optimize TF-M CONFIG_TFM_PROFILE_TYPE_SMALL=y diff --git a/samples/net/coap_client/boards/thingy91x_nrf9151_ns.conf b/samples/net/coap_client/boards/thingy91x_nrf9151_ns.conf new file mode 100644 index 000000000000..6f9f8adf4308 --- /dev/null +++ b/samples/net/coap_client/boards/thingy91x_nrf9151_ns.conf @@ -0,0 +1,21 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Configuration file for Thingy:91X +# This file is merged with prj.conf in the application folder, and options +# set here will take precedence if they are present in both files. + +# General +CONFIG_HW_ID_LIBRARY_SOURCE_IMEI=y + +# Disable Duplicate Address Detection (DAD) +# due to not being properly implemented for offloaded interfaces. +CONFIG_NET_IPV6_NBR_CACHE=n +CONFIG_NET_IPV6_MLD=n + +# Zephyr NET Connection Manager and Connectivity layer. +CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024 +CONFIG_NRF_MODEM_LIB_NET_IF=y diff --git a/samples/net/coap_client/sample.yaml b/samples/net/coap_client/sample.yaml index b1e7676207f6..b5f786623dbe 100644 --- a/samples/net/coap_client/sample.yaml +++ b/samples/net/coap_client/sample.yaml @@ -10,11 +10,15 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim tags: ci_build sysbuild ci_samples_net diff --git a/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index 2e83d7217f7c..0b588e594f65 100644 --- a/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -5,12 +5,13 @@ # # General +CONFIG_LOG=y +CONFIG_LOG_MODE_IMMEDIATE=y CONFIG_POSIX_CLOCK=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 -CONFIG_LOG_BUFFER_SIZE=3072 -CONFIG_HEAP_MEM_POOL_SIZE=81920 -CONFIG_MAIN_STACK_SIZE=4096 -CONFIG_LOG=y +CONFIG_HEAP_MEM_POOL_SIZE=120000 +CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y +CONFIG_MAIN_STACK_SIZE=6144 # Optimize Wi-Fi stack to save some memory CONFIG_NRF70_RX_NUM_BUFS=16 diff --git a/samples/net/download/sample.yaml b/samples/net/download/sample.yaml index 5e3e400bbb18..4d5c1479d9e7 100644 --- a/samples/net/download/sample.yaml +++ b/samples/net/download/sample.yaml @@ -6,9 +6,11 @@ tests: build_only: true integration_platforms: - nrf9161dk/nrf9161/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim platform_allow: - nrf9161dk/nrf9161/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim tags: ci_build sysbuild ci_samples_net sample.net.download_client.ci: @@ -23,8 +25,10 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build sysbuild ci_samples_net diff --git a/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index 6188099bacde..97c4a82b60af 100644 --- a/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -10,7 +10,8 @@ CONFIG_PM_PARTITION_SIZE_TFM_SRAM=0xc000 CONFIG_PM_PARTITION_SIZE_TFM=0x20000 # Optimize Wi-Fi stack to save some memory -CONFIG_HEAP_MEM_POOL_SIZE=81920 +CONFIG_HEAP_MEM_POOL_SIZE=120000 +CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_NRF70_RX_NUM_BUFS=16 CONFIG_NRF70_MAX_TX_AGGREGATION=4 @@ -36,6 +37,7 @@ CONFIG_POSIX_UNAME=n CONFIG_L2_WIFI_CONNECTIVITY=y CONFIG_L2_WIFI_CONNECTIVITY_AUTO_CONNECT=n CONFIG_L2_WIFI_CONNECTIVITY_AUTO_DOWN=n +CONFIG_MAIN_STACK_SIZE=6144 # mbedTLS and sockets CONFIG_ZVFS_OPEN_MAX=25 diff --git a/samples/net/http_server/boards/thingy91x_nrf9151_ns.conf b/samples/net/http_server/boards/thingy91x_nrf9151_ns.conf new file mode 100644 index 000000000000..64489e6d615b --- /dev/null +++ b/samples/net/http_server/boards/thingy91x_nrf9151_ns.conf @@ -0,0 +1,24 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Configuration file for Thingy:91X +# This file is merged with prj.conf in the application folder, and options +# set here will take precedence if they are present in both files. + +# General +CONFIG_PICOLIBC=y + +# Disable Duplicate Address Detection (DAD) +# due to not being properly implemented for offloaded interfaces. +CONFIG_NET_IPV6_NBR_CACHE=n +CONFIG_NET_IPV6_MLD=n + +# Zephyr NET Connection Manager and Connectivity layer. +CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024 +CONFIG_NRF_MODEM_LIB_NET_IF=y + +# Disable PSM to make sure that the server is always available. +CONFIG_LTE_PSM_REQ=n diff --git a/samples/net/http_server/sample.yaml b/samples/net/http_server/sample.yaml index 039c254b97d0..35b38464e890 100644 --- a/samples/net/http_server/sample.yaml +++ b/samples/net/http_server/sample.yaml @@ -4,11 +4,15 @@ tests: sample.net.http_server.wifi: sysbuild: true build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: nrf7002dk/nrf5340/cpuapp/ns tags: ci_build sysbuild ci_samples_net sample.net.http_server.wifi.tls: sysbuild: true build_only: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: nrf7002dk/nrf5340/cpuapp/ns extra_args: OVERLAY_CONFIG=overlay-tls-nrf7002dk.conf tags: ci_build sysbuild ci_samples_net @@ -20,11 +24,13 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns platform_allow: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build sysbuild ci_samples_net sample.net.http_server.lte.tls: sysbuild: true @@ -34,11 +40,13 @@ tests: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns platform_allow: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns extra_args: OVERLAY_CONFIG=overlay-tls-nrf91.conf tags: ci_build sysbuild ci_samples_net sample.net.http_server.emulation: diff --git a/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index bf7a8ddb35c3..9eb362cb1681 100644 --- a/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -7,8 +7,10 @@ # General CONFIG_POSIX_CLOCK=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 -CONFIG_HEAP_MEM_POOL_SIZE=81920 +CONFIG_HEAP_MEM_POOL_SIZE=120000 +CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_NET_RX_STACK_SIZE=2048 +CONFIG_MAIN_STACK_SIZE=6144 # Optimize Wi-Fi stack to save some memory CONFIG_NRF70_RX_NUM_BUFS=16 diff --git a/samples/net/https_client/sample.yaml b/samples/net/https_client/sample.yaml index f13e59210532..087335040fa1 100644 --- a/samples/net/https_client/sample.yaml +++ b/samples/net/https_client/sample.yaml @@ -8,11 +8,13 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim tags: ci_build sysbuild ci_samples_net sample.net.https_client.lte.tfm-mbedtls: diff --git a/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index 7bdc5993e58a..fe250d852c4f 100644 --- a/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -11,9 +11,10 @@ # General CONFIG_POSIX_CLOCK=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 -CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_MAIN_STACK_SIZE=6144 CONFIG_LOG_BUFFER_SIZE=3072 -CONFIG_HEAP_MEM_POOL_SIZE=81920 +CONFIG_HEAP_MEM_POOL_SIZE=120000 +CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_HW_STACK_PROTECTION=y CONFIG_HW_ID_LIBRARY_SOURCE_NET_MAC=y CONFIG_DK_LIBRARY=y diff --git a/samples/net/mqtt/sample.yaml b/samples/net/mqtt/sample.yaml index 57cb5354c19f..d844f223139e 100644 --- a/samples/net/mqtt/sample.yaml +++ b/samples/net/mqtt/sample.yaml @@ -11,18 +11,23 @@ tests: - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns + - native_sim platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns - native_sim tags: ci_build sysbuild ci_samples_net sample.net.mqtt.nrf70.tls: sysbuild: true build_only: true build_on_all: true + integration_platforms: + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: nrf7002dk/nrf5340/cpuapp/ns tags: ci_build sysbuild ci_samples_net extra_args: EXTRA_CONF_FILE=overlay-tls-nrf70.conf @@ -35,11 +40,13 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns tags: ci_build sysbuild ci_samples_net extra_args: EXTRA_CONF_FILE=overlay-tls-nrf91.conf sample.net.mqtt.native_sim.tls: diff --git a/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index b2ce9a977de0..dc34fb2d322c 100644 --- a/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -6,7 +6,9 @@ # General CONFIG_POSIX_CLOCK=y -CONFIG_HEAP_MEM_POOL_SIZE=81920 +CONFIG_HEAP_MEM_POOL_SIZE=120000 +CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y +CONFIG_MAIN_STACK_SIZE=6144 # Wi-Fi CONFIG_WIFI=y diff --git a/samples/net/udp/boards/thingy91x_nrf9151_ns.conf b/samples/net/udp/boards/thingy91x_nrf9151_ns.conf new file mode 100644 index 000000000000..952b85d02ec3 --- /dev/null +++ b/samples/net/udp/boards/thingy91x_nrf9151_ns.conf @@ -0,0 +1,37 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Modem trace +CONFIG_NRF_MODEM_LIB_TRACE=y +CONFIG_NRF_MODEM_LIB_TRACE_BACKEND_UART=y +CONFIG_SERIAL=y +CONFIG_UART_ASYNC_API=y +CONFIG_UART_1_ASYNC=y +CONFIG_UART_1_INTERRUPT_DRIVEN=n + +# Disable Duplicate Address Detection (DAD) +# due to not being properly implemented for offloaded interfaces. +CONFIG_NET_IPV6_NBR_CACHE=n +CONFIG_NET_IPV6_MLD=n + +# Offload network operations to the modem. +CONFIG_NET_SOCKETS_OFFLOAD=y + +# Zephyr NET Connection Manager and Connectivity layer. +CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024 +CONFIG_NRF_MODEM_LIB_NET_IF=y + +## PSM +CONFIG_LTE_PSM_REQ=y +CONFIG_LTE_PSM_REQ_RPTAU="00100001" +CONFIG_LTE_PSM_REQ_RAT="00000000" + +## eDRX +CONFIG_LTE_EDRX_REQ=n +CONFIG_LTE_EDRX_REQ_VALUE_LTE_M="1001" + +## RAI +CONFIG_LTE_RAI_REQ=n diff --git a/samples/net/udp/boards/thingy91x_nrf9151_ns.overlay b/samples/net/udp/boards/thingy91x_nrf9151_ns.overlay new file mode 100644 index 000000000000..5d85357b0a6f --- /dev/null +++ b/samples/net/udp/boards/thingy91x_nrf9151_ns.overlay @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/* Enable uart1 for tracing. */ +&uart1 { + status = "okay"; + current-speed = < 1000000 >; + hw-flow-control; +}; + +/ { + chosen { + nordic,modem-trace-uart = &uart1; + }; +}; diff --git a/samples/net/udp/sample.yaml b/samples/net/udp/sample.yaml index b423ce2bd39a..6b18c74e381c 100644 --- a/samples/net/udp/sample.yaml +++ b/samples/net/udp/sample.yaml @@ -9,11 +9,15 @@ tests: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns platform_allow: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns - thingy91/nrf9160/ns + - thingy91x/nrf9151/ns + - nrf7002dk/nrf5340/cpuapp/ns tags: ci_build sysbuild ci_samples_net sample.net.udp.emulation: sysbuild: true diff --git a/samples/wifi/provisioning/softap/prj.conf b/samples/wifi/provisioning/softap/prj.conf index 1d2b4212cea6..b86c704de4eb 100644 --- a/samples/wifi/provisioning/softap/prj.conf +++ b/samples/wifi/provisioning/softap/prj.conf @@ -10,7 +10,7 @@ CONFIG_PM_PARTITION_SIZE_TFM_SRAM=0xa000 CONFIG_PM_PARTITION_SIZE_TFM=0x20000 # Optimize Wi-Fi stack to save some memory. -CONFIG_HEAP_MEM_POOL_SIZE=81920 +CONFIG_HEAP_MEM_POOL_SIZE=120000 CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y CONFIG_NRF70_RX_NUM_BUFS=16 CONFIG_NRF70_MAX_TX_AGGREGATION=4