diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml index 20fe65097bad..cc0482aeb3cc 100644 --- a/.github/workflows/compliance.yml +++ b/.github/workflows/compliance.yml @@ -66,7 +66,9 @@ jobs: git log --pretty=oneline | head -n 10 # For now we run KconfigBasic, but we should transition to Kconfig $ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate -e Kconfig \ - -e KconfigBasicNoModules -e ClangFormat -e Ruff -c origin/${BASE_REF}.. + -e KconfigBasicNoModules -e ClangFormat -e Ruff \ + -e SysbuildKconfig -e SysbuildKconfigBasic -e SysbuildKconfigBasicNoModules \ + -c origin/${BASE_REF}.. - name: upload-results uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4 diff --git a/.github/workflows/docbuild.yml b/.github/workflows/docbuild.yml index 41be4a7ed8ff..43d713d187ab 100644 --- a/.github/workflows/docbuild.yml +++ b/.github/workflows/docbuild.yml @@ -66,8 +66,8 @@ jobs: - name: Build documentation working-directory: ncs/nrf run: | - if [[ "${{ github.event_name }}" == "pull_request" ]]; then - BUILD_CONF="-DNO_DTS_BINDINGS=ON" + if [[ "${{ github.event_name }}" == "push" ]]; then + BUILD_CONF="-DDTS_BINDINGS=ON -DHW_FEATURES=ON" fi cmake -GNinja -Bdoc/_build -Sdoc -DSPHINXOPTS_EXTRA="-q" ${BUILD_CONF} diff --git a/Kconfig.nrf b/Kconfig.nrf index b36f3f12d1c5..ba3874722b48 100644 --- a/Kconfig.nrf +++ b/Kconfig.nrf @@ -80,10 +80,6 @@ config MCUMGR_TRANSPORT_NETBUF_SIZE default 2475 if MCUMGR_TRANSPORT_BT_REASSEMBLY default 1024 if UPDATEABLE_IMAGE_NUMBER > 1 -# When using HCI on the nRF5340 we need a larger command buffer. -config BT_BUF_CMD_TX_COUNT - default 10 if SOC_COMPATIBLE_NRF5340_CPUAPP || SOC_COMPATIBLE_NRF5340_CPUNET - config INIT_ARCH_HW_AT_BOOT default y help @@ -104,9 +100,6 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE chosen Zephyr flash devicetree node to ensure that swapping can be performed. -config GETOPT - default n - # Temporary hack to be able to build samples and tests on the nRF51L15/nRF54L09 Eng A/nRF54L20 Eng A/nRF7120 FLPR core config FLASH_BASE_ADDRESS hex diff --git a/applications/connectivity_bridge/boards/thingy91_nrf52840.conf b/applications/connectivity_bridge/boards/thingy91_nrf52840.conf index 062efe231a62..f9951d6f5bcc 100644 --- a/applications/connectivity_bridge/boards/thingy91_nrf52840.conf +++ b/applications/connectivity_bridge/boards/thingy91_nrf52840.conf @@ -18,6 +18,7 @@ CONFIG_BT_NUS=y CONFIG_BT_GATT_CLIENT=y CONFIG_BT_SMP=y CONFIG_BT_CTLR_RX_BUFFERS=10 +CONFIG_BT_BUF_EVT_RX_COUNT=11 CONFIG_BT_BUF_ACL_TX_COUNT=10 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 @@ -37,4 +38,7 @@ CONFIG_DP_DRIVER=y CONFIG_CMSIS_DAP_DEVICE_VENDOR="Nordic Semiconductor ASA" CONFIG_CMSIS_DAP_DEVICE_NAME="nrf91" -CONFIG_USB_CDC_ACM_RINGBUF_SIZE=15360 +CONFIG_USB_CDC_ACM_RINGBUF_SIZE=12280 + +# Reduce logging to save flash space +CONFIG_LOG_MAX_LEVEL=1 diff --git a/applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf b/applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf index d8b58332e03a..cf826b50c90c 100644 --- a/applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf +++ b/applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf @@ -17,6 +17,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=251 CONFIG_BT_NUS=y CONFIG_BT_GATT_CLIENT=y CONFIG_BT_SMP=y +CONFIG_BT_BUF_EVT_RX_COUNT=11 CONFIG_BT_BUF_ACL_TX_COUNT=10 CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 diff --git a/applications/nrf5340_audio/broadcast_sink/main.c b/applications/nrf5340_audio/broadcast_sink/main.c index f1d826648082..8a5fae5a1f77 100644 --- a/applications/nrf5340_audio/broadcast_sink/main.c +++ b/applications/nrf5340_audio/broadcast_sink/main.c @@ -35,6 +35,11 @@ struct ble_iso_data { static uint32_t last_broadcast_id = BRDCAST_ID_NOT_USED; +static struct zbus_observer_node zbus_obs_node_button; +static struct zbus_observer_node zbus_obs_node_audio; +static struct zbus_observer_node zbus_obs_node_volume; +static struct zbus_observer_node zbus_obs_node_mgmt; + ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE); ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub); @@ -459,25 +464,29 @@ static int zbus_link_producers_observers(void) return -ENOTSUP; } - ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add button sub"); return ret; } - ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add le_audio sub"); return ret; } - ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, &zbus_obs_node_volume, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add add volume sub"); return ret; } - ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_sub, &zbus_obs_node_mgmt, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add bt_mgmt sub"); return ret; diff --git a/applications/nrf5340_audio/broadcast_sink/overlay-broadcast_sink.conf b/applications/nrf5340_audio/broadcast_sink/overlay-broadcast_sink.conf index b6adef1421b1..9054560125ba 100644 --- a/applications/nrf5340_audio/broadcast_sink/overlay-broadcast_sink.conf +++ b/applications/nrf5340_audio/broadcast_sink/overlay-broadcast_sink.conf @@ -26,6 +26,7 @@ CONFIG_MBEDTLS_ENABLE_HEAP=y CONFIG_MBEDTLS_HEAP_SIZE=2048 CONFIG_BT_BUF_ACL_TX_COUNT=18 +CONFIG_BT_BUF_EVT_RX_COUNT=20 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=64 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=69 @@ -41,6 +42,7 @@ CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT=2 CONFIG_BT_BAP_BROADCAST_SNK_COUNT=2 CONFIG_BT_ISO_MAX_CHAN=2 CONFIG_BT_ISO_MAX_BIG=2 +CONFIG_BT_EXT_ADV_MAX_ADV_SET=2 ## PACS related configs ## CONFIG_BT_PAC_SNK_NOTIFIABLE=y diff --git a/applications/nrf5340_audio/broadcast_source/main.c b/applications/nrf5340_audio/broadcast_source/main.c index 4f7fc84311e6..09b7108a6edd 100644 --- a/applications/nrf5340_audio/broadcast_source/main.c +++ b/applications/nrf5340_audio/broadcast_source/main.c @@ -24,6 +24,11 @@ #include LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL); +static struct zbus_observer_node zbus_obs_node_ref; +static struct zbus_observer_node zbus_obs_node_button; +static struct zbus_observer_node zbus_obs_node_audio; +static struct zbus_observer_node zbus_obs_node_mgmt; + ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE); ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub); @@ -271,7 +276,8 @@ static int zbus_subscribers_create(void) return ret; } - ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, &zbus_obs_node_ref, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add timestamp listener"); return ret; @@ -329,19 +335,22 @@ static int zbus_link_producers_observers(void) return -ENOTSUP; } - ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add button sub"); return ret; } - ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add le_audio sub"); return ret; } - ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add bt_mgmt listener"); return ret; diff --git a/applications/nrf5340_audio/broadcast_source/overlay-broadcast_source.conf b/applications/nrf5340_audio/broadcast_source/overlay-broadcast_source.conf index cb2bf56aa3e6..24a01124be45 100644 --- a/applications/nrf5340_audio/broadcast_source/overlay-broadcast_source.conf +++ b/applications/nrf5340_audio/broadcast_source/overlay-broadcast_source.conf @@ -23,6 +23,7 @@ CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2 CONFIG_BT_ISO_MAX_CHAN=2 CONFIG_BT_ISO_MAX_BIG=2 +CONFIG_BT_EXT_ADV_MAX_ADV_SET=2 CONFIG_LC3_ENC_CHAN_MAX=2 CONFIG_ENTROPY_GENERATOR=y diff --git a/applications/nrf5340_audio/src/bluetooth/bt_management/advertising/Kconfig b/applications/nrf5340_audio/src/bluetooth/bt_management/advertising/Kconfig index 8f895f3cfd53..fde13a34c672 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_management/advertising/Kconfig +++ b/applications/nrf5340_audio/src/bluetooth/bt_management/advertising/Kconfig @@ -67,6 +67,19 @@ config BLE_ACL_ADV_SID range 0x00 0x0F default 0x00 +config BT_MGMT_ADV_STACK_SIZE + int "Stack size" + default 1024 + help + Stack size for the Bluetooth management advertising thread. + +config BT_MGMT_ADV_THREAD_PRIO + int "Thread priority for bt_mgmt advertising" + default 5 + help + This is a preemptible thread. + This thread will subscribe to BT management advertising work items. + #----------------------------------------------------------------------------# menu "Log level" diff --git a/applications/nrf5340_audio/src/bluetooth/bt_management/advertising/bt_mgmt_adv.c b/applications/nrf5340_audio/src/bluetooth/bt_management/advertising/bt_mgmt_adv.c index a92f4623c8a9..9fdd031ea335 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_management/advertising/bt_mgmt_adv.c +++ b/applications/nrf5340_audio/src/bluetooth/bt_management/advertising/bt_mgmt_adv.c @@ -16,6 +16,9 @@ #include LOG_MODULE_REGISTER(bt_mgmt_adv, CONFIG_BT_MGMT_ADV_LOG_LEVEL); +struct k_work_q adv_work_q; +K_THREAD_STACK_DEFINE(adv_work_q_stack_area, CONFIG_BT_MGMT_ADV_STACK_SIZE); + ZBUS_CHAN_DECLARE(bt_mgmt_chan); #ifndef CONFIG_BT_MAX_PAIRED @@ -417,7 +420,7 @@ int bt_mgmt_adv_start(uint8_t ext_adv_index, const struct bt_data *adv, size_t a LOG_ERR("No space in the queue for adv_index"); return -ENOMEM; } - k_work_submit(&adv_work); + k_work_submit_to_queue(&adv_work_q, &adv_work); return 0; } @@ -465,7 +468,7 @@ int bt_mgmt_adv_start(uint8_t ext_adv_index, const struct bt_data *adv, size_t a LOG_ERR("No space in the queue for adv_index"); return -ENOMEM; } - k_work_submit(&adv_work); + k_work_submit_to_queue(&adv_work_q, &adv_work); return 0; } @@ -473,4 +476,8 @@ int bt_mgmt_adv_start(uint8_t ext_adv_index, const struct bt_data *adv, size_t a void bt_mgmt_adv_init(void) { k_work_init(&adv_work, advertising_process); + k_work_queue_init(&adv_work_q); + k_work_queue_start(&adv_work_q, adv_work_q_stack_area, + K_THREAD_STACK_SIZEOF(adv_work_q_stack_area), + CONFIG_BT_MGMT_ADV_THREAD_PRIO, NULL); } diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c b/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c index bf7a023bc7e9..312e2c706f63 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c +++ b/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c @@ -762,6 +762,10 @@ int broadcast_sink_enable(le_audio_receive_cb recv_cb) int ret; static bool initialized; enum audio_channel channel; + const struct bt_pacs_register_param pacs_param = { + .snk_pac = true, + .snk_loc = true, + }; if (initialized) { LOG_WRN("Already initialized"); @@ -777,6 +781,12 @@ int broadcast_sink_enable(le_audio_receive_cb recv_cb) channel_assignment_get(&channel); + ret = bt_pacs_register(&pacs_param); + if (ret) { + LOG_ERR("Could not register PACS (err %d)\n", ret); + return ret; + } + if (channel == AUDIO_CH_L) { ret = bt_pacs_set_location(BT_AUDIO_DIR_SINK, BT_AUDIO_LOCATION_FRONT_LEFT); csip_param.rank = CSIP_HL_RANK; diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/Kconfig.defaults b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/Kconfig.defaults index fd607265d15d..8536e2254ace 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/Kconfig.defaults +++ b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/Kconfig.defaults @@ -35,6 +35,9 @@ config BT_BUF_ACL_RX_SIZE default 502 if (AUDIO_DFU > 0) default 259 +config BT_BUF_EVT_RX_COUNT + default 14 + config BT_BUF_ACL_TX_COUNT default 12 diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c index 2b90e87d7f9b..6d3b3809177c 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c +++ b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c @@ -649,6 +649,13 @@ int unicast_server_enable(le_audio_receive_cb recv_cb, enum bt_audio_location lo { int ret; static bool initialized; + /* clang-format off */ + const struct bt_pacs_register_param pacs_param = { + IF_ENABLED(CONFIG_BT_AUDIO_RX, (.snk_pac = true,)) + IF_ENABLED(CONFIG_BT_AUDIO_RX, (.snk_loc = true,)) + IF_ENABLED(CONFIG_BT_AUDIO_TX, (.src_pac = true,)) + IF_ENABLED(CONFIG_BT_AUDIO_TX, (.src_loc = true,))}; + /* clang-format on */ __ASSERT(strlen(CONFIG_BT_SET_IDENTITY_RESOLVING_KEY) == BT_CSIP_SIRK_SIZE, "SIRK incorrect size, must be 16 bytes"); @@ -681,10 +688,16 @@ int unicast_server_enable(le_audio_receive_cb recv_cb, enum bt_audio_location lo memcpy(csip_param.sirk, CONFIG_BT_SET_IDENTITY_RESOLVING_KEY, BT_CSIP_SIRK_SIZE); } + ret = bt_pacs_register(&pacs_param); + if (ret) { + printk("Could not register PACS (err %d)\n", ret); + return ret; + } + for (int i = 0; i < ARRAY_SIZE(caps); i++) { ret = bt_pacs_cap_register(caps_dirs[i], &caps[i]); if (ret) { - LOG_ERR("Capability register failed. Err: %d", ret); + LOG_ERR("Capability register failed. Err: %d (%d)", ret, i); return ret; } } @@ -716,30 +729,33 @@ int unicast_server_enable(le_audio_receive_cb recv_cb, enum bt_audio_location lo } } - ret = bt_pacs_set_supported_contexts(BT_AUDIO_DIR_SINK, AVAILABLE_SINK_CONTEXT); + if (IS_ENABLED(CONFIG_BT_AUDIO_RX)) { + ret = bt_pacs_set_supported_contexts(BT_AUDIO_DIR_SINK, AVAILABLE_SINK_CONTEXT); - if (ret) { - LOG_ERR("Supported context set failed. Err: %d", ret); - return ret; - } + if (ret) { + LOG_ERR("Supported context set failed (sink). Err: %d", ret); + return ret; + } - ret = bt_pacs_set_available_contexts(BT_AUDIO_DIR_SINK, AVAILABLE_SINK_CONTEXT); - if (ret) { - LOG_ERR("Available context set failed. Err: %d", ret); - return ret; + ret = bt_pacs_set_available_contexts(BT_AUDIO_DIR_SINK, AVAILABLE_SINK_CONTEXT); + if (ret) { + LOG_ERR("Available context set failed (sink). Err: %d", ret); + return ret; + } } - ret = bt_pacs_set_supported_contexts(BT_AUDIO_DIR_SOURCE, AVAILABLE_SOURCE_CONTEXT); - - if (ret) { - LOG_ERR("Supported context set failed. Err: %d", ret); - return ret; - } + if (IS_ENABLED(CONFIG_BT_AUDIO_TX)) { + ret = bt_pacs_set_supported_contexts(BT_AUDIO_DIR_SOURCE, AVAILABLE_SOURCE_CONTEXT); + if (ret) { + LOG_ERR("Supported context set failed (source). Err: %d", ret); + return ret; + } - ret = bt_pacs_set_available_contexts(BT_AUDIO_DIR_SOURCE, AVAILABLE_SOURCE_CONTEXT); - if (ret) { - LOG_ERR("Available context set failed. Err: %d", ret); - return ret; + ret = bt_pacs_set_available_contexts(BT_AUDIO_DIR_SOURCE, AVAILABLE_SOURCE_CONTEXT); + if (ret) { + LOG_ERR("Available context set failed (source). Err: %d", ret); + return ret; + } } for (int i = 0; i < ARRAY_SIZE(cap_audio_streams); i++) { diff --git a/applications/nrf5340_audio/unicast_client/main.c b/applications/nrf5340_audio/unicast_client/main.c index 405c7eae684b..78a736176949 100644 --- a/applications/nrf5340_audio/unicast_client/main.c +++ b/applications/nrf5340_audio/unicast_client/main.c @@ -28,6 +28,12 @@ LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL); static enum stream_state strm_state = STATE_PAUSED; +static struct zbus_observer_node zbus_obs_node_sdu; +static struct zbus_observer_node zbus_obs_node_button; +static struct zbus_observer_node zbus_obs_node_audio; +static struct zbus_observer_node zbus_obs_node_media; +static struct zbus_observer_node zbus_obs_node_mgmt; + ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE); ZBUS_SUBSCRIBER_DEFINE(content_control_evt_sub, CONFIG_CONTENT_CONTROL_MSG_SUB_QUEUE_SIZE); @@ -468,7 +474,8 @@ static int zbus_subscribers_create(void) return ret; } - ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, &zbus_obs_node_sdu, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add timestamp listener"); return ret; @@ -490,25 +497,28 @@ static int zbus_link_producers_observers(void) return -ENOTSUP; } - ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add button sub"); return ret; } - ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add le_audio sub"); return ret; } - ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add bt_mgmt listener"); return ret; } - ret = zbus_chan_add_obs(&cont_media_chan, &content_control_evt_sub, + ret = zbus_chan_add_obs(&cont_media_chan, &content_control_evt_sub, &zbus_obs_node_media, ZBUS_ADD_OBS_TIMEOUT_MS); return 0; diff --git a/applications/nrf5340_audio/unicast_server/main.c b/applications/nrf5340_audio/unicast_server/main.c index c576af6c8be6..4c55e3097da7 100644 --- a/applications/nrf5340_audio/unicast_server/main.c +++ b/applications/nrf5340_audio/unicast_server/main.c @@ -28,6 +28,11 @@ #include LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL); +static struct zbus_observer_node zbus_obs_node_button; +static struct zbus_observer_node zbus_obs_node_audio; +static struct zbus_observer_node zbus_obs_node_volume; +static struct zbus_observer_node zbus_obs_node_mgmt; + ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE); ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub); @@ -397,25 +402,29 @@ static int zbus_link_producers_observers(void) return -ENOTSUP; } - ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add button sub"); return ret; } - ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add le_audio sub"); return ret; } - ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add bt_mgmt sub"); return ret; } - ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, &zbus_obs_node_volume, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add volume sub"); return ret; diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf index e2dd6e2775dd..f61edf5ff3ab 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf @@ -41,6 +41,8 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536 # Reuse system workqueue as Bluetooth RX context to reduce memory consumption CONFIG_BT_RECV_WORKQ_SYS=y +# Reuse system workqueue for GATT Discovery Manager to reduce memory consumption +CONFIG_BT_GATT_DM_WORKQ_SYS=y # Disable Bluetooth long workqueue to reduce memory consumption CONFIG_BT_LONG_WQ=n # Limit number of key slots in the PSA Crypto core to reduce memory consumption diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf index 49aebcb0fbfe..a8d9e96601e6 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf @@ -39,6 +39,8 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536 # Reuse system workqueue as Bluetooth RX context to reduce memory consumption CONFIG_BT_RECV_WORKQ_SYS=y +# Reuse system workqueue for GATT Discovery Manager to reduce memory consumption +CONFIG_BT_GATT_DM_WORKQ_SYS=y # Disable Bluetooth long workqueue to reduce memory consumption CONFIG_BT_LONG_WQ=n # Limit number of key slots in the PSA Crypto core to reduce memory consumption diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf index ec2b89bce61a..dc73fb276f62 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf @@ -42,6 +42,8 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536 # Reuse system workqueue as Bluetooth RX context to reduce memory consumption CONFIG_BT_RECV_WORKQ_SYS=y +# Reuse system workqueue for GATT Discovery Manager to reduce memory consumption +CONFIG_BT_GATT_DM_WORKQ_SYS=y # Disable Bluetooth long workqueue to reduce memory consumption CONFIG_BT_LONG_WQ=n # Limit number of key slots in the PSA Crypto core to reduce memory consumption diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf index 5378fc305aaf..f6c033a96d20 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf @@ -40,6 +40,8 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536 # Reuse system workqueue as Bluetooth RX context to reduce memory consumption CONFIG_BT_RECV_WORKQ_SYS=y +# Reuse system workqueue for GATT Discovery Manager to reduce memory consumption +CONFIG_BT_GATT_DM_WORKQ_SYS=y # Disable Bluetooth long workqueue to reduce memory consumption CONFIG_BT_LONG_WQ=n # Limit number of key slots in the PSA Crypto core to reduce memory consumption diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf index bfb3a479b6a2..535695419b22 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf @@ -47,6 +47,8 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536 # Reuse system workqueue as Bluetooth RX context to reduce memory consumption CONFIG_BT_RECV_WORKQ_SYS=y +# Reuse system workqueue for GATT Discovery Manager to reduce memory consumption +CONFIG_BT_GATT_DM_WORKQ_SYS=y # Disable Bluetooth long workqueue to reduce memory consumption CONFIG_BT_LONG_WQ=n # Limit number of key slots in the PSA Crypto core to reduce memory consumption diff --git a/applications/nrf_desktop/doc/hids.rst b/applications/nrf_desktop/doc/hids.rst index 95551b1144c6..01e50332627b 100644 --- a/applications/nrf_desktop/doc/hids.rst +++ b/applications/nrf_desktop/doc/hids.rst @@ -74,7 +74,7 @@ The module can receive a HID output report setting state of the keyboard LEDs, f The report is received from the Bluetooth connected host. The module forwards the report using ``hid_report_event`` that is handled by |hid_state|. -Right now, the only board that displays information received in the HID output report using hardware LEDs is the :ref:`nrf52840dk ` in ``keyboard`` build type configuration. +Right now, the only board that displays information received in the HID output report using hardware LEDs is the :zephyr:board:`nrf52840dk` in ``keyboard`` build type configuration. The keyboard reference design (nrf52kbd) has only one LED that is used to display the Bluetooth LE peer state. Detailed information about the usage of LEDs to display information about Bluetooth LE peer state and system state to the user is available in the :ref:`nrf_desktop_led_state` documentation. Detailed information about displaying state of the HID keyboard LEDs using hardware LEDs is available in :ref:`nrf_desktop_hid_state` documentation. diff --git a/applications/nrf_desktop/src/modules/usb_state.c b/applications/nrf_desktop/src/modules/usb_state.c index 129e33e7597c..22ce9f52ddfc 100644 --- a/applications/nrf_desktop/src/modules/usb_state.c +++ b/applications/nrf_desktop/src/modules/usb_state.c @@ -1137,13 +1137,15 @@ static uint32_t get_idle_next(const struct device *dev, const uint8_t id) return usb_hid->idle_duration[id]; } -static void report_sent_cb_next(const struct device *dev) +static void report_sent_cb_next(const struct device *dev, const uint8_t *report) { struct usb_hid_device *usb_hid = dev_to_usb_hid(dev); struct usb_hid_buf *buf = usb_hid_buf_find(usb_hid, USB_HID_BUF_SENDING); /* USB next stack does not explicitly indicate failed transfers. */ bool error = !usb_hid->enabled; + ARG_UNUSED(report); + report_sent(usb_hid, buf, error); } diff --git a/applications/serial_lte_modem/doc/nRF91_as_Zephyr_modem.rst b/applications/serial_lte_modem/doc/nRF91_as_Zephyr_modem.rst index 03fca4a009dc..0065ff9a36ca 100644 --- a/applications/serial_lte_modem/doc/nRF91_as_Zephyr_modem.rst +++ b/applications/serial_lte_modem/doc/nRF91_as_Zephyr_modem.rst @@ -15,7 +15,7 @@ This means that the controlling chip can run a Zephyr application that seamlessl This is made possible by SLM's support of CMUX and PPP and Zephyr's cellular modem driver. -The :ref:`nRF52840 SoC present in the nRF9160 DK ` can even be made to be the controlling chip with the appropriate configuration (described below). +The nRF52840 SoC present in the :ref:`zephyr:nrf9160dk_nrf9160` can even be made to be the controlling chip with the appropriate configuration (described below). This is only possible on the nRF9160 DK, not on the other nRF91 Series DKs. .. note:: diff --git a/applications/serial_lte_modem/src/slm_ppp.c b/applications/serial_lte_modem/src/slm_ppp.c index a7e228c62fe2..e74f7c477489 100644 --- a/applications/serial_lte_modem/src/slm_ppp.c +++ b/applications/serial_lte_modem/src/slm_ppp.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -99,8 +100,8 @@ static bool open_ppp_sockets(void) { int ret; - ppp_fds[ZEPHYR_FD_IDX] = zsock_socket(AF_PACKET, SOCK_RAW | SOCK_NATIVE, - htons(IPPROTO_RAW)); + ppp_fds[ZEPHYR_FD_IDX] = zsock_socket(AF_PACKET, SOCK_DGRAM | SOCK_NATIVE, + htons(ETH_P_ALL)); if (ppp_fds[ZEPHYR_FD_IDX] < 0) { LOG_ERR("Zephyr socket creation failed (%d).", errno); return false; @@ -108,7 +109,8 @@ static bool open_ppp_sockets(void) ppp_zephyr_dst_addr = (struct sockaddr_ll){ .sll_family = AF_PACKET, - .sll_ifindex = net_if_get_by_iface(ppp_iface) + .sll_ifindex = net_if_get_by_iface(ppp_iface), + .sll_protocol = htons(ETH_P_ALL), }; ret = zsock_bind(ppp_fds[ZEPHYR_FD_IDX], (const struct sockaddr *)&ppp_zephyr_dst_addr, sizeof(ppp_zephyr_dst_addr)); @@ -658,6 +660,19 @@ static void ppp_data_passing_thread(void*, void*, void*) void *dst_addr = (dst == MODEM_FD_IDX) ? NULL : &ppp_zephyr_dst_addr; socklen_t addrlen = (dst == MODEM_FD_IDX) ? 0 : sizeof(ppp_zephyr_dst_addr); + if (dst == ZEPHYR_FD_IDX) { + uint8_t type = ppp_data_buf[0] & 0xf0; + + if (type == 0x60) { + ppp_zephyr_dst_addr.sll_protocol = htons(ETH_P_IPV6); + } else if (type == 0x40) { + ppp_zephyr_dst_addr.sll_protocol = htons(ETH_P_IP); + } else { + /* Not IP traffic, ignore. */ + continue; + } + } + send_ret = zsock_sendto(fds[dst].fd, ppp_data_buf, len, 0, dst_addr, addrlen); if (send_ret == -1) { diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 2a8e04518c84..68a22e78f37b 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -22,7 +22,8 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} COMPONENTS doc) set(SPHINXOPTS "-j auto -W --keep-going -T" CACHE STRING "Default Sphinx Options") set(SPHINXOPTS_EXTRA "" CACHE STRING "Extra Sphinx Options") -set(NO_DTS_BINDINGS OFF CACHE BOOL "Do not generate dts bindings documentation") +set(DTS_BINDINGS OFF CACHE BOOL "Generate dts bindings documentation") +set(HW_FEATURES OFF CACHE BOOL "Generate hardware features") separate_arguments(SPHINXOPTS) separate_arguments(SPHINXOPTS_EXTRA) @@ -107,6 +108,7 @@ endfunction() # - DODGY: Enable/disable "dodgy" mode. If enabled "-W" (warnings as errors) # option will be disabled. It can be useful for external docsets that are # likely to generate build warnings. +# - SPHINXOPTS: Docset specific Sphinx options # # This function configures multiple targets which can be used to build a docset. # The docset configuration (conf.py) is expected to be at the ${name} folder @@ -126,7 +128,7 @@ endfunction() # - ${name}-clean: Clean build artifacts. # function(add_docset name version) - cmake_parse_arguments(DOCSET "DODGY" "" "" ${ARGN}) + cmake_parse_arguments(DOCSET "DODGY" "" "SPHINXOPTS" ${ARGN}) set(DOCSET_CFG_DIR ${CMAKE_CURRENT_LIST_DIR}/${name}) set(DOCSET_BUILD_DIR ${CMAKE_BINARY_DIR}/${name}) @@ -153,6 +155,7 @@ function(add_docset name version) -w ${DOCSET_BUILD_DIR}/inventory.log ${SPHINXOPTS} ${SPHINXOPTS_EXTRA} + ${DOCSET_SPHINXOPTS} ${DOCSET_SRC_DIR} ${DOCSET_HTML_DIR} USES_TERMINAL @@ -170,6 +173,7 @@ function(add_docset name version) -w ${DOCSET_BUILD_DIR}/html.log ${SPHINXOPTS} ${SPHINXOPTS_EXTRA} + ${DOCSET_SPHINXOPTS} ${EXTRA_ARGS} ${DOCSET_SRC_DIR} ${DOCSET_HTML_DIR} @@ -191,6 +195,7 @@ function(add_docset name version) -w ${DOCSET_BUILD_DIR}/html-live.log ${SPHINXOPTS} ${SPHINXOPTS_EXTRA} + ${DOCSET_SPHINXOPTS} ${EXTRA_ARGS} ${DOCSET_SRC_DIR} ${DOCSET_HTML_DIR} @@ -210,6 +215,7 @@ function(add_docset name version) -w ${DOCSET_BUILD_DIR}/linkcheck.log ${SPHINXOPTS} ${SPHINXOPTS_EXTRA} + ${DOCSET_SPHINXOPTS} ${EXTRA_ARGS} ${DOCSET_SRC_DIR} ${DOCSET_LINKCHECK_DIR} @@ -276,7 +282,7 @@ file(MAKE_DIRECTORY ${HTML_DIR}) set(DTS_ARGS) -if(NO_DTS_BINDINGS) +if(NOT DTS_BINDINGS) list(APPEND DTS_ARGS --turbo-mode) endif() @@ -296,7 +302,11 @@ add_custom_target( COMMENT "Generating Devicetree bindings documentation..." ) -add_docset(zephyr ${Zephyr_VERSION}) +if(NOT HW_FEATURES) + set(ZEPHYR_SPHINXOPTS -t hw_features_turbo) +endif() + +add_docset(zephyr ${Zephyr_VERSION} SPHINXOPTS ${ZEPHYR_SPHINXOPTS}) add_doxygen_docset(zephyr ${ZEPHYR_BASE} ${Zephyr_VERSION}) add_dependencies(zephyr zephyr-devicetree) add_dependencies(zephyr-all zephyr-devicetree) diff --git a/doc/nrf/app_dev/board_names.rst b/doc/nrf/app_dev/board_names.rst index fd18d407502a..9052d1c1afd6 100644 --- a/doc/nrf/app_dev/board_names.rst +++ b/doc/nrf/app_dev/board_names.rst @@ -72,69 +72,69 @@ Also see the :ref:`zephyr:boards` section in the Zephyr documentation. +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ | Hardware platform | PCA number | Board name | Board targets | +===================+============+===================================================================+=======================================+ -| nRF9161 DK | PCA10153 | :ref:`nrf9161dk ` | ``nrf9161dk/nrf9161`` | +| nRF9161 DK | PCA10153 | :zephyr:board:`nrf9161dk` | ``nrf9161dk/nrf9161`` | | | | | | | | | | ``nrf9161dk/nrf9161/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ | nRF9160 DK | PCA10090 | :ref:`nrf9160dk ` | ``nrf9160dk/nrf9160`` | | | | | | | | | | ``nrf9160dk/nrf9160/ns`` | -| | +-------------------------------------------------------------------+---------------------------------------+ -| | | :ref:`nrf9160dk ` | ``nrf9160dk/nrf52840`` | +| | | | | +| | | | ``nrf9160dk/nrf52840`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF9151 DK | PCA10171 | :ref:`nrf9151dk ` | ``nrf9151dk/nrf9151`` | +| nRF9151 DK | PCA10171 | :zephyr:board:`nrf9151dk` | ``nrf9151dk/nrf9151`` | | | | | | | | | | ``nrf9151dk/nrf9151/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF9131 EK | PCA10165 | :ref:`nrf9131ek ` | ``nrf9131ek/nrf9131`` | +| nRF9131 EK | PCA10165 | :zephyr:board:`nrf9131ek` | ``nrf9131ek/nrf9131`` | | | | | | | | | | ``nrf9131ek/nrf9131/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF54H20 DK | PCA10175 | :ref:`nrf54h20dk ` | ``nrf54h20dk/nrf54h20/cpuapp`` | +| nRF54H20 DK | PCA10175 | :zephyr:board:`nrf54h20dk` | ``nrf54h20dk/nrf54h20/cpuapp`` | | | | | | | | | | ``nrf54h20dk/nrf54h20/cpurad`` | | | | | | | | | | ``nrf54h20dk/nrf54h20/cpuppr`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF54L15 DK | PCA10156 | :ref:`nrf54l15dk ` | ``nrf54l15dk/nrf54l15/cpuapp`` | +| nRF54L15 DK | PCA10156 | :zephyr:board:`nrf54l15dk` | ``nrf54l15dk/nrf54l15/cpuapp`` | | | | | | | | | | ``nrf54l15dk/nrf54l15/cpuapp/ns`` | | | | | | | | | | ``nrf54l15dk/nrf54l15/cpuflpr`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF5340 DK | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpunet`` | +| nRF5340 DK | PCA10095 | :zephyr:board:`nrf5340dk` | ``nrf5340dk/nrf5340/cpunet`` | | | | | | | | | | ``nrf5340dk/nrf5340/cpuapp`` | | | | | | | | | | ``nrf5340dk/nrf5340/cpuapp/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF5340 Audio | PCA10121 | :ref:`nrf5340_audio_dk ` | ``nrf5340_audio_dk/nrf5340/cpuapp`` | +| nRF5340 Audio | PCA10121 | :zephyr:board:`nrf5340_audio_dk` | ``nrf5340_audio_dk/nrf5340/cpuapp`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| Thingy:53 | PCA20053 | :ref:`thingy53 ` | ``thingy53/nrf5340/cpunet`` | +| Thingy:53 | PCA20053 | :zephyr:board:`thingy53` | ``thingy53/nrf5340/cpunet`` | | | | | | | | | | ``thingy53/nrf5340/cpuapp`` | | | | | | | | | | ``thingy53/nrf5340/cpuapp/ns`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF52840 DK | PCA10056 | :ref:`nrf52840dk ` | ``nrf52840dk/nrf52840`` | -| | +-------------------------------------------------------------------+---------------------------------------+ -| | | :ref:`nrf52840dk ` | ``nrf52840dk/nrf52811`` | +| nRF52840 DK | PCA10056 | :zephyr:board:`nrf52840dk` | ``nrf52840dk/nrf52840`` | +| | | | | +| | | | ``nrf52840dk/nrf52811`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF52840 Dongle | PCA10059 | :ref:`nrf52840dongle ` | ``nrf52840dongle/nrf52840`` | +| nRF52840 Dongle | PCA10059 | :zephyr:board:`nrf52840dongle` | ``nrf52840dongle/nrf52840`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF52833 DK | PCA10100 | :ref:`nrf52833dk ` | ``nrf52833dk/nrf52833`` | -| | +-------------------------------------------------------------------+---------------------------------------+ -| | | :ref:`nrf52833dk ` | ``nrf52833dk/nrf52820`` | +| nRF52833 DK | PCA10100 | :zephyr:board:`nrf52833dk` | ``nrf52833dk/nrf52833`` | +| | | | | +| | | | ``nrf52833dk/nrf52820`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF52 DK | PCA10040 | :ref:`nrf52dk ` | ``nrf52dk/nrf52832`` | -| (nRF52832) | +-------------------------------------------------------------------+---------------------------------------+ -| | | :ref:`nrf52dk ` | ``nrf52dk/nrf52810`` | -| | +-------------------------------------------------------------------+---------------------------------------+ -| | | :ref:`nrf52dk ` | ``nrf52dk/nrf52805`` | +| nRF52 DK | PCA10040 | :zephyr:board:`nrf52dk` | ``nrf52dk/nrf52832`` | +| (nRF53832) | | | | +| | | | ``nrf52dk/nrf52810`` | +| | | | | +| | | | ``nrf52dk/nrf52805`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF21540 DK | PCA10112 | :ref:`nrf21540dk ` | ``nrf21540dk/nrf52840`` | +| nRF21540 DK | PCA10112 | :zephyr:board:`nrf21540dk` | ``nrf21540dk/nrf52840`` | +-------------------+------------+-------------------------------------------------------------------+---------------------------------------+ -| nRF7002 DK | PCA10143 | :ref:`nrf7002dk ` | ``nrf7002dk/nrf5340/cpunet`` | +| nRF7002 DK | PCA10143 | :zephyr:board:`nrf7002dk` | ``nrf7002dk/nrf5340/cpunet`` | | | | | | | | | | ``nrf7002dk/nrf5340/cpuapp`` | | | | | | diff --git a/doc/nrf/app_dev/device_guides/fem/2220ek_dev_guide.rst b/doc/nrf/app_dev/device_guides/fem/2220ek_dev_guide.rst index 8e8b5cb7d10e..d22acf416986 100644 --- a/doc/nrf/app_dev/device_guides/fem/2220ek_dev_guide.rst +++ b/doc/nrf/app_dev/device_guides/fem/2220ek_dev_guide.rst @@ -15,14 +15,14 @@ When combined with an nRF52, nRF53 or nRF54L Series SoC, the nRF2220 RF FEM's ou Preparation of a development kit to work with the nRF2220EK *********************************************************** -On Arduino-compatible development kits like the :ref:`nrf52840dk_nrf52840` or :ref:`nrf5340dk_nrf5340`, plug the *Nordic Interposer Board A* (PCA64172) into the development kit. +On Arduino-compatible development kits like the :zephyr:board:`nrf52840dk` or :zephyr:board:`nrf5340dk`, plug the *Nordic Interposer Board A* (PCA64172) into the development kit. Plug nRF2220 EK board into ``SLOT 2`` of the *Nordic Interposer Board A*. -On the :ref:`nrf54l15dk_nrf54l15` development kit, plug the nRF2220 EK board into the ``PORT P0`` expansion slot. +On the :zephyr:board:`nrf54l15dk` development kit, plug the nRF2220 EK board into the ``PORT P0`` expansion slot. .. caution:: - On the :ref:`nrf54l15dk_nrf54l15` development kit pins **P0.00** ... **P0.03** of the nRF54L15 SoC are connected to the debugger chip and by default connect ``UART0`` of the debugger chip to the nRF54L15 SoC. + On the :zephyr:board:`nrf54l15dk` development kit pins **P0.00** ... **P0.03** of the nRF54L15 SoC are connected to the debugger chip and by default connect ``UART0`` of the debugger chip to the nRF54L15 SoC. Disable the UART0 function (VCOM0) of the debugger chip to allow the pins to be used as FEM control signals and FEM I2C interface. You can use the `Board Configurator app`_ , which is part of the `nRF Connect for Desktop`_, for this purpose. The pin **P0.04** of the nRF54L15 SoC is connected also to **Button 3** of the development kit. diff --git a/doc/nrf/app_dev/device_guides/fem/index.rst b/doc/nrf/app_dev/device_guides/fem/index.rst index 72a0ed65adcd..ee2b11848ec8 100644 --- a/doc/nrf/app_dev/device_guides/fem/index.rst +++ b/doc/nrf/app_dev/device_guides/fem/index.rst @@ -38,7 +38,7 @@ The following hardware platforms with :term:`Front-End Module (FEM)` are support - Board targets - Documentation - Product pages - * - :ref:`zephyr:nrf21540dk_nrf52840` + * - :zephyr:board:`nrf21540dk` - PCA10112 - ``nrf21540dk/nrf52840`` - | `Product Specification `_ diff --git a/doc/nrf/app_dev/device_guides/nrf52/index.rst b/doc/nrf/app_dev/device_guides/nrf52/index.rst index 6d9c00de37fd..295bd73a70fe 100644 --- a/doc/nrf/app_dev/device_guides/nrf52/index.rst +++ b/doc/nrf/app_dev/device_guides/nrf52/index.rst @@ -20,43 +20,43 @@ Zephyr and the |NCS| provide support and contain board definitions for developin - PCA number - Board target - Documentation - * - :ref:`zephyr:nrf52840dk_nrf52840` + * - :zephyr:board:`nrf52840dk` - PCA10056 - ``nrf52840dk/nrf52840`` - | `Product Specification `_ | `User Guide `_ - * - :ref:`zephyr:nrf52840dk_nrf52811` + * - :zephyr:board:`nrf52840dk` - PCA10056 - ``nrf52840dk/nrf52811`` - `Product Specification `_ - * - :ref:`zephyr:nrf52833dk_nrf52833` + * - :zephyr:board:`nrf52833dk` - PCA10100 - ``nrf52833dk/nrf52833`` - | `Product Specification `_ | `User Guide `_ - * - :ref:`zephyr:nrf52833dk_nrf52820` + * - :zephyr:board:`nrf52833dk` - PCA10100 - ``nrf52833dk/nrf52820`` - `Product Specification `_ - * - :ref:`zephyr:nrf52dk_nrf52832` + * - :zephyr:board:`nrf52dk` - PCA10040 - ``nrf52dk/nrf52832`` - | `Product Specification `_ | `User Guide `_ - * - :ref:`zephyr:nrf52dk_nrf52810` + * - :zephyr:board:`nrf52dk` - PCA10040 - ``nrf52dk/nrf52810`` - `Product Specification `_ - * - :ref:`zephyr:nrf52dk_nrf52805` + * - :zephyr:board:`nrf52dk` - PCA10040 - ``nrf52dk/nrf52805`` - `Product Specification `_ - * - :ref:`zephyr:nrf52840dongle_nrf52840` + * - :zephyr:board:`nrf52840dongle` - PCA10059 - ``nrf52840dongle/nrf52840`` - | `Product Specification `_ | `User Guide `_ - * - :ref:`zephyr:nrf21540dk_nrf52840` + * - :zephyr:board:`nrf21540dk` - PCA10112 - ``nrf21540dk/nrf52840`` - | `Product Specification `_ diff --git a/doc/nrf/app_dev/device_guides/nrf53/fota_update_nrf5340.rst b/doc/nrf/app_dev/device_guides/nrf53/fota_update_nrf5340.rst index 32e09a92752b..71224d024007 100644 --- a/doc/nrf/app_dev/device_guides/nrf53/fota_update_nrf5340.rst +++ b/doc/nrf/app_dev/device_guides/nrf53/fota_update_nrf5340.rst @@ -52,8 +52,8 @@ FOTA in Bluetooth Mesh :end-before: fota_upgrades_bt_mesh_end .. note:: - Point-to-point DFU over Bluetooth Low Energy is supported by default, out-of-the-box, for all samples and applications compatible with :ref:`zephyr:thingy53_nrf5340`. - See :ref:`thingy53_app_update` for more information about updating firmware image on :ref:`zephyr:thingy53_nrf5340`. + Point-to-point DFU over Bluetooth Low Energy is supported by default, out-of-the-box, for all samples and applications compatible with :zephyr:board:`thingy53`. + See :ref:`thingy53_app_update` for more information about updating firmware image on :zephyr:board:`thingy53`. FOTA in Matter ************** diff --git a/doc/nrf/app_dev/device_guides/nrf53/index.rst b/doc/nrf/app_dev/device_guides/nrf53/index.rst index f01514b1cbb7..32632ac0d5dc 100644 --- a/doc/nrf/app_dev/device_guides/nrf53/index.rst +++ b/doc/nrf/app_dev/device_guides/nrf53/index.rst @@ -18,12 +18,12 @@ Zephyr and the |NCS| provide support and contain board definitions for developin - PCA number - Board targets - Documentation - * - :ref:`zephyr:nrf5340dk_nrf5340` + * - :zephyr:board:`nrf5340dk` - PCA10095 - ``nrf5340dk/nrf5340/cpuapp``, ``nrf5340dk/nrf5340/cpuapp/ns``, ``nrf5340dk/nrf5340/cpunet`` - | `Product Specification `_ | `User Guide `_ - * - :ref:`zephyr:nrf5340_audio_dk_nrf5340` + * - :zephyr:board:`nrf5340_audio_dk` - PCA10121 - ``nrf5340_audio_dk/nrf5340/cpuapp``, ``nrf5340_audio_dk/nrf5340/cpuapp/ns``, ``nrf5340_audio_dk/nrf5340/cpunet`` - | `Hardware Specification `_ @@ -36,7 +36,7 @@ Zephyr and the |NCS| provide support and contain board definitions for developin See the `nRF Connect SDK v1.4.0 documentation`_ for the last release supporting the nRF5340 PDK. -:ref:`zephyr:nrf5340_audio_dk_nrf5340` is a custom reference hardware based on the nRF5340 DK. +:zephyr:board:`nrf5340_audio_dk` is a custom reference hardware based on the nRF5340 DK. It is meant for use with for :ref:`nrf53_audio_app`, which integrate the LE Audio standard. Given their complexity, the applications use custom building and programming procedures. Refer to their documentation for more information. diff --git a/doc/nrf/app_dev/device_guides/nrf54h/index.rst b/doc/nrf/app_dev/device_guides/nrf54h/index.rst index 7befd640e094..e7a7e3ddcddd 100644 --- a/doc/nrf/app_dev/device_guides/nrf54h/index.rst +++ b/doc/nrf/app_dev/device_guides/nrf54h/index.rst @@ -19,7 +19,7 @@ Zephyr and the |NCS| provide support and contain board definitions for developin * - DK - PCA number - Build target - * - :ref:`zephyr:nrf54h20dk_nrf54h20` + * - :zephyr:board:`nrf54h20dk` - PCA10175 - | ``nrf54h20dk/nrf54h20/cpuapp`` | ``nrf54h20dk/nrf54h20/cpurad`` diff --git a/doc/nrf/app_dev/device_guides/nrf54l/features.rst b/doc/nrf/app_dev/device_guides/nrf54l/features.rst index e367682e91f8..56e1ad92d6ef 100644 --- a/doc/nrf/app_dev/device_guides/nrf54l/features.rst +++ b/doc/nrf/app_dev/device_guides/nrf54l/features.rst @@ -11,7 +11,7 @@ The nRF54L15 DK embeds an Arm® Cortex®-M33 processor with multiprotocol 2.4 GH For additional information, see the following documentation: -* Zephyr page on the :ref:`zephyr:nrf54l15dk_nrf54l15` +* Zephyr page on the :zephyr:board:`nrf54l15dk` * :ref:`installation` and :ref:`configuration_and_build` documentation to install the |NCS| and learn more about its development environment. VPR core diff --git a/doc/nrf/app_dev/device_guides/nrf54l/index.rst b/doc/nrf/app_dev/device_guides/nrf54l/index.rst index 2d4fdd3417f1..71bca0dd2144 100644 --- a/doc/nrf/app_dev/device_guides/nrf54l/index.rst +++ b/doc/nrf/app_dev/device_guides/nrf54l/index.rst @@ -18,7 +18,7 @@ Zephyr and the |NCS| provide support and contain board definitions for developin - Board target - Documentation - Product pages - * - :ref:`zephyr:nrf54l15dk_nrf54l15` + * - :zephyr:board:`nrf54l15dk` - PCA10156 - ``nrf54l15dk/nrf54l15/cpuapp`` - | `Datasheet `_ diff --git a/doc/nrf/app_dev/device_guides/nrf70/index.rst b/doc/nrf/app_dev/device_guides/nrf70/index.rst index 1407170643e1..bf0d6a4c0dbe 100644 --- a/doc/nrf/app_dev/device_guides/nrf70/index.rst +++ b/doc/nrf/app_dev/device_guides/nrf70/index.rst @@ -30,28 +30,28 @@ Zephyr and the |NCS| provide support for developing networking applications with - PCA10143 - ``nrf7002dk/nrf5340/cpuapp/nrf7001`` - | `Product Specification `_ - * - :ref:`zephyr:nrf5340dk_nrf5340` + * - :zephyr:board:`nrf5340dk` - nRF7002 EK - PCA10095 - ``nrf5340dk/nrf5340/cpuapp`` - | `Product Specification `_ | `Quick Start app`_ | `User Guide `_ - * - :ref:`zephyr:nrf52840dk_nrf52840` + * - :zephyr:board:`nrf52840dk` - nRF7002 EK - PCA10056 - ``nrf52840dk/nrf52840`` - | `Product Specification `_ | `Quick Start app`_ | `User Guide `_ - * - :ref:`zephyr:nrf9151dk_nrf9151` + * - :zephyr:board:`nrf9151dk` - nRF7002 EK - PCA10171 - ``nrf9151dk/nrf9151/ns`` - | `Product Specification `_ | `Quick Start app`_ | `User Guide `_ - * - :ref:`zephyr:nrf9161dk_nrf9161` + * - :zephyr:board:`nrf9161dk` - nRF7002 EK - PCA10153 - ``nrf9161dk/nrf9161/ns`` @@ -65,19 +65,19 @@ Zephyr and the |NCS| provide support for developing networking applications with - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ - * - :ref:`zephyr:thingy53_nrf5340` + * - :zephyr:board:`thingy53` - nRF7002 EB - PCA20053 - ``thingy53/nrf5340/cpuapp`` - | :ref:`Getting started ` | `User Guide `_ - * - :ref:`zephyr:nrf54h20dk_nrf54h20` + * - :zephyr:board:`nrf54h20dk` - nRF7002 EB - PCA20053 - ``nrf54h20dk/nrf54h20/cpuapp`` - | `nRF54H20 Objective Product Specification 0.3.1`_ | :ref:`Getting started ` - * - :ref:`zephyr:nrf54l15dk_nrf54l15` + * - :zephyr:board:`nrf54l15dk` - nRF7002 EB - PCA20053 - ``nrf54l15dk/nrf54l15/cpuapp`` diff --git a/doc/nrf/app_dev/device_guides/nrf70/nrf7002eb2_dev_guide.rst b/doc/nrf/app_dev/device_guides/nrf70/nrf7002eb2_dev_guide.rst index 747584391c67..4e000e7a8d7f 100644 --- a/doc/nrf/app_dev/device_guides/nrf70/nrf7002eb2_dev_guide.rst +++ b/doc/nrf/app_dev/device_guides/nrf70/nrf7002eb2_dev_guide.rst @@ -9,7 +9,7 @@ Developing with nRF7002-EB II The nRF7002 :term:`Expansion Board (EB)` II (PCA63571), part of the `nRF70 Series Family `_, can be used to provide Wi-Fi® connectivity to compatible development or evaluation boards through the nRF7002 Wi-Fi 6 companion IC. -You can use the nRF7002-EB II to provide Wi-Fi connectivity to the :ref:`zephyr:nrf54h20dk_nrf54h20` and :ref:`zephyr:nrf54l15dk_nrf54l15` board targets. +You can use the nRF7002-EB II to provide Wi-Fi connectivity to the :zephyr:board:`nrf54h20dk` and :zephyr:board:`nrf54l15dk` board targets. .. figure:: images/nRF7002eb2.png :alt: nRF7002-EB II diff --git a/doc/nrf/app_dev/device_guides/nrf70/nrf7002eb_dev_guide.rst b/doc/nrf/app_dev/device_guides/nrf70/nrf7002eb_dev_guide.rst index ee1b0ccd2402..625a51c28876 100644 --- a/doc/nrf/app_dev/device_guides/nrf70/nrf7002eb_dev_guide.rst +++ b/doc/nrf/app_dev/device_guides/nrf70/nrf7002eb_dev_guide.rst @@ -17,7 +17,7 @@ For example, you can use it with the :ref:`Nordic Thingy:53 `, an I Support for the nRF7002 EB is deprecated for all boards except the Thingy:53. This support will be removed in the next major release of the |NCS|. -You can also use the nRF7002 EB to provide Wi-Fi connectivity to the :ref:`zephyr:nrf54h20dk_nrf54h20` and :ref:`zephyr:nrf54l15dk_nrf54l15`. +You can also use the nRF7002 EB to provide Wi-Fi connectivity to the :zephyr:board:`nrf54h20dk` and :zephyr:board:`nrf54l15dk`. .. figure:: images/nRF7002eb.png :alt: nRF7002 EB diff --git a/doc/nrf/app_dev/device_guides/nrf91/index.rst b/doc/nrf/app_dev/device_guides/nrf91/index.rst index 6dac27f47504..b647d5f11b66 100644 --- a/doc/nrf/app_dev/device_guides/nrf91/index.rst +++ b/doc/nrf/app_dev/device_guides/nrf91/index.rst @@ -19,7 +19,7 @@ Zephyr and the |NCS| provide support for developing cellular applications using - Board targets - Documentation - Product pages - * - :ref:`zephyr:nrf9161dk_nrf9161` + * - :zephyr:board:`nrf9161dk` - PCA10153 - ``nrf9161dk/nrf9161``, ``nrf9161dk/nrf9161/ns`` - | `Product Specification `_ @@ -35,7 +35,7 @@ Zephyr and the |NCS| provide support for developing cellular applications using | `User Guide `_ - | `nRF9160 DK product page`_ | `nRF9160 System in Package (SiP) `_ - * - :ref:`zephyr:nrf9151dk_nrf9151` + * - :zephyr:board:`nrf9151dk` - PCA10171 - ``nrf9151dk/nrf9151``, ``nrf9151dk/nrf9151/ns`` - | `Product Specification `_ @@ -43,7 +43,7 @@ Zephyr and the |NCS| provide support for developing cellular applications using | `User Guide `_ - | `nRF9151 DK product page`_ | `nRF9151 System in Package (SiP) `_ - * - :ref:`zephyr:nrf9131ek_nrf9131` + * - :zephyr:board:`nrf9131ek` - PCA10165 - ``nrf9131ek/nrf9131``, ``nrf9131ek/nrf9131/ns`` - -- diff --git a/doc/nrf/app_dev/device_guides/pmic/npm1300.rst b/doc/nrf/app_dev/device_guides/pmic/npm1300.rst index a9f2c427fce4..f314b203892c 100644 --- a/doc/nrf/app_dev/device_guides/pmic/npm1300.rst +++ b/doc/nrf/app_dev/device_guides/pmic/npm1300.rst @@ -45,7 +45,7 @@ The following boards in the `Zephyr`_ open source project and in the |NCS| are c - | `Product Specification `_ | :ref:`Getting started ` | `User Guide `_ - * - :ref:`zephyr:nrf54h20dk_nrf54h20` + * - :zephyr:board:`nrf54h20dk` - nPM1300 EK - PCA10175 - | ``nrf54h20dk/nrf54h20/cpuapp`` @@ -53,26 +53,26 @@ The following boards in the `Zephyr`_ open source project and in the |NCS| are c | ``nrf54h20dk/nrf54h20/cpuppr`` - | `Objective Product Specification `_ | :ref:`Getting started ` - * - :ref:`zephyr:nrf54l15dk_nrf54l15` + * - :zephyr:board:`nrf54l15dk` - nPM1300 EK - PCA10156 - | ``nrf54l15dk/nrf54l15/cpuapp`` - -- - * - :ref:`zephyr:nrf5340dk_nrf5340` + * - :zephyr:board:`nrf5340dk` - nPM1300 EK - PCA10095 - ``nrf5340dk/nrf5340/cpuapp`` - | `Product Specification `_ | `Quick Start app`_ | `User Guide `_ - * - :ref:`zephyr:nrf52840dk_nrf52840` + * - :zephyr:board:`nrf52840dk` - nPM1300 EK - PCA10056 - ``nrf52840dk/nrf52840`` - | `Product Specification `_ | `Quick Start app`_ | `User Guide `_ - * - :ref:`zephyr:nrf52dk_nrf52832` + * - :zephyr:board:`nrf52dk` - nPM1300 EK - PCA10040 - ``nrf52dk/nrf52832`` diff --git a/doc/nrf/app_dev/device_guides/pmic/npm2100.rst b/doc/nrf/app_dev/device_guides/pmic/npm2100.rst index 5e8a3a88bd0e..83993f91bfe1 100644 --- a/doc/nrf/app_dev/device_guides/pmic/npm2100.rst +++ b/doc/nrf/app_dev/device_guides/pmic/npm2100.rst @@ -39,19 +39,19 @@ These boards represent a subset of the boards that are compatible with nPM2100. - PCA number - Board target - Documentation - * - :ref:`zephyr:nrf54l15dk_nrf54l15` + * - :zephyr:board:`nrf54l15dk` - nPM2100 EK - PCA10156 - ``nrf54l15dk/nrf54l15/cpuapp`` - `User Guide `_ - * - :ref:`zephyr:nrf5340dk_nrf5340` + * - :zephyr:board:`nrf5340dk` - nPM2100 EK - PCA10095 - ``nrf5340dk/nrf5340/cpuapp`` - | `Product Specification `_ | `Quick Start app`_ | `User Guide `_ - * - :ref:`zephyr:nrf52840dk_nrf52840` + * - :zephyr:board:`nrf52840dk` - nPM2100 EK - PCA10056 - ``nrf52840dk/nrf52840`` diff --git a/doc/nrf/app_dev/device_guides/thingy53/index.rst b/doc/nrf/app_dev/device_guides/thingy53/index.rst index 92f3def0166b..a6eafc25ed72 100644 --- a/doc/nrf/app_dev/device_guides/thingy53/index.rst +++ b/doc/nrf/app_dev/device_guides/thingy53/index.rst @@ -16,7 +16,7 @@ Zephyr and the |NCS| provide support and contain board definitions for developin - PCA number - Board targets - Documentation - * - :ref:`zephyr:thingy53_nrf5340` + * - :zephyr:board:`thingy53` - PCA20053 - ``thingy53/nrf5340/cpuapp``, ``thingy53/nrf5340/cpuapp/ns``, ``thingy53/nrf5340/cpunet`` - | `Get started `_ on the product page diff --git a/doc/nrf/app_dev/programming.rst b/doc/nrf/app_dev/programming.rst index 694d99b9601b..a97c966f1e04 100644 --- a/doc/nrf/app_dev/programming.rst +++ b/doc/nrf/app_dev/programming.rst @@ -89,7 +89,7 @@ For example, if you are working with an nRF9160 DK, you need to select the corre Programming to Thingy:91 also requires a :ref:`similar step `, but using a different switch (**SW2**). Programming the nRF52840 Dongle - To program the nRF52840 Dongle instead of a development kit, follow the programming instructions in :ref:`zephyr:nrf52840dongle_nrf52840` or use the `Programmer app `_. + To program the nRF52840 Dongle instead of a development kit, follow the programming instructions in :zephyr:board:`nrf52840dongle` or use the `Programmer app `_. Programming the nRF54H20 DK To program the nRF54H20 DK, follow the programming instructions in the :ref:`nRF54H20 device guide `. diff --git a/doc/nrf/dev_model_and_contributions/documentation/build.rst b/doc/nrf/dev_model_and_contributions/documentation/build.rst index 5cb7e50f0c5c..eccc5852601b 100644 --- a/doc/nrf/dev_model_and_contributions/documentation/build.rst +++ b/doc/nrf/dev_model_and_contributions/documentation/build.rst @@ -129,8 +129,10 @@ Here, *docset-name* is the name of the documentation set, for example, ``nrf``. Optimizing build speed ********************** -When working with documentation locally, you can enable the ``-DNO_DTS_BINDINGS=ON`` option when configuring the build. -This option skips generating devicetree bindings pages, which speeds up the Zephyr documentation set build process. +The documentation will by default skip generating certain parts like devicetree bindings or hardware feature tables. +These options are enabled in CI when building the documentation before it is published. + +You can try them locally by enabling ``-DDTS_BINDINGS=ON`` and ``-DHW_FEATURES=ON``. .. _testing_versions: diff --git a/doc/nrf/external_comp/bt_fast_pair.rst b/doc/nrf/external_comp/bt_fast_pair.rst index 21048ae00aa0..f96049a97c4f 100644 --- a/doc/nrf/external_comp/bt_fast_pair.rst +++ b/doc/nrf/external_comp/bt_fast_pair.rst @@ -238,7 +238,7 @@ Devicetree (DTS) ~~~~~~~~~~~~~~~~ For devices that do not support :ref:`partition_manager`, you must declare the ``bt_fast_pair_partition`` partition manually in the devicetree. -Currently, the :ref:`zephyr:nrf54h20dk_nrf54h20` is the only device that requires manual partition definition. +Currently, the :zephyr:board:`nrf54h20dk` is the only device that requires manual partition definition. To see how to do this, refer to the example in the :file:`samples/bluetooth/fast_pair/input_device/boards/nrf54h20dk_nrf54h20_cpuapp.overlay` file. .. note:: diff --git a/doc/nrf/includes/sample_board_rows.txt b/doc/nrf/includes/sample_board_rows.txt index 756834f4afae..905b858f1393 100644 --- a/doc/nrf/includes/sample_board_rows.txt +++ b/doc/nrf/includes/sample_board_rows.txt @@ -4,15 +4,15 @@ .. nrf52dk_nrf52832 -| :ref:`nRF52 DK ` | PCA10040 | :ref:`nrf52dk ` | ``nrf52dk/nrf52832`` | +| :ref:`nRF52 DK ` | PCA10040 | :zephyr:board:`nrf52dk` | ``nrf52dk/nrf52832`` | .. nrf52840dk_nrf52840 -| :ref:`nRF52840 DK ` | PCA10056 | :ref:`nrf52840dk ` | ``nrf52840dk/nrf52840`` | +| :ref:`nRF52840 DK ` | PCA10056 | :zephyr:board:`nrf52840dk` | ``nrf52840dk/nrf52840`` | .. nrf52840dongle_nrf52840 -| :ref:`nRF52840 Dongle ` | PCA10059 | :ref:`nrf52840dongle ` | ``nrf52840dongle/nrf52840`` | +| :ref:`nRF52840 Dongle ` | PCA10059 | :zephyr:board:`nrf52840dongle` | ``nrf52840dongle/nrf52840`` | .. nrf9160dk_nrf9160 @@ -30,47 +30,47 @@ .. nrf9160dk_nrf52840 -| :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk ` | ``nrf9160dk/nrf52840`` | +| :ref:`nRF9160 DK ` | PCA10090 | :ref:`nrf9160dk ` | ``nrf9160dk/nrf52840`` | .. nrf9161dk_nrf9161 -| :ref:`nRF9161 DK ` | PCA10153 | :ref:`nrf9161dk ` | ``nrf9161dk/nrf9161`` | +| :ref:`nRF9161 DK ` | PCA10153 | :zephyr:board:`nrf9161dk` | ``nrf9161dk/nrf9161`` | .. nrf9161dk_nrf9161_ns -| :ref:`nRF9161 DK ` | PCA10153 | :ref:`nrf9161dk ` | ``nrf9161dk/nrf9161/ns`` | +| :ref:`nRF9161 DK ` | PCA10153 | :zephyr:board:`nrf9161dk` | ``nrf9161dk/nrf9161/ns`` | .. nrf9131ek_nrf9131 -| :ref:`nRF9131 EK ` | PCA10165 | :ref:`nrf9131ek ` | ``nrf9131ek/nrf9131`` | +| :ref:`nRF9131 EK ` | PCA10165 | :zephyr:board:`nrf9131ek` | ``nrf9131ek/nrf9131`` | .. nrf9131ek_nrf9131_ns -| :ref:`nRF9131 EK ` | PCA10165 | :ref:`nrf9131ek ` | ``nrf9131ek/nrf9131/ns`` | +| :ref:`nRF9131 EK ` | PCA10165 | :zephyr:board:`nrf9131ek` | ``nrf9131ek/nrf9131/ns`` | .. nrf9151dk_nrf9151 -| :ref:`nRF9151 DK ` | PCA10171 | :ref:`nrf9151dk ` | ``nrf9151dk/nrf9151`` | +| :ref:`nRF9151 DK ` | PCA10171 | :zephyr:board:`nrf9151dk` | ``nrf9151dk/nrf9151`` | .. nrf9151dk_nrf9151_ns -| :ref:`nRF9151 DK ` | PCA10171 | :ref:`nrf9151dk ` | ``nrf9151dk/nrf9151/ns`` | +| :ref:`nRF9151 DK ` | PCA10171 | :zephyr:board:`nrf9151dk` | ``nrf9151dk/nrf9151/ns`` | .. nrf5340dk_nrf5340_cpuapp -| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpuapp`` | +| :ref:`nRF5340 DK ` | PCA10095 | :zephyr:board:`nrf5340dk` | ``nrf5340dk/nrf5340/cpuapp`` | .. nrf5340dk_nrf5340_cpuapp_ns -| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpuapp/ns`` | +| :ref:`nRF5340 DK ` | PCA10095 | :zephyr:board:`nrf5340dk` | ``nrf5340dk/nrf5340/cpuapp/ns`` | .. nrf5340dk_nrf5340_cpunet -| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpunet`` | +| :ref:`nRF5340 DK ` | PCA10095 | :zephyr:board:`nrf5340dk` | ``nrf5340dk/nrf5340/cpunet`` | .. nrf52833dk_nrf52833 -| :ref:`nRF52833 DK ` | PCA10100 | :ref:`nrf52833dk ` | ``nrf52833dk/nrf52833`` | +| :ref:`nRF52833 DK ` | PCA10100 | :zephyr:board:`nrf52833dk` | ``nrf52833dk/nrf52833`` | .. nrf52833dongle_nrf52833 @@ -78,7 +78,7 @@ .. nrf52833dk_nrf52820 -| :ref:`nRF52833 DK (emulating nRF52820) ` | PCA10100 | :ref:`nrf52833dk ` | ``nrf52833dk/nrf52820`` | +| :ref:`nRF52833 DK (emulating nRF52820) ` | PCA10100 | :zephyr:board:`nrf52833dk` | ``nrf52833dk/nrf52820`` | .. nrf52820dongle_nrf52820 @@ -106,11 +106,11 @@ .. nrf52dk_nrf52810 -| :ref:`nRF52 DK (emulating nRF52810) ` | PCA10040 | :ref:`nrf52dk ` | ``nrf52dk/nrf52810`` | +| :ref:`nRF52 DK (emulating nRF52810) ` | PCA10040 | :zephyr:board:`nrf52dk` | ``nrf52dk/nrf52810`` | .. nrf52dk_nrf52805 -| :ref:`nRF52 DK (emulating nRF52805) ` | PCA10040 | :ref:`nrf52dk ` | ``nrf52dk/nrf52805`` | +| :ref:`nRF52 DK (emulating nRF52805) ` | PCA10040 | :zephyr:board:`nrf52dk` | ``nrf52dk/nrf52805`` | .. nrf52kbd_nrf52832 @@ -118,7 +118,7 @@ .. nrf52840dk_nrf52811 -| :ref:`nRF52840 DK (emulating nRF52811) ` | PCA10056 | :ref:`nrf52840dk ` | ``nrf52840dk/nrf52811`` | +| :ref:`nRF52840 DK (emulating nRF52811) ` | PCA10056 | :zephyr:board:`nrf52840dk` | ``nrf52840dk/nrf52811`` | .. nrf52840gmouse_nrf52840 @@ -134,23 +134,23 @@ .. nrf5340dk_nrf5340_cpuapp_and_cpuapp_ns -| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpuapp`` | -| | | | | -| | | | ``nrf5340dk/nrf5340/cpuapp/ns`` | +| :ref:`nRF5340 DK ` | PCA10095 | :zephyr:board:`nrf5340dk` | ``nrf5340dk/nrf5340/cpuapp`` | +| | | | | +| | | | ``nrf5340dk/nrf5340/cpuapp/ns`` | .. nrf5340dk_nrf5340_cpuapp_and_cpunet -| :ref:`nRF5340 DK ` | PCA10095 | :ref:`nrf5340dk ` | ``nrf5340dk/nrf5340/cpuapp`` | -| | | | | -| | | | ``nrf5340dk/nrf5340/cpunet`` | +| :ref:`nRF5340 DK ` | PCA10095 | :zephyr:board:`nrf5340dk` | ``nrf5340dk/nrf5340/cpuapp`` | +| | | | | +| | | | ``nrf5340dk/nrf5340/cpunet`` | .. nrf5340_audio_dk_nrf5340 -| `nRF5340 Audio DK `_ | PCA10121 revision 1.0.0 or above | :ref:`nrf5340_audio_dk ` | ``nrf5340_audio_dk/nrf5340/cpuapp`` | +| `nRF5340 Audio DK `_ | PCA10121 revision 1.0.0 or above | :zephyr:board:`nrf5340_audio_dk` | ``nrf5340_audio_dk/nrf5340/cpuapp`` | .. nrf21540dk_nrf52840 -| :ref:`nRF21540 DK ` | PCA10112 | :ref:`nrf21540dk ` | ``nrf21540dk/nrf52840`` | +| :ref:`nRF21540 DK ` | PCA10112 | :zephyr:board:`nrf21540dk` | ``nrf21540dk/nrf52840`` | .. thingy52_nrf52832 @@ -158,21 +158,21 @@ .. thingy53_nrf5340_cpuapp -| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53 ` | ``thingy53/nrf5340/cpuapp`` | +| :ref:`Thingy:53 ` | PCA20053 | :zephyr:board:`thingy53` | ``thingy53/nrf5340/cpuapp`` | .. thingy53_nrf5340_cpuapp_ns -| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53 ` | ``thingy53/nrf5340/cpuapp/ns`` | +| :ref:`Thingy:53 ` | PCA20053 | :zephyr:board:`thingy53` | ``thingy53/nrf5340/cpuapp/ns`` | .. thingy53_nrf5340_cpuapp_and_cpuapp_ns -| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53 ` | ``thingy53/nrf5340/cpuapp`` | -| | | | | -| | | | ``thingy53/nrf5340/cpuapp/ns`` | +| :ref:`Thingy:53 ` | PCA20053 | :zephyr:board:`thingy53` | ``thingy53/nrf5340/cpuapp`` | +| | | | | +| | | | ``thingy53/nrf5340/cpuapp/ns`` | .. thingy53_nrf5340_cpunet -| :ref:`Thingy:53 ` | PCA20053 | :ref:`thingy53 ` | ``thingy53/nrf5340/cpunet`` | +| :ref:`Thingy:53 ` | PCA20053 | :zephyr:board:`thingy53` | ``thingy53/nrf5340/cpunet`` | .. nrf7002dk_nrf5340_cpuapp @@ -200,15 +200,15 @@ .. nrf54h20dk_nrf54h20_cpuapp -| :ref:`nRF54H20 DK ` | PCA10175 | :ref:`nrf54h20dk ` | ``nrf54h20dk/nrf54h20/cpuapp`` | +| :ref:`nRF54H20 DK ` | PCA10175 | :zephyr:board:`nrf54h20dk` | ``nrf54h20dk/nrf54h20/cpuapp`` | .. nrf54h20dk_nrf54h20_cpurad -| :ref:`nRF54H20 DK ` | PCA10175 | :ref:`nrf54h20dk ` | ``nrf54h20dk/nrf54h20/cpurad`` | +| :ref:`nRF54H20 DK ` | PCA10175 | :zephyr:board:`nrf54h20dk` | ``nrf54h20dk/nrf54h20/cpurad`` | .. nrf54h20dk_nrf54h20_cpuppr -| :ref:`nRF54H20 DK ` | PCA10175 | :ref:`nrf54h20dk ` | ``nrf54h20dk/nrf54h20/cpuppr`` | +| :ref:`nRF54H20 DK ` | PCA10175 | :zephyr:board:`nrf54h20dk` | ``nrf54h20dk/nrf54h20/cpuppr`` | .. native_posix @@ -220,33 +220,33 @@ .. nrf54l15dk_nrf54l05_cpuapp -| :ref:`nRF54L15 DK (emulating nRF54L05) ` | PCA10156 | :ref:`nrf54l15dk ` | ``nrf54l15dk/nrf54l05/cpuapp`` | +| :ref:`nRF54L15 DK (emulating nRF54L05) ` | PCA10156 | :zephyr:board:`nrf54l15dk` | ``nrf54l15dk/nrf54l05/cpuapp`` | .. nrf54l15dk_nrf54l10_cpuapp -| :ref:`nRF54L15 DK (emulating nRF54L10) ` | PCA10156 | :ref:`nrf54l15dk ` | ``nrf54l15dk/nrf54l10/cpuapp`` | +| :ref:`nRF54L15 DK (emulating nRF54L10) ` | PCA10156 | :zephyr:board:`nrf54l15dk` | ``nrf54l15dk/nrf54l10/cpuapp`` | .. nrf54l15dk_nrf54l15_cpuapp -| :ref:`nRF54L15 DK ` | PCA10156 | :ref:`nrf54l15dk ` | ``nrf54l15dk/nrf54l15/cpuapp`` | +| :ref:`nRF54L15 DK ` | PCA10156 | :zephyr:board:`nrf54l15dk` | ``nrf54l15dk/nrf54l15/cpuapp`` | .. nrf54l15dk_nrf54l15_cpuapp_ns -| :ref:`nRF54L15 DK ` | PCA10156 | :ref:`nrf54l15dk ` | ``nrf54l15dk/nrf54l15/cpuapp/ns`` | +| :ref:`nRF54L15 DK ` | PCA10156 | :zephyr:board:`nrf54l15dk` | ``nrf54l15dk/nrf54l15/cpuapp/ns`` | .. nrf54l15dk_nrf54l15_cpuapp_and_cpuapp_ns -| :ref:`nRF54L15 DK ` | PCA10156 | :ref:`nrf54l15dk ` | ``nrf54l15dk/nrf54l15/cpuapp`` | -| | | | | -| | | | ``nrf54l15dk/nrf54l15/cpuapp/ns`` | +| :ref:`nRF54L15 DK ` | PCA10156 | :zephyr:board:`nrf54l15dk` | ``nrf54l15dk/nrf54l15/cpuapp`` | +| | | | | +| | | | ``nrf54l15dk/nrf54l15/cpuapp/ns`` | .. nrf54l15dk_nrf54l15_cpuflpr -| :ref:`nRF54L15 DK ` | PCA10156 | :ref:`nrf54l15dk ` | ``nrf54l15dk/nrf54l15/cpuflpr`` | +| :ref:`nRF54L15 DK ` | PCA10156 | :zephyr:board:`nrf54l15dk` | ``nrf54l15dk/nrf54l15/cpuflpr`` | .. nrf54l20pdk_nrf54l20_cpuapp -| nRF54L20 PDK | | :ref:`nrf54l20pdk ` | ``nrf54l20pdk/nrf54l20/cpuapp`` | +| nRF54L20 PDK | | :zephyr:board:`nrf54l20pdk` | ``nrf54l20pdk/nrf54l20/cpuapp`` | .. nrf54lm20pdk_nrf54lm20a_cpuapp diff --git a/doc/nrf/includes/sample_dtm_radio_test_fem.txt b/doc/nrf/includes/sample_dtm_radio_test_fem.txt index bb981d3502d9..20f0c038a0f5 100644 --- a/doc/nrf/includes/sample_dtm_radio_test_fem.txt +++ b/doc/nrf/includes/sample_dtm_radio_test_fem.txt @@ -1,11 +1,11 @@ You can add support for the nRF21540 or nRF2220 front-end module (FEM) to the sample. -To add support for the FEM, build the sample for a board containing FEM like :ref:`nRF21540 DK/nRF52840 ` or create a devicetree overlay file describing how FEM is connected to the nRF52 Series SoC in your device. +To add support for the FEM, build the sample for a board containing FEM like :zephyr:board:`nrf21540dk` or create a devicetree overlay file describing how FEM is connected to the nRF52 Series SoC in your device. .. note:: If you use the nRF21540 EK, append ``nrf21540ek`` shield to your build command instructing build system to append the appropriate devicetree overlay file. If you use the nRF2220 EK, append the ``nrf2220ek`` shield to your build command instructing the build system to append the appropriate devicetree overlay file. - If you use the nRF21540 DK, build your application for the :ref:`nrf21540dk/nrf52840 ` board target. + If you use the nRF21540 DK, build your application for the :zephyr:board:`nrf21540dk` board target. The devicetree for the nRF21540 DK already contains the required FEM configuration, so you do not need to set an additional build option. For example, to build the sample from the command line for an nRF5340 DK with an attached nRF21540 EK, invoke the following command within the sample directory: diff --git a/doc/nrf/includes/sample_fem_support.txt b/doc/nrf/includes/sample_fem_support.txt index f7319bf245c8..37ec5eedee1b 100644 --- a/doc/nrf/includes/sample_fem_support.txt +++ b/doc/nrf/includes/sample_fem_support.txt @@ -1,6 +1,6 @@ You can add support for the nRF21540 front-end module to this sample by using one of the following options, depending on your hardware: -* Build the sample for one board that contains the nRF21540 FEM, such as :ref:`nrf21540dk/nrf52840 `. +* Build the sample for one board that contains the nRF21540 FEM, such as :zephyr:board:`nrf21540dk`. * Manually create a devicetree overlay file that describes how the nRF21540 FEM is connected to the SoC. See :ref:`configuring_devicetree` for different ways of adding the overlay file. * Provide nRF21540 FEM capabilities by using a :ref:`shield `, for example the :ref:`nRF21540 EK ` shield that is available in the |NCS|. diff --git a/doc/nrf/libraries/bluetooth/services/fast_pair.rst b/doc/nrf/libraries/bluetooth/services/fast_pair.rst index f83265dcc222..564e91d28ec0 100644 --- a/doc/nrf/libraries/bluetooth/services/fast_pair.rst +++ b/doc/nrf/libraries/bluetooth/services/fast_pair.rst @@ -163,7 +163,7 @@ Partition Manager ----------------- The Fast Pair provisioning data is preprogrammed to a dedicated flash memory partition. -The :ref:`zephyr:nrf54h20dk_nrf54h20` is the only device that does not support this feature. +The :zephyr:board:`nrf54h20dk` is the only device that does not support this feature. Settings -------- diff --git a/doc/nrf/protocols/bt/bt_mesh/configuring.rst b/doc/nrf/protocols/bt/bt_mesh/configuring.rst index 7b2ed02f9a27..2929b64e93d1 100644 --- a/doc/nrf/protocols/bt/bt_mesh/configuring.rst +++ b/doc/nrf/protocols/bt/bt_mesh/configuring.rst @@ -13,7 +13,7 @@ The Bluetooth® Mesh support is controlled by :kconfig:option:`CONFIG_BT_MESH`, * :kconfig:option:`CONFIG_BT_OBSERVER` - Enables the Bluetooth Observer role. * :kconfig:option:`CONFIG_BT_PERIPHERAL` - Enables the Bluetooth Peripheral role. -When the Bluetooth LE Controller is located on a separate image (like on the :ref:`zephyr:nrf5340dk_nrf5340` and :ref:`zephyr:thingy53_nrf5340` boards), the following configuration must be applied to the Bluetooth LE Controller configuration: +When the Bluetooth LE Controller is located on a separate image (like on the :zephyr:board:`nrf5340dk` and :zephyr:board:`thingy53` boards), the following configuration must be applied to the Bluetooth LE Controller configuration: * :kconfig:option:`CONFIG_BT_EXT_ADV` =y. * :kconfig:option:`CONFIG_BT_EXT_ADV_MAX_ADV_SET` =5. diff --git a/doc/nrf/protocols/bt/bt_mesh/dfu_over_ble.rst b/doc/nrf/protocols/bt/bt_mesh/dfu_over_ble.rst index 4422ce659318..4010298ef3c5 100644 --- a/doc/nrf/protocols/bt/bt_mesh/dfu_over_ble.rst +++ b/doc/nrf/protocols/bt/bt_mesh/dfu_over_ble.rst @@ -28,12 +28,12 @@ Point-to point DFU over Bluetooth Low Energy in Bluetooth Mesh samples The :ref:`bluetooth_mesh_light`, :ref:`ble_mesh_dfu_target` and :ref:`ble_mesh_dfu_distributor` samples enable support for point-to-point DFU over Bluetooth Low Energy for nRF52 Series development kits. See the sample documentation for each of the above mentioned samples for more details. -Point-to-point DFU over Bluetooth Low Energy is supported by default, out-of-the-box, for all samples and applications compatible with :ref:`zephyr:thingy53_nrf5340`. -See :ref:`thingy53_app_update` for more information about updating firmware image on :ref:`zephyr:thingy53_nrf5340`. -For full list of samples and applications supported on :ref:`zephyr:thingy53_nrf5340`, see :ref:`thingy53_compatible_applications`. +Point-to-point DFU over Bluetooth Low Energy is supported by default, out-of-the-box, for all samples and applications compatible with :zephyr:board:`thingy53`. +See :ref:`thingy53_app_update` for more information about updating firmware image on :zephyr:board:`thingy53`. +For full list of samples and applications supported on :zephyr:board:`thingy53`, see :ref:`thingy53_compatible_applications`. .. note:: - If you are using the `nRF Connect Device Manager`_ mobile app to perform FOTA updates on :ref:`zephyr:thingy53_nrf5340`, your Bluetooth Mesh device might not be visible in the list of available devices. + If you are using the `nRF Connect Device Manager`_ mobile app to perform FOTA updates on :zephyr:board:`thingy53`, your Bluetooth Mesh device might not be visible in the list of available devices. Discovering Bluetooth Mesh devices in nRF Connect Device Manager **************************************************************** diff --git a/doc/nrf/protocols/matter/getting_started/hw_requirements.rst b/doc/nrf/protocols/matter/getting_started/hw_requirements.rst index f334de9be8fe..205439d9c739 100644 --- a/doc/nrf/protocols/matter/getting_started/hw_requirements.rst +++ b/doc/nrf/protocols/matter/getting_started/hw_requirements.rst @@ -60,7 +60,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF52840 DK - The following table lists memory requirements for samples running on the :ref:`nRF52840 DK ` (:ref:`nrf52840dk/nrf52840 `). + The following table lists memory requirements for samples running on the :zephyr:board:`nrf52840dk`). +------------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+ | Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) | @@ -99,7 +99,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF5340 DK - The following table lists memory requirements for samples running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk/nrf5340/cpuapp `). + The following table lists memory requirements for samples running on the :zephyr:board:`nrf5340dk`). +------------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+ | Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) | @@ -142,7 +142,7 @@ Values are provided in kilobytes (KB). .. tab:: Thingy:53 - The following table lists memory requirements for samples running on the :ref:`Thingy:53 ` (:ref:`thingy53/nrf5340 `). + The following table lists memory requirements for samples running on the :ref:`Thingy:53 ` (:zephyr:board:`thingy53`). +---------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+ | Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) | @@ -154,7 +154,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF7002 DK - The following table lists memory requirements for samples running on the :ref:`nRF7002 DK ` (:ref:`nrf7002dk/nrf5340/cpuapp `). + The following table lists memory requirements for samples running on the :zephyr:board:`nrf7002dk`). +------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+ | Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) | @@ -189,7 +189,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF54L15 DK - The following table lists memory requirements for samples running on the :ref:`nRF54L15 DK ` (:ref:`nrf54l15dk/nrf54l15/cpuapp `). + The following table lists memory requirements for samples running on the :zephyr:board:`nrf54l15dk`). +--------------------------------------------------------------------+---------------+-------------------+----------------+------------+-------------+---------------------------------+ | Sample | MCUboot ROM | Application ROM | Factory data | Settings | Total ROM | Total RAM (incl. static HEAP) | @@ -230,7 +230,7 @@ Values are provided in kilobytes (KB). .. tab:: nRF54L15 DK with TF-M - The following table lists memory requirements for samples running on the :ref:`nRF54L15 DK with CMSE enabled ` (:ref:`nrf54l15dk/nrf54l15/cpuapp/ns `). + The following table lists memory requirements for samples running on the :zephyr:board:`nrf54l15dk`). +----------------------------------------------------------------+---------------+------------+-------------------+----------------+------------+----------------+-------------+---------------------------------+ | Sample | MCUboot ROM | TF-M ROM | Application ROM | Factory data | Settings | TF-M Storage | Total ROM | Total RAM (incl. static HEAP) | @@ -270,7 +270,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: nRF52840 DK - The following memory map is valid for Matter applications running on the :ref:`nRF52840 DK ` (:ref:`nrf52840dk/nrf52840 `). + The following memory map is valid for Matter applications running on the :zephyr:board:`nrf52840dk`). Internal flash (size: 0x100000 = 1024kB) +-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+ @@ -307,7 +307,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: nRF5340 DK - The following memory map is valid for Matter applications running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk/nrf5340/cpuapp `). + The following memory map is valid for Matter applications running on the :zephyr:board:`nrf5340dk`). Application core flash (size: 0x100000 = 1024kB) +-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+ @@ -381,7 +381,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: Nordic Thingy:53 - The following memory map is valid for the :ref:`Matter weather station ` application running on the :ref:`Thingy:53 ` (:ref:`thingy53_nrf5340 `). + The following memory map is valid for the :ref:`Matter weather station ` application running on the :ref:`Thingy:53 ` (:zephyr:board:`thingy53`). The values are valid for the ``debug`` and ``release`` build types. Application core flash (size: 0x100000 = 1024kB) @@ -454,7 +454,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: Nordic Thingy:53 (factory data) - The following memory map is valid for the :ref:`Matter weather station ` application running on the :ref:`Thingy:53 ` (:ref:`thingy53_nrf5340 `). + The following memory map is valid for the :ref:`Matter weather station ` application running on the :ref:`Thingy:53 ` (:zephyr:board:`thingy53`). The values are valid for the ``factory_data`` build type. Application core flash (size: 0x100000 = 1024kB) @@ -529,7 +529,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: nRF7002 DK - The following memory map is valid for Matter applications running on the :ref:`nRF7002 DK ` (:ref:`nrf7002dk `). + The following memory map is valid for Matter applications running on the :ref:`nRF7002 DK ` (:zephyr:board:`nrf7002dk`). Application core flash (size: 0x100000 = 1024kB) +-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+ @@ -603,7 +603,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: nRF54L15 DK - The following memory map is valid for Matter applications running on the :ref:`nRF54L15 DK ` (:ref:`nrf54l15dk/nrf54l15/cpuapp `). + The following memory map is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`). Application core flash (size: 0x17D000 = 1524kB) @@ -641,7 +641,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: nRF54L15 DK with internal memory only - The following memory map is valid for Matter applications running on the :ref:`nRF54L15 DK ` (:ref:`nrf54l15dk/nrf54l15/cpuapp `). + The following memory map is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`). You can use this DK with any application. However, it is currently integrated only by the :ref:`Matter Template sample `. @@ -676,7 +676,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: nRF54L15 DK with TF-M - The following table lists memory requirements for samples running on the :ref:`nRF54L15 DK with CMSE enabled ` (:ref:`nrf54l15dk/nrf54l15/cpuapp/ns `). + The following table lists memory requirements for samples running on the :zephyr:board:`nrf54l15dk`). Application core flash (size: 0x17D000 = 1524kB) @@ -715,7 +715,7 @@ For more information about configuration of memory layouts in Matter, see :ref:` .. tab:: nRF54L10 emulation on nRF54L15 DK - The following memory map is valid for Matter applications running on the :ref:`nRF54L15 DK (emulating nRF54L10) ` (:ref:`nrf54l15dk/nrf54l10/cpuapp `). + The following memory map is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`). Application core flash (size: 0xFF800 = 1022kB) @@ -770,7 +770,7 @@ The following tabs show the RAM memory layout defined for the default configurat .. tab:: nRF52840 DK - The following RAM memory layout is valid for Matter applications running on the :ref:`nRF52840 DK ` (:ref:`nrf52840dk_nrf52840 `). + The following RAM memory layout is valid for Matter applications running on the :zephyr:board:`nrf52840dk`). Base Application core SRAM size (size: 0x40000 = 256kB) SRAM is located at the address ``0x20000000`` in the memory address space of the application. @@ -789,7 +789,7 @@ The following tabs show the RAM memory layout defined for the default configurat .. tab:: nRF5340 DK - The following RAM memory layout is valid for Matter applications running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk/nrf5340/cpuapp `). + The following RAM memory layout is valid for Matter applications running on the :zephyr:board:`nrf5340dk`). Application core SRAM primary (size: 0x80000 = 512kB) SRAM is located at the address ``0x20000000`` in the memory address space of the application. @@ -808,7 +808,7 @@ The following tabs show the RAM memory layout defined for the default configurat .. tab:: nRF7002 DK - The following RAM memory layout is valid for Matter applications running on the :ref:`nRF7002 DK ` (:ref:`nrf7002dk `). + The following RAM memory layout is valid for Matter applications running on the :ref:`nRF7002 DK ` (:zephyr:board:`nrf7002dk`). Application core SRAM primary (size: 0x80000 = 512kB) SRAM is located at the address ``0x20000000`` in the memory address space of the application. @@ -827,7 +827,7 @@ The following tabs show the RAM memory layout defined for the default configurat .. tab:: Nordic Thingy:53 - The following RAM memory layout for the :ref:`Matter weather station ` application running on the :ref:`Thingy:53 ` (:ref:`thingy53_nrf5340 `). + The following RAM memory layout for the :ref:`Matter weather station ` application running on the :ref:`Thingy:53 ` (:zephyr:board:`thingy53`). Application core SRAM primary (size: 0x80000 = 512kB) SRAM is located at the address ``0x20000000`` in the memory address space of the application. @@ -846,7 +846,7 @@ The following tabs show the RAM memory layout defined for the default configurat .. tab:: nRF54L15 DK - The following RAM memory layout is valid for Matter applications running on the :ref:`nRF54L15 DK ` (:ref:`nrf54l15dk/nrf54l15/cpuapp `). + The following RAM memory layout is valid for Matter applications running on the :zephyr:board:`nrf54l15dk`). Base SRAM size (size: 0x40000 = 256kB) SRAM is located at the address ``0x20000000`` in the memory address space of the application. diff --git a/doc/nrf/protocols/thread/overview/ot_memory.rst b/doc/nrf/protocols/thread/overview/ot_memory.rst index 3c2b3ea32bfa..02c72e841dc1 100644 --- a/doc/nrf/protocols/thread/overview/ot_memory.rst +++ b/doc/nrf/protocols/thread/overview/ot_memory.rst @@ -41,7 +41,7 @@ See :ref:`thread_device_types` for more information on device types, and :ref:`t nRF54L15 DK RAM and flash memory requirements ********************************************* -The following tables present memory requirements for samples running on the :ref:`nRF54L15 DK ` (:ref:`nrf54l15dk `) with the cryptography support provided by the :ref:`nrf_security_drivers_cracen`. +The following tables present memory requirements for samples running on the :zephyr:board:`nrf54l15dk`) with the cryptography support provided by the :ref:`nrf_security_drivers_cracen`. .. include:: memory_tables/nrf54l15.txt @@ -50,7 +50,7 @@ The following tables present memory requirements for samples running on the :ref nRF5340 DK RAM and flash memory requirements ********************************************* -The following tables present memory requirements for samples running on the :ref:`nRF5340 DK ` (:ref:`nrf5340dk `) with the cryptography support provided by the :ref:`nrf_security_drivers_oberon`. +The following tables present memory requirements for samples running on the :zephyr:board:`nrf5340dk`) with the cryptography support provided by the :ref:`nrf_security_drivers_oberon`. .. include:: memory_tables/nrf5340.txt @@ -59,6 +59,6 @@ The following tables present memory requirements for samples running on the :ref nRF52840 DK RAM and flash memory requirements ********************************************* -The following tables present memory requirements for samples running on the :ref:`nRF52840 DK ` (:ref:`nrf52840dk `) with the cryptography support provided by the :ref:`nrf_security_drivers_oberon`. +The following tables present memory requirements for samples running on the :zephyr:board:`nrf52840dk`) with the cryptography support provided by the :ref:`nrf_security_drivers_oberon`. .. include:: memory_tables/nrf52840.txt diff --git a/doc/nrf/protocols/wifi/advanced_modes/mem_requirements_raw.rst b/doc/nrf/protocols/wifi/advanced_modes/mem_requirements_raw.rst index a8dbdd9797a4..cb92386214d2 100644 --- a/doc/nrf/protocols/wifi/advanced_modes/mem_requirements_raw.rst +++ b/doc/nrf/protocols/wifi/advanced_modes/mem_requirements_raw.rst @@ -13,7 +13,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF54H20 DK - The following table lists memory requirements for samples running on the :ref:`nRF54H20 DK ` (:ref:`nrf54h20dk/nrf54h20/cpuapp `). + The following table lists memory requirements for samples running on the :zephyr:board:`nrf54h20dk`). +---------------------------------------------------------------+-------------+--------------------+----------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW Patch ROM | WPA supplicant ROM | Total RAM (incl. static HEAP) | Wi-Fi driver RAM | WPA supplicant RAM | @@ -27,7 +27,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF54L15 DK - The following table lists memory requirements for samples running on the :ref:`nRF54L15 DK ` (:ref:`nrf54l15dk/nrf54l15/cpuapp `). + The following table lists memory requirements for samples running on the :zephyr:board:`nrf54l15dk`). +---------------------------------------------------------------+-------------+--------------------+----------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW Patch ROM | WPA supplicant ROM | Total RAM (incl. static HEAP) | Wi-Fi driver RAM | WPA supplicant RAM | diff --git a/doc/nrf/protocols/wifi/sap_mode/mem_requirements_sap.rst b/doc/nrf/protocols/wifi/sap_mode/mem_requirements_sap.rst index ba7bba484b9d..87df0a7cdb42 100644 --- a/doc/nrf/protocols/wifi/sap_mode/mem_requirements_sap.rst +++ b/doc/nrf/protocols/wifi/sap_mode/mem_requirements_sap.rst @@ -11,7 +11,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF54H20 DK - The following table lists the memory requirements for :ref:`SoftAP ` sample running on the :ref:`nRF54H20 DK ` (:ref:`nrf54h20dk/nrf54h20/cpuapp `). + The following table lists the memory requirements for :zephyr:board:`nrf54h20dk`). +---------------------------------------------------------------+-------------+--------------------+----------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW Patch ROM | WPA supplicant ROM | Total RAM (incl. static HEAP) | Wi-Fi driver RAM | WPA supplicant RAM | @@ -21,7 +21,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF54L15 DK - The following table lists the memory requirements for :ref:`SoftAP ` sample running on the :ref:`nRF54L15 DK ` (:ref:`nrf54l15dk/nrf54l15/cpuapp `). + The following table lists the memory requirements for :zephyr:board:`nrf54l15dk`). +---------------------------------------------------------------+-------------+--------------------+----------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW Patch ROM | WPA supplicant ROM | Total RAM (incl. static HEAP) | Wi-Fi driver RAM | WPA supplicant RAM | diff --git a/doc/nrf/protocols/wifi/scan_mode/mem_requirements_scan.rst b/doc/nrf/protocols/wifi/scan_mode/mem_requirements_scan.rst index fe180f05cf83..33cef72c225d 100644 --- a/doc/nrf/protocols/wifi/scan_mode/mem_requirements_scan.rst +++ b/doc/nrf/protocols/wifi/scan_mode/mem_requirements_scan.rst @@ -13,7 +13,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF52840 DK - The following table lists memory requirements for sample running on the :ref:`nRF52840 DK ` (:ref:`nrf52840dk/nrf52840 `). + The following table lists memory requirements for sample running on the :zephyr:board:`nrf52840dk`). +--------------------------------------+-------------+-------------------------------------------+----------------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW patch ROM | WPA supplicant ROM | Total RAM (incl. static heap) | Wi-Fi driver RAM | WPA supplicant RAM | @@ -23,7 +23,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF54H20 DK - The following table lists the memory requirements for sample running on the :ref:`nRF54H20 DK ` (:ref:`nrf54h20dk/nrf54h20/cpuapp `). + The following table lists the memory requirements for sample running on the :zephyr:board:`nrf54h20dk`). +---------------------------------------------------------------+-------------+--------------------+----------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW Patch ROM | WPA supplicant ROM | Total RAM (incl. static HEAP) | Wi-Fi driver RAM | WPA supplicant RAM | @@ -33,7 +33,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF54L15 DK - The following table lists the memory requirements for sample running on the :ref:`nRF54L15 DK ` (:ref:`nrf54l15dk/nrf54l15/cpuapp `). + The following table lists the memory requirements for sample running on the :zephyr:board:`nrf54l15dk`). +---------------------------------------------------------------+-------------+--------------------+----------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW Patch ROM | WPA supplicant ROM | Total RAM (incl. static HEAP) | Wi-Fi driver RAM | WPA supplicant RAM | @@ -53,7 +53,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF9160 DK - The following table lists memory requirements for samples running on the :ref:`nRF9160 DK ` (:ref:`nrf9160dk/nrf9160/ns `). + The following table lists memory requirements for samples running on the :ref:`zephyr:nrf9160dk_nrf9160`). +-----------------------------------+-------------+-------------------------------------------+----------------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW patch ROM | WPA supplicant ROM | Total RAM (incl. static heap) | Wi-Fi driver RAM | WPA supplicant RAM | @@ -65,7 +65,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF9161 DK - The following table lists memory requirements for samples running on the :ref:`nRF9161 DK ` (:ref:`nrf9161dk/nrf9161/ns `). + The following table lists memory requirements for samples running on the :zephyr:board:`nrf9161dk`). +-----------------------------------+-------------+-------------------------------------------+----------------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW patch ROM | WPA supplicant ROM | Total RAM (incl. static heap) | Wi-Fi driver RAM | WPA supplicant RAM | diff --git a/doc/nrf/protocols/wifi/station_mode/mem_requirements_sta.rst b/doc/nrf/protocols/wifi/station_mode/mem_requirements_sta.rst index 371a188d40cd..89c9af4d8aa6 100644 --- a/doc/nrf/protocols/wifi/station_mode/mem_requirements_sta.rst +++ b/doc/nrf/protocols/wifi/station_mode/mem_requirements_sta.rst @@ -13,7 +13,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF52840 DK - The following table lists memory requirements for sample running on the :ref:`nRF52840 DK ` (:ref:`nrf52840dk/nrf52840 `). + The following table lists memory requirements for sample running on the :zephyr:board:`nrf52840dk`). +--------------------------------------+-------------+-------------------------------------------+-----------------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW patch ROM | WPA supplicant ROM | Total RAM (incl. static heap) | Wi-Fi driver RAM | WPA supplicant RAM | @@ -23,7 +23,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF54H20 DK - The following table lists the memory requirements for sample running on the :ref:`nRF54H20 DK ` (:ref:`nrf54h20dk/nrf54h20/cpuapp `). + The following table lists the memory requirements for sample running on the :zephyr:board:`nrf54h20dk`). +---------------------------------------------------------------+-------------+--------------------+----------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW Patch ROM | WPA supplicant ROM | Total RAM (incl. static HEAP) | Wi-Fi driver RAM | WPA supplicant RAM | @@ -33,7 +33,7 @@ Footprint values are provided in kilobytes (KB). .. tab:: nRF54L15 DK - The following table lists the memory requirements for sample running on the :ref:`nRF54L15 DK ` (:ref:`nrf54l15dk/nrf54l15/cpuapp `). + The following table lists the memory requirements for sample running on the :zephyr:board:`nrf54l15dk`). +---------------------------------------------------------------+-------------+--------------------+----------------------+----------------------+---------------------------------+--------------------+----------------------+ | Sample | Total ROM | Wi-Fi driver ROM | nRF70 FW Patch ROM | WPA supplicant ROM | Total RAM (incl. static HEAP) | Wi-Fi driver RAM | WPA supplicant RAM | diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-1.5.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-1.5.0.rst index a92d50b0d75f..893346ad0245 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-1.5.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-1.5.0.rst @@ -499,7 +499,7 @@ The following list summarizes the most important changes inherited from upstream * Added support for :ref:`board versioning `. With this concept, multiple board revisions can now share a single folder and board name. * Fixed arguments for the J-Link runners for nRF5340 DK and added the DAP Link (CMSIS-DAP) interface to the OpenOCD runner for nRF5340. - * Marked the nRF5340 PDK as deprecated and updated the nRF5340 documentation to point to the :ref:`zephyr:nrf5340dk_nrf5340`. + * Marked the nRF5340 PDK as deprecated and updated the nRF5340 documentation to point to the :zephyr:board:`nrf5340dk`. * Added enabling of LFXO pins (XL1 and XL2) for nRF5340. * Removed non-existing documentation links from partition definitions in the board devicetree files. * Updated documentation related to QSPI use. diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-1.7.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-1.7.0.rst index df5054684180..15990e90353b 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-1.7.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-1.7.0.rst @@ -23,7 +23,7 @@ Highlights * :ref:`direct_test_mode` and :ref:`radio_test` sample support. * Support for Bluetooth® LE, Thread, Zigbee, and multiprotocol applications and samples using :ref:`nrfxlib:mpsl`. - * Support for :ref:`nRF21540 development kit (DK) `, :ref:`nRF21540 evaluation kit (EK) ` and custom board configurations. + * Support for :zephyr:board:`nrf21540dk`, :ref:`nRF21540 evaluation kit (EK) ` and custom board configurations. * Added Wi-Fi coexistence feature supported for development for Thread and Zigbee. * Added support for NFC and *pair before use* type of accessories to the Apple Find My add-on. @@ -198,7 +198,7 @@ Bluetooth mesh * Updated: * Updated the :ref:`bt_mesh_light_hsl_srv_readme` and the :ref:`bt_mesh_light_xyl_srv_readme` models to no longer extend the :ref:`bt_mesh_lightness_srv_readme` model, and instead get a pointer to this model in the initialization macro. - * Updated samples with support for the :ref:`zephyr:thingy53_nrf5340`. + * Updated samples with support for the :zephyr:board:`thingy53`. * Fixed an issue where beacons were stopped being sent after node reset. * Fixed an issue where the IV update procedure could be started immediately after the device has been provisioned. * Fixed multiple issues in the :ref:`bt_mesh_sensor_types_readme` module. diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-1.8.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-1.8.0.rst index f1a0de015636..e2a4a827a525 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-1.8.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-1.8.0.rst @@ -177,8 +177,8 @@ nRF Machine Learning (Edge Impulse) * Added: - * Non-secure configuration for building :ref:`nrf_machine_learning_app` with :ref:`zephyr:thingy53_nrf5340`. - * Secure configuration for building :ref:`nrf_machine_learning_app` with :ref:`zephyr:nrf5340dk_nrf5340`. + * Non-secure configuration for building :ref:`nrf_machine_learning_app` with :zephyr:board:`thingy53`. + * Secure configuration for building :ref:`nrf_machine_learning_app` with :zephyr:board:`nrf5340dk`. * Power manager to the :ref:`nrf_machine_learning_app` application. * Updated: @@ -270,7 +270,7 @@ Bluetooth samples * Added :ref:`central_and_peripheral_hrs` sample. * Updated some samples to use DTS overlay instead of Kconfig for external flash. -* Updated some samples with support for :ref:`zephyr:thingy53_nrf5340` in non-secure configuration. +* Updated some samples with support for :zephyr:board:`thingy53` in non-secure configuration. * Removed the ``pairing_confirm`` callback from the Bluetooth samples where it was incorrectly used, that is where pairing was accepted without user interaction. * :ref:`direct_test_mode`: @@ -291,12 +291,12 @@ Bluetooth mesh samples * Added: * :ref:`bluetooth_ble_peripheral_lbs_coex`, demonstrating how to combine Bluetooth mesh and Bluetooth Low Energy features in a single application. - * Support for :ref:`zephyr:nrf21540dk_nrf52840`. + * Support for :zephyr:board:`nrf21540dk`. * Updated: - * :ref:`bluetooth_mesh_light` and :ref:`bluetooth_mesh_light_switch` with support for :ref:`zephyr:thingy53_nrf5340` in non-secure configuration. - * :ref:`bluetooth_mesh_light_lc` and :ref:`bluetooth_mesh_sensor_server` with support for :ref:`zephyr:thingy53_nrf5340`. + * :ref:`bluetooth_mesh_light` and :ref:`bluetooth_mesh_light_switch` with support for :zephyr:board:`thingy53` in non-secure configuration. + * :ref:`bluetooth_mesh_light_lc` and :ref:`bluetooth_mesh_sensor_server` with support for :zephyr:board:`thingy53`. * Updated some samples to use DTS overlays instead of Kconfig configuration files for setting up external flash memory. Gazell samples @@ -397,7 +397,7 @@ OpenThread samples * Added: - * Support for ``nrf5340dk_nrf5340_cpuapp_ns`` build target for :ref:`zephyr:nrf5340dk_nrf5340`. + * Support for ``nrf5340dk_nrf5340_cpuapp_ns`` build target for :zephyr:board:`nrf5340dk`. This allows to build the OpenThread samples with Trusted Firmware-M and the PSA crypto API support. This platform is experimental, so :ref:`nrfxlib:ot_libs` are not generated for it. diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.1.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.1.0.rst index d2f4614595d7..5766fed49b45 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.1.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.1.0.rst @@ -596,7 +596,7 @@ Zigbee samples * Added: - * Support for :ref:`zephyr:nrf52840dongle_nrf52840`. + * Support for :zephyr:board:`nrf52840dongle`. * An option to build Zigbee shell sample with the nRF USB CDC ACM as shell backend. * Zigbee NCP sample: diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.3.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.3.0.rst index 69e4f4f85731..a851471e4b0b 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.3.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.3.0.rst @@ -638,7 +638,7 @@ Other samples * Enhanced ShockBurst: Transmitter/Receiver sample: - * Added support for front-end modules and :ref:`zephyr:nrf21540dk_nrf52840`. + * Added support for front-end modules and :zephyr:board:`nrf21540dk`. * :ref:`radio_test` sample: diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.5.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.5.0.rst index f8a2f8ce7ad8..1b5e04513da9 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.5.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.5.0.rst @@ -513,24 +513,24 @@ Bluetooth mesh samples * :ref:`bluetooth_mesh_light` sample: - * Removed support for the configuration with :ref:`CMSE enabled ` for :ref:`zephyr:thingy53_nrf5340`. + * Removed support for the configuration with :ref:`CMSE enabled ` for :zephyr:board:`thingy53`. * :ref:`bluetooth_mesh_light_lc` sample: * Added support for Composition Data Pages 1 and 2. Support for Composition Data Pages 1 and 2 has a dependency on Bluetooth mesh 1.1 support. * Fixed an issue where the sample could return an invalid Light Lightness Status message if the transition time was evaluated to zero. - * Removed support for the configuration with :ref:`CMSE enabled ` for :ref:`zephyr:thingy53_nrf5340`. + * Removed support for the configuration with :ref:`CMSE enabled ` for :zephyr:board:`thingy53`. * :ref:`bluetooth_mesh_light_dim` sample: * Added support for Composition Data Pages 1 and 2. Support for Composition Data Pages 1 and 2 has a dependency on Bluetooth mesh 1.1 support. - * Removed support for the configuration with :ref:`CMSE enabled ` for :ref:`zephyr:thingy53_nrf5340`. + * Removed support for the configuration with :ref:`CMSE enabled ` for :zephyr:board:`thingy53`. * :ref:`bluetooth_mesh_light_switch` sample: - * Removed support for the configuration with :ref:`CMSE enabled ` for :ref:`zephyr:thingy53_nrf5340`. + * Removed support for the configuration with :ref:`CMSE enabled ` for :zephyr:board:`thingy53`. * :ref:`bluetooth_mesh_sensor_server` sample: @@ -541,7 +541,7 @@ Bluetooth mesh samples * A getter for the :c:var:`bt_mesh_sensor_rel_runtime_in_a_dev_op_temp_range` sensor. * Fixed an issue where the :c:var:`bt_mesh_sensor_time_since_presence_detected` sensor could report an invalid value when the time delta would exceed the range of the characteristic. - * Removed support for the configuration with :ref:`CMSE enabled ` for :ref:`zephyr:thingy53_nrf5340`. + * Removed support for the configuration with :ref:`CMSE enabled ` for :zephyr:board:`thingy53`. Cryptography samples -------------------- diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.6.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.6.0.rst index 65f7057eab22..5bedcac8ab23 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.6.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.6.0.rst @@ -641,33 +641,33 @@ Bluetooth Mesh samples * :ref:`ble_mesh_dfu_target` sample: - * Added support for the :ref:`zephyr:nrf52840dongle_nrf52840`. + * Added support for the :zephyr:board:`nrf52840dongle`. * :ref:`bluetooth_mesh_light_dim` sample: - * Added support for the :ref:`zephyr:nrf52840dongle_nrf52840`. - * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :ref:`zephyr:nrf5340dk_nrf5340` and :ref:`zephyr:thingy53_nrf5340` boards. + * Added support for the :zephyr:board:`nrf52840dongle`. + * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :zephyr:board:`nrf5340dk` and :zephyr:board:`thingy53` boards. * :ref:`bluetooth_mesh_light_lc` sample: - * Added support for the :ref:`zephyr:nrf52840dongle_nrf52840`. - * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :ref:`zephyr:nrf5340dk_nrf5340` and :ref:`zephyr:thingy53_nrf5340` boards. + * Added support for the :zephyr:board:`nrf52840dongle`. + * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :zephyr:board:`nrf5340dk` and :zephyr:board:`thingy53` boards. * :ref:`bluetooth_mesh_light` sample: - * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :ref:`zephyr:nrf5340dk_nrf5340` and :ref:`zephyr:thingy53_nrf5340` boards. + * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :zephyr:board:`nrf5340dk` and :zephyr:board:`thingy53` boards. * :ref:`bluetooth_mesh_light_switch` sample: - * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :ref:`zephyr:nrf5340dk_nrf5340` and :ref:`zephyr:thingy53_nrf5340` boards. + * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :zephyr:board:`nrf5340dk` and :zephyr:board:`thingy53` boards. * :ref:`bluetooth_mesh_sensor_server` sample: - * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :ref:`zephyr:nrf5340dk_nrf5340` and :ref:`zephyr:thingy53_nrf5340` boards. + * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :zephyr:board:`nrf5340dk` and :zephyr:board:`thingy53` boards. * :ref:`bluetooth_mesh_silvair_enocean` sample: - * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :ref:`zephyr:nrf5340dk_nrf5340` board. + * Fixed an issue where Bluetooth could not be initialized due to a misconfiguration between the Bluetooth host and the Bluetooth LE Controller when building with :ref:`zephyr:sysbuild` for the :zephyr:board:`nrf5340dk` board. Cellular samples ---------------- diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.7.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.7.0.rst index eb2f1b45b232..3e0fe884bb05 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.7.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.7.0.rst @@ -372,7 +372,7 @@ Enhanced ShockBurst (ESB) * Added: - * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and the nRF54L15 PDK. + * Support for the :zephyr:board:`nrf54h20dk` and the nRF54L15 PDK. * Fast switching between radio states for the nRF54H20 SoC. * Fast radio channel switching for the nRF54H20 SoC. @@ -381,7 +381,7 @@ Wi-Fi * Added: - * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and nRF54L15 PDK boards with :ref:`nRF7002 EB `. + * Support for the :zephyr:board:`nrf54h20dk` and nRF54L15 PDK boards with :ref:`nRF7002 EB `. * General enhancements in low-power mode including watchdog based recovery. Applications @@ -470,7 +470,7 @@ nRF Machine Learning (Edge Impulse) * Added: - * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20`. + * Support for the :zephyr:board:`nrf54h20dk`. * Support for :ref:`configuration_system_overview_sysbuild`. * Updated: @@ -565,7 +565,7 @@ Matter Bridge IPC radio firmware ------------------ -* Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board. +* Added support for the :zephyr:board:`nrf54h20dk` board. Samples ======= @@ -584,7 +584,7 @@ Bluetooth samples * The :ref:`bluetooth_iso_combined_bis_cis` sample showcasing forwarding isochronous data from CIS to BIS. * The :ref:`bluetooth_isochronous_time_synchronization` sample showcasing time-synchronized processing of isochronous data. - * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board in the following samples: + * Support for the :zephyr:board:`nrf54h20dk` board in the following samples: * :ref:`central_bas` sample * :ref:`bluetooth_central_hr_coded` sample @@ -601,7 +601,7 @@ Bluetooth samples * :ref:`peripheral_status` sample * :ref:`shell_bt_nus` sample - * Support for both the :ref:`zephyr:nrf54h20dk_nrf54h20` and the nRF54L15 PDK boards in the following samples: + * Support for both the :zephyr:board:`nrf54h20dk` and the nRF54L15 PDK boards in the following samples: * :ref:`peripheral_lbs` sample * :ref:`bluetooth_central_hids` sample @@ -744,8 +744,8 @@ Cryptography samples * :ref:`crypto_spake2p` sample. * Support for the nRF54L15 PDK board for all crypto samples. - * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board in all crypto samples, except :ref:`crypto_persistent_key` and :ref:`crypto_tls`. - * Support for the :ref:`zephyr:nrf9151dk_nrf9151` board for all crypto samples. + * Support for the :zephyr:board:`nrf54h20dk` board in all crypto samples, except :ref:`crypto_persistent_key` and :ref:`crypto_tls`. + * Support for the :zephyr:board:`nrf9151dk` board for all crypto samples. * Support for the :ref:`nRF9161 DK ` board for the :ref:`crypto_test`. Common samples @@ -771,12 +771,12 @@ Enhanced ShockBurst samples * :ref:`esb_prx` sample: - * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and nRF54L15 PDK boards. + * Added support for the :zephyr:board:`nrf54h20dk` and nRF54L15 PDK boards. Keys samples ------------ -* Added support for the :ref:`zephyr:nrf9151dk_nrf9151` and the :ref:`zephyr:nrf9161dk_nrf9161` boards for all keys samples. +* Added support for the :zephyr:board:`nrf9151dk` and the :zephyr:board:`nrf9161dk` boards for all keys samples. Matter samples -------------- @@ -798,7 +798,7 @@ Matter samples DFU over Matter OTA and Bluetooth LE SMP are supported in all samples but require an external flash. - * Support for Matter over Thread on the :ref:`zephyr:nrf54h20dk_nrf54h20` with the ``nrf54h20dk/nrf54h20/cpuapp`` board target to the following Matter samples: + * Support for Matter over Thread on the :zephyr:board:`nrf54h20dk` with the ``nrf54h20dk/nrf54h20/cpuapp`` board target to the following Matter samples: * :ref:`matter_lock_sample` sample. * :ref:`matter_template_sample` sample. @@ -866,7 +866,7 @@ NFC samples * Added: * Support for the nRF54L15 PDK board in the :ref:`nrf-nfc-system-off-sample` sample. - * Support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and nRF54L15 PDK boards in the following samples: + * Support for the :zephyr:board:`nrf54h20dk` and nRF54L15 PDK boards in the following samples: * :ref:`record_launch_app` sample * :ref:`record_text` sample @@ -879,7 +879,7 @@ Peripheral samples * :ref:`radio_test` sample: - * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` and nRF54L15 PDK boards. + * Added support for the :zephyr:board:`nrf54h20dk` and nRF54L15 PDK boards. * The CLI command ``fem tx_power_control `` replaces ``fem tx_gain `` . This change applies to the sample built with the :ref:`CONFIG_RADIO_TEST_POWER_CONTROL_AUTOMATIC ` set to ``n``. @@ -906,7 +906,7 @@ SUIT samples Trusted Firmware-M (TF-M) samples --------------------------------- -* Added support for the :ref:`zephyr:nrf9151dk_nrf9151` and the :ref:`zephyr:nrf9161dk_nrf9161` boards for all TF-M samples, except for the :ref:`provisioning_image_net_core` sample. +* Added support for the :zephyr:board:`nrf9151dk` and the :zephyr:board:`nrf9161dk` boards for all TF-M samples, except for the :ref:`provisioning_image_net_core` sample. Thread samples -------------- @@ -964,13 +964,13 @@ Other samples * :ref:`bootloader` sample: - * Added support for the :ref:`zephyr:nrf9151dk_nrf9151` and the :ref:`zephyr:nrf9161dk_nrf9161` boards. + * Added support for the :zephyr:board:`nrf9151dk` and the :zephyr:board:`nrf9161dk` boards. * Updated the key revocation handling process to remove a security weakness found in the previous design. It is recommended to switch to the improved revocation handling in the newly manufactured devices. * :ref:`ipc_service_sample` sample: - * Removed support for the `OpenAMP`_ library backend on the :ref:`zephyr:nrf54h20dk_nrf54h20` board. + * Removed support for the `OpenAMP`_ library backend on the :zephyr:board:`nrf54h20dk` board. Drivers ======= diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0-preview1.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0-preview1.rst index e409b3bc3ea5..b9002f489988 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0-preview1.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0-preview1.rst @@ -169,7 +169,7 @@ Security * The :kconfig:option:`CONFIG_CRACEN_IKG_SEED_KMU_SLOT` Kconfig option to allow customization of the KMU slot used to store CRACEN's Internal Key Generator (IKG) seed. The default IKG seed slot is now 183 (previously 0). - * TF-M support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp/ns``). + * TF-M support for the :zephyr:board:`nrf54l15dk` (board target ``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp/ns``). Protocols ========= @@ -296,7 +296,7 @@ This section provides detailed lists of changes by :ref:`application ` Kconfig option depends on :kconfig:option:`CONFIG_CAF_PM_EVENTS`. @@ -432,7 +432,7 @@ Bluetooth samples * The :ref:`bluetooth_conn_time_synchronization` sample demonstrating microsecond-accurate synchronization of connections that are happening over Bluetooth® Low Energy Asynchronous Connection-oriented Logical transport (ACL). * The :ref:`ble_subrating` sample that showcases the effect of the LE Connection Subrating feature on the duty cycle of a connection. * The :ref:`nrf_auraconfig` sample that implements the :ref:`BIS gateway mode ` and may act as an `Auracast™`_ broadcaster if you are using a preset compatible with Auracast. - * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15` board in the following samples: + * Support for the :zephyr:board:`nrf54l15dk` board in the following samples: * :ref:`central_bas` * :ref:`bluetooth_central_hr_coded` @@ -469,7 +469,7 @@ Bluetooth samples * :ref:`ble_llpm` sample: - * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board. + * Added support for the :zephyr:board:`nrf54h20dk` board. * :ref:`bluetooth_radio_coex_1wire_sample` sample: @@ -493,7 +493,7 @@ Bluetooth Fast Pair samples * LED indication on development kits for the Fast Pair advertising state. * An application versioning using the :file:`VERSION` file. * The DFU support which can be enabled using the ``SB_CONFIG_APP_DFU`` sysbuild Kconfig option. - DFU is available for all supported targets except the ``debug`` configurations of :ref:`zephyr:nrf52dk_nrf52832` and :ref:`zephyr:nrf52833dk_nrf52833` due to size constraints. + DFU is available for all supported targets except the ``debug`` configurations of :zephyr:board:`nrf52dk` and :zephyr:board:`nrf52833dk` due to size constraints. * Updated: @@ -507,8 +507,8 @@ Bluetooth Mesh samples * For all Bluetooth Mesh samples: - * Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` board. - * Added support for Zephyr Memory Storage (ZMS) when compiling for the :ref:`zephyr:nrf54l15dk_nrf54l15` board. + * Added support for the :zephyr:board:`nrf54l15dk` board. + * Added support for Zephyr Memory Storage (ZMS) when compiling for the :zephyr:board:`nrf54l15dk` board. * Removed support for the nRF54L15 PDK. * :ref:`bluetooth_ble_peripheral_lbs_coex` sample: @@ -686,7 +686,7 @@ Peripheral samples PMIC samples ------------ -* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` and :ref:`zephyr:nrf54h20dk_nrf54h20` to the PMIC samples. +* Added support for the :zephyr:board:`nrf54l15dk` and :zephyr:board:`nrf54h20dk` to the PMIC samples. * :ref:`npm1300_fuel_gauge` sample: @@ -729,7 +729,7 @@ Thread samples * :ref:`ot_cli_sample` sample: - * Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` in the low-power snippet. + * Added support for the :zephyr:board:`nrf54l15dk` in the low-power snippet. * Added experimental support for :ref:`Trusted Firmware-M ` on the nRF54L15 SoC. Zigbee samples diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0.rst index d350aacad1b4..714ab26453d2 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.8.0.rst @@ -337,7 +337,7 @@ Security * The :kconfig:option:`CONFIG_CRACEN_IKG_SEED_KMU_SLOT` Kconfig option to allow customization of the KMU slot used to store CRACEN's Internal Key Generator (IKG) seed. The default IKG seed slot is now 183 (previously 0). - * TF-M support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp/ns``). + * TF-M support for the :zephyr:board:`nrf54l15dk` (board target ``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp/ns``). * The ``west ncs-provision`` command, which allows to provision signature verification keys to the nRF54L15 SoC over the J-Link interface. * Deprecated legacy Mbed TLS crypto toolbox APIs that are enabled when the :kconfig:option:`CONFIG_NORDIC_SECURITY_BACKEND` Kconfig option is set. @@ -354,7 +354,7 @@ Amazon Sidewalk * Added: - * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15`. + * Support for the :zephyr:board:`nrf54l15dk`. * Protection mechanism for Sidewalk keys in non-volatile memory (secure storage). * Amazon Sidewalk libraries v1.17. * New CLI commands: @@ -497,8 +497,8 @@ Machine learning * Added: - * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (``nrf54l15dk/nrf54l15/cpuapp``). - * Support for sampling ADXL362 sensor from PPR core on the :ref:`zephyr:nrf54h20dk_nrf54h20`. + * Support for the :zephyr:board:`nrf54l15dk` (``nrf54l15dk/nrf54l15/cpuapp``). + * Support for sampling ADXL362 sensor from PPR core on the :zephyr:board:`nrf54h20dk`. Asset Tracker v2 ---------------- @@ -518,7 +518,7 @@ Matter bridge * The :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILES_PATH` Kconfig option that specifies ZAP files location for the application. By default, the option points to the :file:`src/default_zap` directory and can be changed to any path relative to application's location that contains the ZAP file and :file:`zap-generated` directory. - * Experimental support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board. + * Experimental support for the :zephyr:board:`nrf54h20dk` board. * Optional smart plug device functionality. * Experimental support for the Thread protocol. * The :ref:`multiprotocol_bt_thread` page. @@ -546,7 +546,7 @@ nRF Desktop * Added: - * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``). + * Support for the :zephyr:board:`nrf54l15dk` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``). * A debug configuration enabling the `Fast Pair`_ feature on the nRF54L15 DK with the ``nrf54l15dk/nrf54l15/cpuapp`` board target. * An application versioning using the :file:`VERSION` file. The versioning is only applied to the application configurations that use the MCUboot bootloader. @@ -589,16 +589,16 @@ nRF Desktop The value is now aligned with the Fast Pair requirements. * The :kconfig:option:`CONFIG_NRF_RRAM_WRITE_BUFFER_SIZE` Kconfig option value in the nRF54L15 DK configurations to ensure short write slots. It prevents timeouts in the MPSL flash synchronization caused by allocating long write slots while maintaining a Bluetooth LE connection with short intervals and no connection latency. - * The method of obtaining hardware ID using Zephyr's :ref:`zephyr:hwinfo_api` on the :ref:`zephyr:nrf54h20dk_nrf54h20`. - Replaced the custom implementation of the :c:func:`z_impl_hwinfo_get_device_id` function in the nRF Desktop application with the native Zephyr driver function that now supports the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * The method of obtaining hardware ID using Zephyr's :ref:`zephyr:hwinfo_api` on the :zephyr:board:`nrf54h20dk`. + Replaced the custom implementation of the :c:func:`z_impl_hwinfo_get_device_id` function in the nRF Desktop application with the native Zephyr driver function that now supports the :zephyr:board:`nrf54h20dk` board target. Removed the ``CONFIG_DESKTOP_HWINFO_BLE_ADDRESS_FICR_POSTFIX`` Kconfig option as a postfix constant is no longer needed for the Zephyr native driver. The driver uses ``BLE.ADDR``, ``BLE.IR``, and ``BLE.ER`` fields of the Factory Information Configuration Registers (FICR) to provide 8 bytes of unique hardware ID. * The :ref:`nrf_desktop_dfu_mcumgr` to recognize the MCUmgr custom group ID (:kconfig:option:`CONFIG_MGMT_GROUP_ID_SUIT`) from the SUITFU subsystem (:kconfig:option:`CONFIG_MGMT_SUITFU`) as a DFU-related command group. * All build configurations with the DFU over MCUmgr support to require encryption for operations on the Bluetooth GATT SMP service (see the :kconfig:option:`CONFIG_MCUMGR_TRANSPORT_BT_PERM_RW_ENCRYPT` Kconfig option). The Bluetooth pairing procedure of the unpaired Bluetooth peers must now be performed before the DFU operation. * The :ref:`nrf_desktop_dfu_mcumgr` to enable the MCUmgr handler that is used to report the bootloader information (see the :kconfig:option:`CONFIG_MCUMGR_GRP_OS_BOOTLOADER_INFO` Kconfig option). - * The MCUboot image configurations for the :ref:`zephyr:nrf54l15dk_nrf54l15` board to enable Link Time Optimization (LTO) (see the :kconfig:option:`CONFIG_LTO` Kconfig option) and reduce the memory footprint of the bootloader. - * The partition memory configurations for the :ref:`zephyr:nrf54l15dk_nrf54l15` board to optimize the size of the MCUboot bootloader partition. + * The MCUboot image configurations for the :zephyr:board:`nrf54l15dk` board to enable Link Time Optimization (LTO) (see the :kconfig:option:`CONFIG_LTO` Kconfig option) and reduce the memory footprint of the bootloader. + * The partition memory configurations for the :zephyr:board:`nrf54l15dk` board to optimize the size of the MCUboot bootloader partition. * The :ref:`nrf_desktop_constlat` to use the :c:func:`nrfx_power_constlat_mode_request` and :c:func:`nrfx_power_constlat_mode_free` functions instead of :c:func:`nrf_power_task_trigger` to control requesting Constant Latency sub-power mode. This ensures correct behavior if another source requests Constant Latency sub-power mode through the nrfx API. * The :ref:`CONFIG_DESKTOP_CONSTLAT_DISABLE_ON_STANDBY ` Kconfig option depends on :kconfig:option:`CONFIG_CAF_PM_EVENTS`. @@ -656,7 +656,7 @@ Bluetooth samples * The :ref:`bluetooth_conn_time_synchronization` sample demonstrating microsecond-accurate synchronization of connections that are happening over Bluetooth Low Energy Asynchronous Connection-oriented Logical transport (ACL). * The :ref:`ble_subrating` sample that showcases the effect of the LE Connection Subrating feature on the duty cycle of a connection. * The :ref:`nrf_auraconfig` sample that implements the :ref:`BIS gateway mode ` and can act as an `Auracast `_ broadcaster if you are using a preset compatible with Auracast. - * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15` board in the following samples: + * Support for the :zephyr:board:`nrf54l15dk` board in the following samples: * :ref:`central_bas` * :ref:`bluetooth_central_hr_coded` @@ -699,7 +699,7 @@ Bluetooth samples * :ref:`ble_llpm` sample: - * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board. + * Added support for the :zephyr:board:`nrf54h20dk` board. * :ref:`bluetooth_radio_coex_1wire_sample` sample: @@ -708,7 +708,7 @@ Bluetooth samples Bluetooth Fast Pair samples --------------------------- -* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``). +* Added support for the :zephyr:board:`nrf54l15dk` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``). * Updated: @@ -725,7 +725,7 @@ Bluetooth Fast Pair samples * LED indication on development kits for the Fast Pair advertising state. * An application versioning using the :file:`VERSION` file. * The DFU support, which can be enabled using the ``SB_CONFIG_APP_DFU`` sysbuild Kconfig option. - DFU is available for all supported targets except the ``debug`` configurations of :ref:`zephyr:nrf52dk_nrf52832` and :ref:`zephyr:nrf52833dk_nrf52833` due to size constraints. + DFU is available for all supported targets except the ``debug`` configurations of :zephyr:board:`nrf52dk` and :zephyr:board:`nrf52833dk` due to size constraints. * An application module for the DULT motion detector feature and the new UI for supported board targets to interact with this feature. The development kit board targets simulate the motion with the button presses. The Thingy:53 target uses a 6-axis IMU with gyroscope to detect motion. @@ -742,8 +742,8 @@ Bluetooth Mesh samples * Added: - * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``). - * Support for Zephyr Memory Storage (ZMS) when compiling for the :ref:`zephyr:nrf54l15dk_nrf54l15` board. + * Support for the :zephyr:board:`nrf54l15dk` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``). + * Support for Zephyr Memory Storage (ZMS) when compiling for the :zephyr:board:`nrf54l15dk` board. * :ref:`bluetooth_ble_peripheral_lbs_coex` sample: @@ -823,7 +823,7 @@ Cellular samples Cryptography samples -------------------- -* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp/ns``). +* Added support for the :zephyr:board:`nrf54l15dk` (board target ``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp/ns``). Debug samples ------------- @@ -840,7 +840,7 @@ DECT NR+ samples Edge Impulse samples -------------------- -* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` board in the following samples: +* Added support for the :zephyr:board:`nrf54l15dk` board in the following samples: * :ref:`ei_data_forwarder_sample` * :ref:`ei_wrapper_sample` @@ -852,7 +852,7 @@ Matter samples * The :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILES_PATH` Kconfig option, which specifies ZAP files location for the sample. By default, the option points to the :file:`src/default_zap` directory and can be changed to any path relative to sample's location that contains the ZAP file and :file:`zap-generated` directory. - * Support for the :ref:`zephyr:nrf54l15dk_nrf54l15`, replacing the nRF54L15 PDK. + * Support for the :zephyr:board:`nrf54l15dk`, replacing the nRF54L15 PDK. * Support for :ref:`Trusted Firmware-M ` on the nRF54L15 SoC. * The :ref:`matter_smoke_co_alarm_sample` sample that demonstrates implementation of Matter Smoke CO alarm device type. * The :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_LEDS` Kconfig option, which can be used to disable the LEDs in the Matter sample or application. @@ -887,7 +887,7 @@ Matter samples Networking samples ------------------ -* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` board with an nRF7002 EB device for the following samples: +* Added support for the :zephyr:board:`nrf54l15dk` board with an nRF7002 EB device for the following samples: * :ref:`aws_iot` * :ref:`download_sample` @@ -931,7 +931,7 @@ Peripheral samples PMIC samples ------------ -* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` and :ref:`zephyr:nrf54h20dk_nrf54h20` to the PMIC samples. +* Added support for the :zephyr:board:`nrf54l15dk` and :zephyr:board:`nrf54h20dk` to the PMIC samples. * :ref:`npm1300_fuel_gauge` sample: @@ -945,7 +945,7 @@ Protocols serialization samples Trusted Firmware-M (TF-M) samples --------------------------------- -* Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (``nrf54l15pdk/nrf54l15/cpuapp/ns``). +* Added support for the :zephyr:board:`nrf54l15dk` (``nrf54l15dk/nrf54l15/cpuapp/ns``), replacing the nRF54L15 PDK (``nrf54l15pdk/nrf54l15/cpuapp/ns``). * :ref:`tfm_psa_template` sample: @@ -958,7 +958,7 @@ Thread samples * :ref:`ot_cli_sample` sample: - * Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` in the low-power snippet. + * Added support for the :zephyr:board:`nrf54l15dk` in the low-power snippet. * Added experimental support for :ref:`Trusted Firmware-M ` on the nRF54L15 SoC. Zigbee samples @@ -1005,7 +1005,7 @@ Other samples * :ref:`coremark_sample` sample: - * Added support for the :ref:`zephyr:nrf54l15dk_nrf54l15` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``). + * Added support for the :zephyr:board:`nrf54l15dk` (board target ``nrf54l15dk/nrf54l15/cpuapp``), replacing the nRF54L15 PDK (board target ``nrf54l15pdk/nrf54l15/cpuapp``). * Updated the logging mode to minimal (:kconfig:option:`CONFIG_LOG_MODE_MINIMAL`) to reduce the sample's memory footprint and ensure no logging interference with the running benchmark. Drivers diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.9.0-nRF54H20-1.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.9.0-nRF54H20-1.rst index 9f541830cf44..968405a2fba3 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.9.0-nRF54H20-1.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.9.0-nRF54H20-1.rst @@ -113,7 +113,7 @@ IDE, OS, and tool support Board support ============= -* Updated various tests and samples to use Zephyr's :ref:`native simulator ` instead of Zephyr's :ref:`native POSIX ` for :ref:`running_unit_tests`. +* Updated various tests and samples to use Zephyr's :ref:`native simulator ` instead of Zephyr's native POSIX for :ref:`running_unit_tests`. This mirrors the deprecation of ``native_posix`` in Zephyr. Support for ``native_posix`` will be removed in Zephyr with the v4.2 release. In the |NCS|, it will be removed once Zephyr v4.2 is upmerged to sdk-nrf. @@ -222,7 +222,7 @@ This section provides detailed lists of changes by :ref:`application ` file system for the :ref:`zephyr:nrf54h20dk_nrf54h20` board. +* Updated the application to enable the :ref:`Zephyr Memory Storage (ZMS) ` file system for the :zephyr:board:`nrf54h20dk` board. IPC radio firmware ------------------ @@ -244,15 +244,15 @@ nRF Desktop * Updated: * The :ref:`nrf_desktop_settings_loader` to make the :ref:`Zephyr Memory Storage (ZMS) ` the default settings backend for all board targets that use the MRAM technology. - As a result, all :ref:`zephyr:nrf54h20dk_nrf54h20` configurations were migrated from the NVS settings backend to the ZMS settings backend. - * :ref:`nrf_desktop_watchdog` by adding the :ref:`zephyr:nrf54h20dk_nrf54h20` release configuration. + As a result, all :zephyr:board:`nrf54h20dk` configurations were migrated from the NVS settings backend to the ZMS settings backend. + * :ref:`nrf_desktop_watchdog` by adding the :zephyr:board:`nrf54h20dk` release configuration. * The configuration files of the :ref:`nrf_desktop_click_detector` (:file:`click_detector_def.h`) to allow them to be used even when Bluetooth LE peer control using a dedicated button (:ref:`CONFIG_DESKTOP_BLE_PEER_CONTROL `) is disabled. * The DTS description for board targets with a different DTS overlay file for each build type to isolate the common configuration that is now defined in the :file:`app_common.dtsi` file. - The :ref:`zephyr:nrf54h20dk_nrf54h20` board configuration has been updated. + The :zephyr:board:`nrf54h20dk` board configuration has been updated. * The :ref:`nrf_desktop_failsafe` to use the Zephyr :ref:`zephyr:hwinfo_api` driver for getting and clearing the reset reason information (see the :c:func:`hwinfo_get_reset_cause` and :c:func:`hwinfo_clear_reset_cause` functions). The Zephyr :ref:`zephyr:hwinfo_api` driver replaces the dependency on the nrfx reset reason helper (see the :c:func:`nrfx_reset_reason_get` and :c:func:`nrfx_reset_reason_clear` functions). - * The release configuration for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target to enable the :ref:`nrf_desktop_failsafe` (see the :ref:`CONFIG_DESKTOP_FAILSAFE_ENABLE ` Kconfig option). + * The release configuration for the :zephyr:board:`nrf54h20dk` board target to enable the :ref:`nrf_desktop_failsafe` (see the :ref:`CONFIG_DESKTOP_FAILSAFE_ENABLE ` Kconfig option). Samples ======= @@ -299,12 +299,12 @@ Bluetooth samples * :ref:`peripheral_uart` * :ref:`ble_rpc_host` - As a result, all :ref:`zephyr:nrf54h20dk_nrf54h20` configurations of the affected samples were migrated from the NVS settings backend to the ZMS settings backend. + As a result, all :zephyr:board:`nrf54h20dk` configurations of the affected samples were migrated from the NVS settings backend to the ZMS settings backend. * Testing steps in the :ref:`peripheral_hids_mouse` to provide the build configuration that is compatible with the `Bluetooth Low Energy app`_ testing tool. * :ref:`power_profiling` sample: - * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * Added support for the :zephyr:board:`nrf54h20dk` board target. * :ref:`nrf_auraconfig` sample: @@ -324,16 +324,16 @@ Bluetooth Fast Pair samples * :ref:`fast_pair_input_device` sample: - * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * Added support for the :zephyr:board:`nrf54h20dk` board target. * :ref:`fast_pair_locator_tag` sample: - * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * Added support for the :zephyr:board:`nrf54h20dk` board target. Edge Impulse samples -------------------- -* Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target in the following samples: +* Added support for the :zephyr:board:`nrf54h20dk` board target in the following samples: * :ref:`ei_data_forwarder_sample` * :ref:`ei_wrapper_sample` @@ -373,7 +373,7 @@ Other samples * Updated: - * Configuration for the :ref:`zephyr:nrf54h20dk_nrf54h20` board to support multi-domain logging using the ARM Coresight STM. + * Configuration for the :zephyr:board:`nrf54h20dk` board to support multi-domain logging using the ARM Coresight STM. * The logging format in the standard logging mode to align it with the format used in the multi-domain logging mode. * Support for alternative configurations to use the :ref:`file suffix feature from Zephyr `. The following file suffixes are supported as alternative configurations: @@ -401,7 +401,7 @@ Bluetooth libraries and services * :ref:`bt_fast_pair_readme` library: * Added support in the build system for devices that do not support the :ref:`partition_manager`. - The :ref:`zephyr:nrf54h20dk_nrf54h20` board target is the only example of such a device. + The :zephyr:board:`nrf54h20dk` board target is the only example of such a device. * Updated the :c:func:`bt_fast_pair_info_cb_register` API to allow registration of multiple callbacks. @@ -423,7 +423,7 @@ This section provides detailed lists of changes by :ref:`integration ` instead of Zephyr's :ref:`native POSIX ` for :ref:`running_unit_tests`. +* Updated various tests and samples to use Zephyr's :ref:`native simulator ` instead of Zephyr's native POSIX for :ref:`running_unit_tests`. This mirrors the deprecation of ``native_posix`` in Zephyr. Support for ``native_posix`` will be removed in Zephyr with the v4.2 release. In the |NCS|, it will be removed once Zephyr v4.2 is upmerged to sdk-nrf. @@ -309,16 +309,16 @@ nRF Desktop * Updated: * The :ref:`nrf_desktop_settings_loader` to make the :ref:`Zephyr Memory Storage (ZMS) ` the default settings backend for all board targets that use the MRAM technology. - As a result, all :ref:`zephyr:nrf54h20dk_nrf54h20` configurations were migrated from the NVS settings backend to the ZMS settings backend. - * :ref:`nrf_desktop_watchdog` by adding the :ref:`zephyr:nrf54h20dk_nrf54h20` release configuration. + As a result, all :zephyr:board:`nrf54h20dk` configurations were migrated from the NVS settings backend to the ZMS settings backend. + * :ref:`nrf_desktop_watchdog` by adding the :zephyr:board:`nrf54h20dk` release configuration. * The configuration files of the :ref:`nrf_desktop_click_detector` (:file:`click_detector_def.h`) to allow using them also when Bluetooth LE peer control using a dedicated button (:ref:`CONFIG_DESKTOP_BLE_PEER_CONTROL `) is disabled. * The DTS description for board targets with a different DTS overlay file for each build type to isolate the common configuration that is now defined in the :file:`app_common.dtsi` file. The following board configurations have been updated: - * :ref:`zephyr:nrf52840dk_nrf52840` - * :ref:`zephyr:nrf52840dongle_nrf52840` - * :ref:`zephyr:nrf54l15dk_nrf54l15` - * :ref:`zephyr:nrf54h20dk_nrf54h20` + * :zephyr:board:`nrf52840dk` + * :zephyr:board:`nrf52840dongle` + * :zephyr:board:`nrf54l15dk` + * :zephyr:board:`nrf54h20dk` * MCUboot bootloader configurations to enable the following Kconfig options: @@ -402,12 +402,12 @@ Bluetooth samples * :ref:`peripheral_uart` * :ref:`ble_rpc_host` - As a result, all :ref:`zephyr:nrf54h20dk_nrf54h20` configurations of the affected samples were migrated from the NVS settings backend to the ZMS settings backend. + As a result, all :zephyr:board:`nrf54h20dk` configurations of the affected samples were migrated from the NVS settings backend to the ZMS settings backend. * Testing steps in the :ref:`peripheral_hids_mouse` to provide the build configuration that is compatible with the `Bluetooth Low Energy app`_ testing tool. * :ref:`power_profiling` sample: - * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * Added support for the :zephyr:board:`nrf54h20dk` board target. * :ref:`nrf_auraconfig` sample: @@ -419,11 +419,11 @@ Bluetooth Fast Pair samples * :ref:`fast_pair_locator_tag` sample: - * Updated the MCUboot bootloader configuration for the :ref:`zephyr:nrf54l15dk_nrf54l15` board target to enable the :kconfig:option:`CONFIG_FPROTECT` Kconfig option that is used to protect the bootloader partition against memory corruption. + * Updated the MCUboot bootloader configuration for the :zephyr:board:`nrf54l15dk` board target to enable the :kconfig:option:`CONFIG_FPROTECT` Kconfig option that is used to protect the bootloader partition against memory corruption. * :ref:`fast_pair_input_device` sample: - * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * Added support for the :zephyr:board:`nrf54h20dk` board target. Cellular samples ---------------- @@ -471,7 +471,7 @@ DECT NR+ samples Edge Impulse samples -------------------- -* Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target in the following samples: +* Added support for the :zephyr:board:`nrf54h20dk` board target in the following samples: * :ref:`ei_data_forwarder_sample` * :ref:`ei_wrapper_sample` @@ -497,7 +497,7 @@ Matter samples * :ref:`matter_template_sample` sample: * Added support for the ``nrf54l15dk/nrf54l10/cpuapp`` board target. - * Updated the internal configuration for the :ref:`zephyr:nrf54l15dk_nrf54l15` target to use the DFU image compression and provide more memory space for the application. + * Updated the internal configuration for the :zephyr:board:`nrf54l15dk` target to use the DFU image compression and provide more memory space for the application. * :ref:`matter_smoke_co_alarm_sample` sample: @@ -537,7 +537,7 @@ Other samples * Updated: - * Configuration for the :ref:`zephyr:nrf54h20dk_nrf54h20` board to support multi-domain logging using the ARM Coresight STM. + * Configuration for the :zephyr:board:`nrf54h20dk` board to support multi-domain logging using the ARM Coresight STM. * The logging format in the standard logging mode to align it with the format used in the multi-domain logging mode. * Support for alternative configurations to use the :ref:`file suffix feature from Zephyr `. The following file suffixes are supported as alternative configurations: @@ -583,7 +583,7 @@ Bluetooth libraries and services * :ref:`bt_fast_pair_readme` library: * Added support in build system for devices that do not support the :ref:`partition_manager`. - The :ref:`zephyr:nrf54h20dk_nrf54h20` board target is the only example of such a device. + The :zephyr:board:`nrf54h20dk` board target is the only example of such a device. Modem libraries --------------- diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-3.0.0-preview1.rst b/doc/nrf/releases_and_maturity/releases/release-notes-3.0.0-preview1.rst index 766babd5c0bf..a0ed67d29c2b 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-3.0.0-preview1.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-3.0.0-preview1.rst @@ -196,7 +196,7 @@ This section provides detailed lists of changes by :ref:`application ` file system for the :ref:`zephyr:nrf54h20dk_nrf54h20` board. +* Updated the application to enable the :ref:`Zephyr Memory Storage (ZMS) ` file system for the :zephyr:board:`nrf54h20dk` board. Asset Tracker v2 ---------------- @@ -232,7 +232,7 @@ nRF Desktop * The :ref:`nrf_desktop_failsafe` to use the Zephyr :ref:`zephyr:hwinfo_api` driver for getting and clearing the reset reason information (see the :c:func:`hwinfo_get_reset_cause` and :c:func:`hwinfo_clear_reset_cause` functions). The Zephyr :ref:`zephyr:hwinfo_api` driver replaces the dependency on the nrfx reset reason helper (see the :c:func:`nrfx_reset_reason_get` and :c:func:`nrfx_reset_reason_clear` functions). - * The release configuration for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target to enable the :ref:`nrf_desktop_failsafe` (see the :ref:`CONFIG_DESKTOP_FAILSAFE_ENABLE ` Kconfig option). + * The release configuration for the :zephyr:board:`nrf54h20dk` board target to enable the :ref:`nrf_desktop_failsafe` (see the :ref:`CONFIG_DESKTOP_FAILSAFE_ENABLE ` Kconfig option). * Enabled Link Time Optimization (:kconfig:option:`CONFIG_LTO` and :kconfig:option:`CONFIG_ISR_TABLES_LOCAL_DECLARATION`) by default for an nRF Desktop application image. LTO was also explicitly enabled in configurations of other images built by sysbuild (bootloader, network core image). * Application configurations for nRF54L05, nRF54L10, and nRF54L15 SoCs to use Fast Pair PSA cryptography (:kconfig:option:`CONFIG_BT_FAST_PAIR_CRYPTO_PSA`). @@ -253,7 +253,7 @@ nRF Desktop * Added: - * System Power Management for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target on the application and radio cores. + * System Power Management for the :zephyr:board:`nrf54h20dk` board target on the application and radio cores. * Application configurations for the nRF54L05 and nRF54L10 SoCs (emulated on the nRF54L15 DK). The configurations are supported through ``nrf54l15dk/nrf54l10/cpuapp`` and ``nrf54l15dk/nrf54l05/cpuapp`` board targets. For details, see the :ref:`nrf_desktop_board_configuration`. @@ -341,7 +341,7 @@ Bluetooth Fast Pair samples * :ref:`fast_pair_locator_tag` sample: - * Added support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * Added support for the :zephyr:board:`nrf54h20dk` board target. * Updated the partition layout for the ``nrf5340dk/nrf5340/cpuapp/ns`` and ``thingy53/nrf5340/cpuapp/ns`` board targets to accommodate the partitions needed due to change in the TF-M profile configuration. Bluetooth Mesh samples @@ -572,7 +572,7 @@ Other samples * Added: * Support for the nRF54L05 and nRF54L10 SoCs (emulated on nRF54L15 DK). - * FLPR core support for the :ref:`zephyr:nrf54l15dk_nrf54l15` board target. + * FLPR core support for the :zephyr:board:`nrf54l15dk` board target. Drivers ======= @@ -789,7 +789,7 @@ This section provides detailed lists of changes by :ref:`integration ` file system for the :ref:`zephyr:nrf54h20dk_nrf54h20` board. +* Updated the application to enable the :ref:`Zephyr Memory Storage (ZMS) ` file system for the :zephyr:board:`nrf54h20dk` board. Asset Tracker v2 ---------------- @@ -278,7 +278,7 @@ nRF Desktop * Added: - * System Power Management for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target on the application and radio cores. + * System Power Management for the :zephyr:board:`nrf54h20dk` board target on the application and radio cores. * Application configurations for the nRF54L05 and nRF54L10 SoCs (emulated on the nRF54L15 DK). The configurations are supported through ``nrf54l15dk/nrf54l10/cpuapp`` and ``nrf54l15dk/nrf54l05/cpuapp`` board targets. For details, see the :ref:`nrf_desktop_board_configuration`. @@ -296,7 +296,7 @@ nRF Desktop * The :ref:`nrf_desktop_failsafe` to use the Zephyr :ref:`zephyr:hwinfo_api` driver for getting and clearing the reset reason information (see the :c:func:`hwinfo_get_reset_cause` and :c:func:`hwinfo_clear_reset_cause` functions). The Zephyr :ref:`zephyr:hwinfo_api` driver replaces the dependency on the nrfx reset reason helper (see the :c:func:`nrfx_reset_reason_get` and :c:func:`nrfx_reset_reason_clear` functions). - * The release configuration for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target to enable the :ref:`nrf_desktop_failsafe` (see the :ref:`CONFIG_DESKTOP_FAILSAFE_ENABLE ` Kconfig option). + * The release configuration for the :zephyr:board:`nrf54h20dk` board target to enable the :ref:`nrf_desktop_failsafe` (see the :ref:`CONFIG_DESKTOP_FAILSAFE_ENABLE ` Kconfig option). * Enabled Link Time Optimization (:kconfig:option:`CONFIG_LTO` and :kconfig:option:`CONFIG_ISR_TABLES_LOCAL_DECLARATION`) by default for an nRF Desktop application image. LTO was also explicitly enabled in configurations of other images built by sysbuild (bootloader, network core image). * Application configurations for nRF54L05, nRF54L10, and nRF54L15 SoCs to use Fast Pair PSA cryptography (:kconfig:option:`CONFIG_BT_FAST_PAIR_CRYPTO_PSA`). @@ -439,7 +439,7 @@ Bluetooth Mesh samples * :ref:`bluetooth_mesh_light_lc` sample: - * Updated by disabling the Friend feature when the sample is compiled for the :ref:`zephyr:nrf52dk_nrf52832` board target to increase the amount of RAM available for the application. + * Updated by disabling the Friend feature when the sample is compiled for the :zephyr:board:`nrf52dk` board target to increase the amount of RAM available for the application. Bluetooth Fast Pair samples --------------------------- @@ -467,7 +467,7 @@ Bluetooth Fast Pair samples * Added support for the following: - * :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * :zephyr:board:`nrf54h20dk` board target. * Firmware update intents on the Android platform. Integrated the new connection authentication callback from the FMDN module and the Device Information Service (DIS) to support firmware version read operation over the Firmware Revision characteristic. For further details on the Android intent feature for firmware updates, see the :ref:`ug_bt_fast_pair_provisioning_register_firmware_update_intent` section of the Fast Pair integration guide. @@ -728,7 +728,7 @@ Other samples * Added: * Support for the nRF54L05 and nRF54L10 SoCs (emulated on nRF54L15 DK). - * FLPR core support for the :ref:`zephyr:nrf54l15dk_nrf54l15` and :ref:`zephyr:nrf54h20dk_nrf54h20` board targets. + * FLPR core support for the :zephyr:board:`nrf54l15dk` and :zephyr:board:`nrf54h20dk` board targets. * Removed the following compiler options that were set in the :kconfig:option:`CONFIG_COMPILER_OPT` Kconfig option: @@ -741,7 +741,7 @@ Other samples * :ref:`caf_sensor_manager_sample` sample: - * Added low power configuration for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * Added low power configuration for the :zephyr:board:`nrf54h20dk` board target. Drivers ======= @@ -1011,7 +1011,7 @@ Google Fast Pair integration * Added: - * Instructions on how to provision the Fast Pair data onto devices without the :ref:`partition_manager` support, specifically for the :ref:`zephyr:nrf54h20dk_nrf54h20`. + * Instructions on how to provision the Fast Pair data onto devices without the :ref:`partition_manager` support, specifically for the :zephyr:board:`nrf54h20dk`. * Information on how to support the firmware update intent feature on the Android platform. Expanded the documentation for the Fast Pair devices with the FMDN extension, which requires additional steps to support this feature. diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-3.0.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-3.0.0.rst index 556176b63142..d8e823802933 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-3.0.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-3.0.0.rst @@ -449,7 +449,7 @@ Machine learning * Updated: - * The application to enable the :ref:`Zephyr Memory Storage (ZMS) ` file system for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * The application to enable the :ref:`Zephyr Memory Storage (ZMS) ` file system for the :zephyr:board:`nrf54h20dk` board target. * The Edge Impulse URI configuration to use the new model location. Matter bridge @@ -483,7 +483,7 @@ nRF Desktop * Added: - * System power management for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target on the application and radio cores. + * System power management for the :zephyr:board:`nrf54h20dk` board target on the application and radio cores. * Application configurations for the nRF54L05 and nRF54L10 SoCs (emulated on the nRF54L15 DK). The configurations are supported through ``nrf54l15dk/nrf54l10/cpuapp`` and ``nrf54l15dk/nrf54l05/cpuapp`` board targets. For details, see the :ref:`nrf_desktop_board_configuration`. @@ -508,7 +508,7 @@ nRF Desktop The MCUboot bootloader provides logs over UART. * The :ref:`nrf_desktop_failsafe` to use the Zephyr :ref:`zephyr:hwinfo_api` driver for getting and clearing the reset reason information (see the :c:func:`hwinfo_get_reset_cause` and :c:func:`hwinfo_clear_reset_cause` functions). The Zephyr :ref:`zephyr:hwinfo_api` driver replaces the dependency on the nrfx reset reason helper (see the :c:func:`nrfx_reset_reason_get` and :c:func:`nrfx_reset_reason_clear` functions). - * The ``release`` configuration for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target to enable the :ref:`nrf_desktop_failsafe` (see the :ref:`CONFIG_DESKTOP_FAILSAFE_ENABLE ` Kconfig option). + * The ``release`` configuration for the :zephyr:board:`nrf54h20dk` board target to enable the :ref:`nrf_desktop_failsafe` (see the :ref:`CONFIG_DESKTOP_FAILSAFE_ENABLE ` Kconfig option). * By enabling Link Time Optimization (:kconfig:option:`CONFIG_LTO` and :kconfig:option:`CONFIG_ISR_TABLES_LOCAL_DECLARATION`) by default for an nRF Desktop application image. LTO was also explicitly enabled in configurations of other images built by sysbuild (bootloader, network core image). * Application configurations for nRF54L05, nRF54L10, and nRF54L15 SoCs to use Fast Pair PSA cryptography (:kconfig:option:`CONFIG_BT_FAST_PAIR_CRYPTO_PSA`). @@ -708,7 +708,7 @@ Bluetooth Mesh samples * :ref:`ble_mesh_dfu_distributor` * :ref:`ble_mesh_dfu_target` - * :ref:`bluetooth_mesh_light_lc` sample by disabling the friend feature when the sample is compiled for the :ref:`zephyr:nrf52dk_nrf52832` board target to increase the amount of RAM available for the application. + * :ref:`bluetooth_mesh_light_lc` sample by disabling the friend feature when the sample is compiled for the :zephyr:board:`nrf52dk` board target to increase the amount of RAM available for the application. Bluetooth Fast Pair samples --------------------------- @@ -736,7 +736,7 @@ Bluetooth Fast Pair samples * Added: - * Experimental support for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * Experimental support for the :zephyr:board:`nrf54h20dk` board target. * Support for firmware update intents on the Android platform. The configuration of the default device model in the Google Nearby Console has been updated to properly support this feature. See the sample documentation for more information. @@ -1006,7 +1006,7 @@ Other samples * Added: * Support for the nRF54L05 and nRF54L10 SoCs (emulated on nRF54L15 DK). - * FLPR core support for the :ref:`zephyr:nrf54l15dk_nrf54l15` and :ref:`zephyr:nrf54h20dk_nrf54h20` board targets. + * FLPR core support for the :zephyr:board:`nrf54l15dk` and :zephyr:board:`nrf54h20dk` board targets. * Removed the following compiler options that were set in the :kconfig:option:`CONFIG_COMPILER_OPT` Kconfig option: @@ -1019,7 +1019,7 @@ Other samples * :ref:`caf_sensor_manager_sample` sample: - * Added low power configuration for the :ref:`zephyr:nrf54h20dk_nrf54h20` board target. + * Added low power configuration for the :zephyr:board:`nrf54h20dk` board target. Drivers ======= @@ -1304,7 +1304,7 @@ Google Fast Pair integration * Added: - * Instructions on how to provision the Fast Pair data onto devices without the :ref:`partition_manager` support, specifically for the :ref:`zephyr:nrf54h20dk_nrf54h20`. + * Instructions on how to provision the Fast Pair data onto devices without the :ref:`partition_manager` support, specifically for the :zephyr:board:`nrf54h20dk`. * Information on how to support the firmware update intent feature on the Android platform. Expanded the documentation for the Fast Pair devices with the FMDN extension, which requires additional steps to support this feature. diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index b20ba12c0b5b..88b0e1203a0d 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -591,7 +591,7 @@ DULT integration MCUboot ======= -The MCUboot fork in |NCS| (``sdk-mcuboot``) contains all commits from the upstream MCUboot repository up to and including ``1b2fc096d9a683a7481b13749d01ca8fa78e7afd``, with some |NCS| specific additions. +The MCUboot fork in |NCS| (``sdk-mcuboot``) contains all commits from the upstream MCUboot repository up to and including ``81315483fcbdf1f1524c2b34a1fd4de6c77cd0f4``, with some |NCS| specific additions. The code for integrating MCUboot into |NCS| is located in the :file:`ncs/nrf/modules/mcuboot` folder. @@ -604,21 +604,21 @@ Zephyr .. NOTE TO MAINTAINERS: All the Zephyr commits in the below git commands must be handled specially after each upmerge and each nRF Connect SDK release. -The Zephyr fork in |NCS| (``sdk-zephyr``) contains all commits from the upstream Zephyr repository up to and including ``fdeb7350171279d4637c536fcceaad3fbb775392``, with some |NCS| specific additions. +The Zephyr fork in |NCS| (``sdk-zephyr``) contains all commits from the upstream Zephyr repository up to and including ``9a6f116a6aa9b70b517a420247cd8d33bbbbaaa3``, with some |NCS| specific additions. For the list of upstream Zephyr commits (not including cherry-picked commits) incorporated into nRF Connect SDK since the most recent release, run the following command from the :file:`ncs/zephyr` repository (after running ``west update``): .. code-block:: none - git log --oneline fdeb735017 ^beb733919d + git log --oneline 9a6f116a6a ^fdeb735017 For the list of |NCS| specific commits, including commits cherry-picked from upstream, run: .. code-block:: none - git log --oneline manifest-rev ^fdeb735017 + git log --oneline manifest-rev ^9a6f116a6a -The current |NCS| main branch is based on revision ``fdeb735017`` of Zephyr. +The current |NCS| main branch is based on revision ``9a6f116a6a`` of Zephyr. .. note:: For possible breaking changes and changes between the latest Zephyr release and the current Zephyr version, refer to the :ref:`Zephyr release notes `. diff --git a/doc/nrf/shortcuts.txt b/doc/nrf/shortcuts.txt index 33f25bbaba7c..6686f183b2af 100644 --- a/doc/nrf/shortcuts.txt +++ b/doc/nrf/shortcuts.txt @@ -64,7 +64,7 @@ .. |Thingy91| replace:: Thingy:91 (PCA20035) - see :ref:`ug_thingy91` .. |nRF21540DK| replace:: nRF21540 DK board (PCA10112) -.. |thingy52_not_supported_note| replace:: Despite being supported in :ref:`Zephyr `, the |NCS| does not support `Nordic Thingy:52`_. +.. |thingy52_not_supported_note| replace:: Despite :zephyr:board:`thingy52` being supported in Zephyr, the |NCS| does not support `Nordic Thingy:52`_. .. ### FOTA shortcuts diff --git a/dts/common/nordic/nrf54lm20a.dtsi b/dts/common/nordic/nrf54lm20a.dtsi index d2644daa4b5d..d670b0da62e6 100644 --- a/dts/common/nordic/nrf54lm20a.dtsi +++ b/dts/common/nordic/nrf54lm20a.dtsi @@ -67,7 +67,7 @@ }; aclk: aclk { - compatible = "nordic,nrf-aclk"; + compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = ; }; diff --git a/ext/curl/Kconfig b/ext/curl/Kconfig index 340913d42630..d33179900d4d 100644 --- a/ext/curl/Kconfig +++ b/ext/curl/Kconfig @@ -10,7 +10,7 @@ config NRF_CURL_PROMPTLESS config NRF_CURL bool "Curl" if !NRF_CURL_PROMPTLESS - depends on POSIX_API && !PTHREAD_IPC && NEWLIB_LIBC + depends on POSIX_API && NEWLIB_LIBC imply NEWLIB_LIBC_FLOAT_PRINTF help Curl support for NRF. diff --git a/ext/iperf3/Kconfig b/ext/iperf3/Kconfig index e970a0dcf9bf..ea25972802e9 100644 --- a/ext/iperf3/Kconfig +++ b/ext/iperf3/Kconfig @@ -12,7 +12,7 @@ config NRF_IPERF3_PROMPTLESS config NRF_IPERF3 bool "Iperf3 NRF integration" if !NRF_IPERF3_PROMPTLESS - depends on POSIX_API && !PTHREAD_IPC && NEWLIB_LIBC && CJSON_LIB + depends on POSIX_API && NEWLIB_LIBC && CJSON_LIB help Enable Iperf3 NRF integration diff --git a/include/bluetooth/gatt_pool.h b/include/bluetooth/gatt_pool.h index b3f506f039dd..b36d28b70509 100644 --- a/include/bluetooth/gatt_pool.h +++ b/include/bluetooth/gatt_pool.h @@ -112,7 +112,7 @@ extern "C" { #define BT_GATT_POOL_CCC(_gp, _ccc, _ccc_changed, _perm) \ do { \ int _ret; \ - _ccc = (struct _bt_gatt_ccc)BT_GATT_CCC_INITIALIZER(\ + _ccc = (struct bt_gatt_ccc_managed_user_data)BT_GATT_CCC_MANAGED_USER_DATA_INIT(\ _ccc_changed, NULL, NULL); \ _ret = bt_gatt_pool_ccc_alloc(_gp, &_ccc, _perm); \ __ASSERT_NO_MSG(!_ret); \ @@ -176,7 +176,7 @@ int bt_gatt_pool_desc_alloc(struct bt_gatt_pool *gp, * @return 0 or negative error code. */ int bt_gatt_pool_ccc_alloc(struct bt_gatt_pool *gp, - struct _bt_gatt_ccc *ccc, + struct bt_gatt_ccc_managed_user_data *ccc, uint8_t perm); /** @brief Free the whole dynamically created GATT service. diff --git a/include/bluetooth/services/hids.h b/include/bluetooth/services/hids.h index 7d3de3fbbba1..bee0eda74528 100644 --- a/include/bluetooth/services/hids.h +++ b/include/bluetooth/services/hids.h @@ -191,7 +191,7 @@ typedef void (*bt_hids_rep_handler_t) (struct bt_hids_rep *rep, */ struct bt_hids_inp_rep { /** CCC descriptor. */ - struct _bt_gatt_ccc ccc; + struct bt_gatt_ccc_managed_user_data ccc; /** Report ID defined in the HIDS Report Map. */ uint8_t id; @@ -288,7 +288,7 @@ struct bt_hids_outp_feat_rep { */ struct bt_hids_boot_mouse_inp_rep { /** CCC descriptor. */ - struct _bt_gatt_ccc ccc; + struct bt_gatt_ccc_managed_user_data ccc; /** Index in the service attribute array. */ uint8_t att_ind; @@ -301,7 +301,7 @@ struct bt_hids_boot_mouse_inp_rep { */ struct bt_hids_boot_kb_inp_rep { /** CCC descriptor. */ - struct _bt_gatt_ccc ccc; + struct bt_gatt_ccc_managed_user_data ccc; /** Index in the service attribute array. */ uint8_t att_ind; diff --git a/include/dfu/dfu_target_smp.h b/include/dfu/dfu_target_smp.h index d56a797120b8..b42767274e34 100644 --- a/include/dfu/dfu_target_smp.h +++ b/include/dfu/dfu_target_smp.h @@ -16,6 +16,7 @@ #include #include +#include #include #ifdef __cplusplus diff --git a/lib/edge_impulse/ei_wrapper.cpp b/lib/edge_impulse/ei_wrapper.cpp index f62e5b461526..dc80da6285cb 100644 --- a/lib/edge_impulse/ei_wrapper.cpp +++ b/lib/edge_impulse/ei_wrapper.cpp @@ -347,7 +347,7 @@ static void edge_impulse_thread_fn(void) } if (err) { - LOG_ERR("run_classifier err=%d", err); + LOG_ERR("run_classifier err=%d", (int)err); } processing_finished(err); diff --git a/modules/openthread/CMakeLists.txt b/modules/openthread/CMakeLists.txt index e04c7d1f5199..a8c73335bce2 100644 --- a/modules/openthread/CMakeLists.txt +++ b/modules/openthread/CMakeLists.txt @@ -270,7 +270,7 @@ if(CONFIG_OPENTHREAD_SETTINGS_RAM) list(APPEND ot_libs openthread-platform-utils-static) endif() -zephyr_link_libraries(${ot_libs}) +target_link_libraries(zephyr PRIVATE ${ot_libs}) endif() diff --git a/modules/openthread/Kconfig b/modules/openthread/Kconfig index 4ff059de486e..3297a346a8f0 100644 --- a/modules/openthread/Kconfig +++ b/modules/openthread/Kconfig @@ -3,11 +3,322 @@ config OPENTHREAD bool "OpenThread Support" + imply FLASH + imply FLASH_MAP + imply MPU_ALLOW_FLASH_WRITE + select SETTINGS if FLASH + select OPENTHREAD_SETTINGS_RAM if !FLASH + select CPP + select REBOOT + select ENTROPY_GENERATOR + select NRF_802154_RADIO_DRIVER if HAS_HW_NRF_RADIO_IEEE802154 && !NET_L2_OPENTHREAD + select NRF_802154_SER_HOST if !HAS_HW_NRF_RADIO_IEEE802154 && !NET_L2_OPENTHREAD + select NRF_802154_RADIO_CONFIG if !NET_L2_OPENTHREAD help This option enables the OpenThread library if OPENTHREAD +choice OPENTHREAD_IMPLEMENTATION + prompt "OpenThread origin selection" + help + Select OpenThread stack to use for build. Custom OpenThread implementations + can be added to the application Kconfig. + +config OPENTHREAD_SOURCES + bool "OpenThread from sources" + help + Build Zephyr's OpenThread port from sources. + +endchoice + +config OPENTHREAD_MANUAL_START + bool "Start OpenThread stack manually" + help + If enabled, OpenThread stack will have to be configured and + started manually, with respective API calls or CLI/NCP commands. + Otherwise, OpenThread will configure the network parameters and try to + join the Thread network automatically during initialization (using + credentials stored in persistent storage, obtained during + commissioning or pre-commissioned with other Kconfig options, + depending on configuration used). + +menu "Logging" + +menuconfig OPENTHREAD_DEBUG + bool "OpenThread stack logging support" + help + This option enables logging support for OpenThread. + +choice OPENTHREAD_LOG_LEVEL_CHOICE + prompt "OpenThread stack log level" + depends on OPENTHREAD_DEBUG + help + This option selects log level for OpenThread stack. + +config OPENTHREAD_LOG_LEVEL_CRIT + bool "Critical" +config OPENTHREAD_LOG_LEVEL_WARN + bool "Warning" +config OPENTHREAD_LOG_LEVEL_NOTE + bool "Notice" +config OPENTHREAD_LOG_LEVEL_INFO + bool "Informational" +config OPENTHREAD_LOG_LEVEL_DEBG + bool "Debug" +endchoice # OPENTHREAD_LOG_LEVEL_CHOICE + +config OPENTHREAD_LOG_LEVEL + int + default 1 if OPENTHREAD_LOG_LEVEL_CRIT + default 2 if OPENTHREAD_LOG_LEVEL_WARN + default 3 if OPENTHREAD_LOG_LEVEL_NOTE + default 4 if OPENTHREAD_LOG_LEVEL_INFO + default 5 if OPENTHREAD_LOG_LEVEL_DEBG + default 0 + help + Log level for OpenThread stack. + +config OPENTHREAD_PLATFORM_LOG_LEVEL + int + default 1 if OPENTHREAD_LOG_LEVEL_CRIT + default 2 if OPENTHREAD_LOG_LEVEL_WARN + default 3 if OPENTHREAD_LOG_LEVEL_NOTE || OPENTHREAD_LOG_LEVEL_INFO + default 4 if OPENTHREAD_LOG_LEVEL_DEBG + default 0 + help + Log level for OpenThread Zephyr platform. + +endmenu # "Logging" + +menu "Zephyr optimizations" + +config OPENTHREAD_THREAD_PREEMPTIVE + bool "Set Openthread thread to be preemptive" + +config OPENTHREAD_THREAD_PRIORITY + int "OpenThread thread priority" + default 0 if OPENTHREAD_THREAD_PREEMPTIVE + default 8 + +config OPENTHREAD_THREAD_STACK_SIZE + int "OpenThread thread stack size" + default 6144 if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER + default 6240 if (OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER) && MPU_STACK_GUARD && FPU_SHARING && CPU_CORTEX_M + default 3168 if MPU_STACK_GUARD && FPU_SHARING && CPU_CORTEX_M + default 3072 + +config OPENTHREAD_PKT_LIST_SIZE + int "List size for IPv6 packet buffering" + default 10 + +config OPENTHREAD_RADIO_WORKQUEUE_STACK_SIZE + int "OpenThread radio transmit workqueue stack size" + default 608 if MPU_STACK_GUARD && FPU_SHARING && CPU_CORTEX_M + default 512 + +endmenu # "Zephyr optimizations" + +config OPENTHREAD_SHELL + bool "OpenThread shell" + depends on SHELL + +config MBEDTLS_PROMPTLESS + bool + default y if !CUSTOM_OPENTHREAD_SECURITY + +choice OPENTHREAD_SECURITY + prompt "OpenThread security" + default OPENTHREAD_MBEDTLS_CHOICE + +config CUSTOM_OPENTHREAD_SECURITY + bool "Custom" + help + Security settings will be controlled directly by the user. + Enabling this setting will give access to full control of mbed TLS + configuration. + +config OPENTHREAD_MBEDTLS_CHOICE + bool "mbed TLS built-in" + select OPENTHREAD_MBEDTLS + help + Use the OpenThread mbed TLS configuration pre-defined security scheme. + +endchoice + +config OPENTHREAD_MBEDTLS + bool + select MBEDTLS + select MBEDTLS_ENABLE_HEAP + select MBEDTLS_CIPHER_AES_ENABLED + select MBEDTLS_CIPHER_CCM_ENABLED + select MBEDTLS_SHA256 + select MBEDTLS_ENTROPY_C + select MBEDTLS_CMAC + select MBEDTLS_CIPHER + select MBEDTLS_MD + select MBEDTLS_TLS_VERSION_1_2 if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER + select MBEDTLS_DTLS if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER + select MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER + select MBEDTLS_ECJPAKE_C if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER + select MBEDTLS_ECP_DP_SECP256R1_ENABLED if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER || \ + OPENTHREAD_SRP_CLIENT || OPENTHREAD_SRP_SERVER + select MBEDTLS_ECP_NIST_OPTIM if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER + select MBEDTLS_CTR_DRBG_ENABLED if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER + select MBEDTLS_HMAC_DRBG_ENABLED if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER || \ + OPENTHREAD_SRP_CLIENT || OPENTHREAD_SRP_SERVER + select MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED if OPENTHREAD_ECDSA + select MBEDTLS_ECDH_C if OPENTHREAD_ECDSA + select MBEDTLS_ECDSA_C if OPENTHREAD_ECDSA + select MBEDTLS_ECDSA_DETERMINISTIC if OPENTHREAD_ECDSA + select MBEDTLS_PK_WRITE_C if OPENTHREAD_ECDSA + select MBEDTLS_ECP_C if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER || OPENTHREAD_ECDSA + +config OPENTHREAD_MBEDTLS_LIB_NAME + string "mbedtls lib name" + default "mbedTLS" + help + This option allows to specify one or more mbedtls library files to be + linked with OpenThread. Separate multiple values with space " ". + +config OPENTHREAD_COPROCESSOR + bool "OpenThread Co-Processor" + select OPENTHREAD_MANUAL_START + select RING_BUFFER + select UART_INTERRUPT_DRIVEN + help + Enable Co-Processor in OpenThread stack. + +if OPENTHREAD_COPROCESSOR + +choice OPENTHREAD_COPROCESSOR_CHOICE + prompt "OpenThread Co-Processor type" + help + This option selects Thread network co-processor type + +config OPENTHREAD_COPROCESSOR_NCP + bool "NCP - Network Co-Processor" +config OPENTHREAD_COPROCESSOR_RCP + bool "RCP - Radio Co-Processor" +endchoice # OPENTHREAD_COPROCESSOR_CHOICE + +config OPENTHREAD_COPROCESSOR_UART_RING_BUFFER_SIZE + int "Set Co-Processor UART ring buffer size" + default 4096 + help + TX buffer size for the OpenThread Co-Processor UART. + +config OPENTHREAD_COPROCESSOR_VENDOR_HOOK_SOURCE + string "Path to vendor hook source file" + help + Provides path to compile vendor hook file. + +endif # OPENTHREAD_COPROCESSOR + +config OPENTHREAD_PLATFORM_INFO + string "Platform information for OpenThread" + default "ZEPHYR" + help + Platform information for OpenThread + +config OPENTHREAD_CUSTOM_PARAMETERS + string "Custom Parameters to pass to OpenThread build system" + default "" + help + This option is intended for advanced users only. + Pass additional parameters that do not have corresponding Kconfig + options to the OpenThread build system. Separate multiple values with + space " ", for example: + "OPENTHREAD_CONFIG_JOINER_ENABLE=1 OPENTHREAD_CONFIG_JOINER_MAX_CANDIDATES=3" + +config OPENTHREAD_NUM_MESSAGE_BUFFERS + int "The number of message buffers in the buffer pool" + default 128 + help + "The number of message buffers in the buffer pool." + +config OPENTHREAD_MESSAGE_BUFFER_SIZE + int "The size of a message buffer in bytes" + default 128 + help + "The size of a message buffer in bytes" + +config OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT + bool "Use platform message management" + help + The message pool is managed by platform defined logic. + +config OPENTHREAD_MAX_STATECHANGE_HANDLERS + int "The maximum number of state-changed callback handlers" + default 2 + help + The maximum number of state-changed callback handlers + set using otSetStateChangedCallback. + +config OPENTHREAD_TMF_ADDRESS_CACHE_ENTRIES + int "The number of EID-to-RLOC cache entries" + default 20 + help + The number of EID-to-RLOC cache entries. + +config OPENTHREAD_TMF_ADDRESS_CACHE_MAX_SNOOP_ENTRIES + int "The maximum number of EID-to-RLOC cache entries" + default 2 + help + The maximum number of EID-to-RLOC cache entries that can be used for + "snoop optimization" where an entry is created by inspecting a received + message. + +config OPENTHREAD_LOG_PREPEND_LEVEL_ENABLE + bool "Prepending the log level to all OpenThread log messages" + help + When enabled the OpenThread logs will be prepended with the appropriate + log level prefix i.e. [CRIT], [WARN], [NOTE], [INFO], [DEBG]. + +config OPENTHREAD_MAC_SOFTWARE_ACK_TIMEOUT_ENABLE + bool "Software ACK timeout logic" + default y + help + Set y if the radio supports AckTime event + +config OPENTHREAD_MAC_SOFTWARE_RETRANSMIT_ENABLE + bool "Software retransmission logic" + default y + help + Set y if the radio supports tx retry logic with collision avoidance (CSMA) + +config OPENTHREAD_MAC_SOFTWARE_CSMA_BACKOFF_ENABLE + bool "Software CSMA backoff logic" + default y + help + Set y to enable software CSMA backoff. The option can be disabled if + the radio has hardware support for this feature (IEEE802154_HW_CSMA). + +config OPENTHREAD_CRYPTO_PSA + bool "ARM PSA crypto API" + depends on MBEDTLS_PSA_CRYPTO_CLIENT + select OPENTHREAD_PLATFORM_KEY_REF if !OPENTHREAD_COPROCESSOR_RCP + imply OPENTHREAD_PLATFORM_KEYS_EXPORTABLE_ENABLE + help + Enable crypto backend library implementation based on ARM PSA crypto + API instead of the default, using mbedTLS. + +config OPENTHREAD_PLATFORM_KEYS_EXPORTABLE_ENABLE + bool "Make MAC keys exportable" + depends on OPENTHREAD_PLATFORM_KEY_REF + help + Enable the creation of exportable MAC keys in the OpenThread Key Manager. + +config OPENTHREAD_INTERFACE_EARLY_UP + bool "Make OpenThread interface ready as soon as Thread is enabled" + help + When enabled, OpenThread interface will be marked ready (operational + UP) as soon as Thread has been enabled. This means the interface will + be ready to transmit application packets during the Mesh Link + Establishment phase. + Otherwise, OpenThread interface will be marked operational UP only + after the device joins a Thread network. + menu "OpenThread stack features" rsource "Kconfig.features" endmenu diff --git a/modules/openthread/platform/logging.c b/modules/openthread/platform/logging.c index 8adf98de053c..110bd2ecf544 100644 --- a/modules/openthread/platform/logging.c +++ b/modules/openthread/platform/logging.c @@ -18,6 +18,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #include "platform-zephyr.h" +#if defined(CONFIG_LOG) /* Convert OT log level to zephyr log level. */ static inline int log_translate(otLogLevel aLogLevel) { @@ -38,6 +39,7 @@ static inline int log_translate(otLogLevel aLogLevel) return -1; } +#endif void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aFormat, ...) { diff --git a/modules/openthread/platform/radio.c b/modules/openthread/platform/radio.c index d778d7b7ee13..80673f65e64e 100644 --- a/modules/openthread/platform/radio.c +++ b/modules/openthread/platform/radio.c @@ -158,11 +158,6 @@ static void reset_pending_event(enum pending_events event) atomic_clear_bit(pending_events, event); } -static inline void clear_pending_events(void) -{ - atomic_clear(pending_events); -} - void energy_detected(const struct device *dev, int16_t max_ed) { if (dev == radio_dev) { diff --git a/modules/wfa-qt/Kconfig b/modules/wfa-qt/Kconfig index d81d23753626..2f0f5ce4886b 100644 --- a/modules/wfa-qt/Kconfig +++ b/modules/wfa-qt/Kconfig @@ -12,8 +12,8 @@ source "subsys/logging/Kconfig.template.log_config" config WFA_QT_CONTROL_APP # Need full POSIX from libc, Zephyr's POSIX support is only partial select POSIX_API - select PTHREAD_IPC - select POSIX_SIGNAL + select POSIX_THREADS + select POSIX_SIGNALS bool "WFA Quicktrack control app" config WFA_QT_THREAD_STACK_SIZE diff --git a/samples/bluetooth/fast_pair/locator_tag/README.rst b/samples/bluetooth/fast_pair/locator_tag/README.rst index c4a2348e67c0..9383521f8c28 100644 --- a/samples/bluetooth/fast_pair/locator_tag/README.rst +++ b/samples/bluetooth/fast_pair/locator_tag/README.rst @@ -25,7 +25,7 @@ The sample supports the following development kits: .. table-from-sample-yaml:: .. note:: - In case of the :ref:`zephyr:nrf54h20dk_nrf54h20` board target, the application still has high power consumption as the Bluetooth LE controller running on the radio core requires disabling MRAM latency (:kconfig:option:`CONFIG_MRAM_LATENCY_AUTO_REQ`). + In case of the :zephyr:board:`nrf54h20dk` board target, the application still has high power consumption as the Bluetooth LE controller running on the radio core requires disabling MRAM latency (:kconfig:option:`CONFIG_MRAM_LATENCY_AUTO_REQ`). Enabling MRAM latency makes the Bluetooth LE controller unstable. Overview diff --git a/samples/bluetooth/iso_combined_bis_and_cis/src/iso_rx.c b/samples/bluetooth/iso_combined_bis_and_cis/src/iso_rx.c index d44e2b791fe4..8b25fededbb3 100644 --- a/samples/bluetooth/iso_combined_bis_and_cis/src/iso_rx.c +++ b/samples/bluetooth/iso_combined_bis_and_cis/src/iso_rx.c @@ -75,6 +75,11 @@ static void iso_recv(struct bt_iso_chan *chan, const struct bt_iso_recv_info *in static void iso_connected(struct bt_iso_chan *chan) { + const struct bt_iso_chan_path hci_path = { + .pid = BT_ISO_DATA_PATH_HCI, + .format = BT_HCI_CODING_FORMAT_TRANSPARENT, + }; + int err; struct bt_conn_info conn_info; struct bt_iso_info iso_info; @@ -92,6 +97,11 @@ static void iso_connected(struct bt_iso_chan *chan) } LOG_INF("ISO RX Channel connected"); + + err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path); + if (err != 0) { + LOG_ERR("Failed to setup ISO RX data path: %d", err); + } } static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason) diff --git a/samples/bluetooth/iso_combined_bis_and_cis/src/iso_tx.c b/samples/bluetooth/iso_combined_bis_and_cis/src/iso_tx.c index 7f4526edddf0..d277b87643ae 100644 --- a/samples/bluetooth/iso_combined_bis_and_cis/src/iso_tx.c +++ b/samples/bluetooth/iso_combined_bis_and_cis/src/iso_tx.c @@ -91,6 +91,11 @@ static void send_next_sdu_on_a_channel(void) static void iso_connected(struct bt_iso_chan *chan) { + const struct bt_iso_chan_path hci_path = { + .pid = BT_ISO_DATA_PATH_HCI, + .format = BT_HCI_CODING_FORMAT_TRANSPARENT, + }; + int err; struct bt_conn_info conn_info; uint8_t chan_index = ARRAY_INDEX(iso_channels, chan); @@ -113,6 +118,11 @@ static void iso_connected(struct bt_iso_chan *chan) */ send_next_sdu_on_a_channel(); LOG_INF("ISO TX Channel connected"); + + err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path); + if (err != 0) { + LOG_ERR("Failed to setup ISO TX data path: %d", err); + } } static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason) diff --git a/samples/bluetooth/iso_time_sync/src/iso_rx.c b/samples/bluetooth/iso_time_sync/src/iso_rx.c index 3cbd61ca9963..a9552f43dc8f 100644 --- a/samples/bluetooth/iso_time_sync/src/iso_rx.c +++ b/samples/bluetooth/iso_time_sync/src/iso_rx.c @@ -93,6 +93,11 @@ static void iso_recv(struct bt_iso_chan *chan, const struct bt_iso_recv_info *in static void iso_connected(struct bt_iso_chan *chan) { + const struct bt_iso_chan_path hci_path = { + .pid = BT_ISO_DATA_PATH_HCI, + .format = BT_HCI_CODING_FORMAT_TRANSPARENT, + }; + int err; struct bt_conn_info conn_info; struct bt_iso_info iso_info; @@ -111,6 +116,11 @@ static void iso_connected(struct bt_iso_chan *chan) printk("ISO Channel connected: "); iso_chan_info_print(&iso_info, conn_info.role); + + err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path); + if (err != 0) { + printk("Failed to setup ISO RX data path: %d\n", err); + } } static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason) diff --git a/samples/bluetooth/iso_time_sync/src/iso_tx.c b/samples/bluetooth/iso_time_sync/src/iso_tx.c index 6c62fb064d18..600ad72598cd 100644 --- a/samples/bluetooth/iso_time_sync/src/iso_tx.c +++ b/samples/bluetooth/iso_time_sync/src/iso_tx.c @@ -83,7 +83,7 @@ static struct bt_iso_info iso_infos[CONFIG_BT_ISO_MAX_CHAN]; void iso_chan_info_print(struct bt_iso_info *info, uint8_t role) { - if (info->type == BT_ISO_CHAN_TYPE_CONNECTED) { + if (info->type == BT_ISO_CHAN_TYPE_CENTRAL || info->type == BT_ISO_CHAN_TYPE_PERIPHERAL) { uint8_t bn; uint32_t flush_timeout; uint32_t transport_latency_us; @@ -225,6 +225,11 @@ static void send_next_sdu_on_all_channels(void) static void iso_connected(struct bt_iso_chan *chan) { + const struct bt_iso_chan_path hci_path = { + .pid = BT_ISO_DATA_PATH_HCI, + .format = BT_HCI_CODING_FORMAT_TRANSPARENT, + }; + int err; struct bt_conn_info conn_info; uint8_t chan_index = ARRAY_INDEX(iso_channels, chan); @@ -246,6 +251,11 @@ static void iso_connected(struct bt_iso_chan *chan) printk("ISO channel index %d connected: ", chan_index); iso_chan_info_print(&iso_infos[chan_index], roles[chan_index]); + err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path); + if (err != 0) { + printk("Failed to setup ISO TX data path: %d\n", err); + } + if (iso_chan_connected_cb) { iso_chan_connected_cb(); } @@ -302,7 +312,8 @@ static uint32_t trigger_time_us_get(uint32_t sdu_sync_ref, uint8_t chan_index) * See Bluetooth Core Specification, Vol 6, Part G, Section 3.2. */ - if (iso_infos[chan_index].type == BT_ISO_CHAN_TYPE_CONNECTED) { + if (iso_infos[chan_index].type == BT_ISO_CHAN_TYPE_CENTRAL || + iso_infos[chan_index].type == BT_ISO_CHAN_TYPE_PERIPHERAL) { if (roles[chan_index] == BT_CONN_ROLE_CENTRAL) { trigger_time_us += iso_infos[chan_index].unicast.central.latency; } diff --git a/samples/bluetooth/mesh/dfu/target/README.rst b/samples/bluetooth/mesh/dfu/target/README.rst index 153c9ecc98a1..d55999f31c83 100644 --- a/samples/bluetooth/mesh/dfu/target/README.rst +++ b/samples/bluetooth/mesh/dfu/target/README.rst @@ -180,7 +180,7 @@ In this sample, the device flash is split into partitions using the :ref:`partit When the DFU transfer starts, the sample stores the new firmware at the MCUboot secondary slot using the :ref:`zephyr:flash_map_api`. .. note:: - For the :ref:`zephyr:nrf52840dongle_nrf52840`, the sample has a static partition management file :file:`pm_static_nrf52840dongle_nrf52840.yml` to reserve the space for the `nRF5 SDK Bootloader`_. + For the :zephyr:board:`nrf52840dongle`, the sample has a static partition management file :file:`pm_static_nrf52840dongle_nrf52840.yml` to reserve the space for the `nRF5 SDK Bootloader`_. When the DFU transfer ends, the sample requests the MCUboot to replace slot-0 with slot-1 and reboots the device. The MCUboot performs the validation of the image located at slot-1. @@ -200,7 +200,7 @@ Logging In this sample, UART and SEGGER RTT are available as logging backends. .. note:: - With the :ref:`zephyr:nrf52840dongle_nrf52840`, only logging over UART is available. + With the :zephyr:board:`nrf52840dongle`, only logging over UART is available. Dependencies ************ diff --git a/samples/bluetooth/mesh/light/README.rst b/samples/bluetooth/mesh/light/README.rst index 85eeaafcf4ed..261e879e8bde 100644 --- a/samples/bluetooth/mesh/light/README.rst +++ b/samples/bluetooth/mesh/light/README.rst @@ -49,8 +49,8 @@ Take the flash size into consideration when using DFU over Bluetooth LE on other For example, both nRF52832 and nRF52833 have limited flash size. .. note:: - Point-to-point DFU over Bluetooth Low Energy for :ref:`zephyr:thingy53_nrf5340` is supported by default. - See :ref:`thingy53_app_update` for more information about updating firmware image on :ref:`zephyr:thingy53_nrf5340`. + Point-to-point DFU over Bluetooth Low Energy for :zephyr:board:`thingy53` is supported by default. + See :ref:`thingy53_app_update` for more information about updating firmware image on :zephyr:board:`thingy53`. The DFU feature also requires a smartphone with Nordic Semiconductor's nRF Device Manager mobile app installed in one of the following versions: @@ -93,8 +93,8 @@ The following table shows the mesh light composition data for this sample: ================= ================= ================= ================= .. note:: - When used with :ref:`zephyr:thingy53_nrf5340`, Element 4 is not available. - :ref:`zephyr:thingy53_nrf5340` supports only one RGB LED, and treats each RGB LED channel as a separate LED. + When used with :zephyr:board:`thingy53`, Element 4 is not available. + :zephyr:board:`thingy53` supports only one RGB LED, and treats each RGB LED channel as a separate LED. The models are used for the following purposes: diff --git a/samples/bluetooth/mesh/light_ctrl/README.rst b/samples/bluetooth/mesh/light_ctrl/README.rst index 91196b51eabd..54a8980a3bb3 100644 --- a/samples/bluetooth/mesh/light_ctrl/README.rst +++ b/samples/bluetooth/mesh/light_ctrl/README.rst @@ -144,11 +144,11 @@ User interface If the :ref:`emds_readme` feature is enabled and **Button 4** is pressed **LEDs 2** to **LED 4** will light up to show that the board is halted. .. note:: - :ref:`zephyr:thingy53_nrf5340` supports only one RGB LED. + :zephyr:board:`thingy53` supports only one RGB LED. Each RGB LED channel is used as separate LED. .. note:: - :ref:`zephyr:thingy53_nrf5340` and the :ref:`zephyr:nrf52840dongle_nrf52840` do not support emergency data storage. + :zephyr:board:`thingy53` and the :zephyr:board:`nrf52840dongle` do not support emergency data storage. .. group-tab:: nRF54 DKs diff --git a/samples/bluetooth/mesh/light_dimmer/README.rst b/samples/bluetooth/mesh/light_dimmer/README.rst index 2acab3b3874d..08361fb23834 100644 --- a/samples/bluetooth/mesh/light_dimmer/README.rst +++ b/samples/bluetooth/mesh/light_dimmer/README.rst @@ -59,7 +59,7 @@ This mobile application is also used to configure key bindings, and publication After provisioning and configuring the mesh models supported by the sample in the `nRF Mesh mobile app`_, **Button 1** on the Mesh Light Dimmer device can be used to control the configured network nodes' LEDs, while **Button 2** can be used to store and restore scenes on the network nodes. .. note:: - When running this sample on the :ref:`zephyr:nrf52840dongle_nrf52840`, the scene selection functionality will not be available as the device only has one button. + When running this sample on the :zephyr:board:`nrf52840dongle`, the scene selection functionality will not be available as the device only has one button. The single button of the dongle will be used for dimming and the on/off functionality as described for **Button 1** in this documentation. .. group-tab:: nRF54 DKs @@ -67,7 +67,7 @@ This mobile application is also used to configure key bindings, and publication After provisioning and configuring the mesh models supported by the sample in the `nRF Mesh mobile app`_, **Button 0** on the Mesh Light Dimmer device can be used to control the configured network nodes' LEDs, while **Button 1** can be used to store and restore scenes on the network nodes. .. note:: - When running this sample on the :ref:`zephyr:nrf52840dongle_nrf52840`, the scene selection functionality will not be available as the device only has one button. + When running this sample on the :zephyr:board:`nrf52840dongle`, the scene selection functionality will not be available as the device only has one button. The single button of the dongle will be used for dimming and the on/off functionality as described for **Button 0** in this documentation. Provisioning @@ -135,7 +135,7 @@ User interface On long press and release, **Button 2** will publish a Scene Store message using the configured publication parameters of its model instance, and store the current LED state of all the targets under the scene with the most recently recalled scene number. .. note:: - On the :ref:`zephyr:nrf52840dongle_nrf52840`, the scene selection functionality will not be available as the device only has one button. + On the :zephyr:board:`nrf52840dongle`, the scene selection functionality will not be available as the device only has one button. .. tip:: On Thingy:53, **Button 2** can be accessed by removing the top part of the casing. @@ -144,7 +144,7 @@ User interface Show the OOB authentication value during provisioning if the "Push button" OOB method is used. .. note:: - :ref:`zephyr:thingy53_nrf5340` supports only one RGB LED. + :zephyr:board:`thingy53` supports only one RGB LED. Each RGB LED channel is used as separate LED. .. group-tab:: nRF54 DKs diff --git a/samples/bluetooth/mesh/light_switch/README.rst b/samples/bluetooth/mesh/light_switch/README.rst index f3135486747b..6dfc558425da 100644 --- a/samples/bluetooth/mesh/light_switch/README.rst +++ b/samples/bluetooth/mesh/light_switch/README.rst @@ -91,8 +91,8 @@ The following table shows the mesh light switch composition data for this sample ================= ================= ================= ================= .. note:: - When used with :ref:`zephyr:thingy53_nrf5340`, Elements 3 and 4 are not available. - :ref:`zephyr:thingy53_nrf5340` supports only two buttons. + When used with :zephyr:board:`thingy53`, Elements 3 and 4 are not available. + :zephyr:board:`thingy53` supports only two buttons. The models are used for the following purposes: @@ -192,7 +192,7 @@ LEDs: Once the provisioning and configuration are completed, the LEDs are used to reflect the status of actions, and they show the last known OnOff state of the corresponding button. .. note:: - :ref:`zephyr:thingy53_nrf5340` supports only one RGB LED. + :zephyr:board:`thingy53` supports only one RGB LED. Each RGB LED channel is used as separate LED. The LPN assignments diff --git a/samples/bluetooth/nrf_auraconfig/src/nrf_auraconfig.c b/samples/bluetooth/nrf_auraconfig/src/nrf_auraconfig.c index 7a3aa370fc35..a25fd416d011 100644 --- a/samples/bluetooth/nrf_auraconfig/src/nrf_auraconfig.c +++ b/samples/bluetooth/nrf_auraconfig/src/nrf_auraconfig.c @@ -29,6 +29,9 @@ #include LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL); +static struct zbus_observer_node zbus_obs_node_mgmt; +static struct zbus_observer_node zbus_obs_node_audio; + ZBUS_CHAN_DECLARE(bt_mgmt_chan); ZBUS_CHAN_DECLARE(sdu_ref_chan); ZBUS_CHAN_DECLARE(le_audio_chan); @@ -461,13 +464,15 @@ static int zbus_link_producers_observers(void) return -ENOTSUP; } - ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add bt_mgmt listener"); return ret; } - ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS); + ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio, + ZBUS_ADD_OBS_TIMEOUT_MS); if (ret) { LOG_ERR("Failed to add le_audio sub"); return ret; diff --git a/samples/bluetooth/peripheral_lbs/prj_minimal.conf b/samples/bluetooth/peripheral_lbs/prj_minimal.conf index c7580d4df29f..8e64445f7962 100644 --- a/samples/bluetooth/peripheral_lbs/prj_minimal.conf +++ b/samples/bluetooth/peripheral_lbs/prj_minimal.conf @@ -107,5 +107,6 @@ CONFIG_BT_BUF_EVT_RX_COUNT=2 CONFIG_BT_CONN_TX_MAX=3 CONFIG_BT_L2CAP_TX_BUF_COUNT=2 CONFIG_BT_ATT_TX_COUNT=2 +CONFIG_BT_BUF_EVT_RX_COUNT=4 CONFIG_BT_BUF_ACL_TX_COUNT=3 CONFIG_BT_BUF_ACL_TX_SIZE=27 diff --git a/samples/bluetooth/peripheral_uart/README.rst b/samples/bluetooth/peripheral_uart/README.rst index 5a298312fdbb..9f07196ac4e3 100644 --- a/samples/bluetooth/peripheral_uart/README.rst +++ b/samples/bluetooth/peripheral_uart/README.rst @@ -21,9 +21,9 @@ The sample supports the following development kits: .. note:: * The boards ``nrf52dk/nrf52810``, ``nrf52840dk/nrf52811``, and ``nrf52833dk/nrf52820`` only support the `Minimal sample variant`_. - * When used with :ref:`zephyr:thingy53_nrf5340`, the sample supports the MCUboot bootloader with serial recovery and SMP DFU over Bluetooth. + * When used with :zephyr:board:`thingy53`, the sample supports the MCUboot bootloader with serial recovery and SMP DFU over Bluetooth. Thingy:53 has no built-in SEGGER chip, so the UART 0 peripheral is not gated to a USB CDC virtual serial port. - * When used with :ref:`zephyr:nrf5340dk_nrf5340`, the sample might support the MCUboot bootloader with serial recovery of the networking core image. + * When used with :zephyr:board:`nrf5340dk`, the sample might support the MCUboot bootloader with serial recovery of the networking core image. The sample also requires using a compatible application for `Testing`_. You can use the `Bluetooth Low Energy app`_ for desktop or the `nRF Connect for Mobile`_ (or other similar applications, such as `nRF Blinky`_ or `nRF Toolbox`_). diff --git a/samples/bluetooth/throughput/prj.conf b/samples/bluetooth/throughput/prj.conf index b31021e1bf34..fec67f3a6fa9 100644 --- a/samples/bluetooth/throughput/prj.conf +++ b/samples/bluetooth/throughput/prj.conf @@ -35,6 +35,7 @@ CONFIG_BT_ATT_TX_COUNT=10 CONFIG_BT_L2CAP_TX_MTU=498 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_BT_CONN_TX_MAX=10 +CONFIG_BT_BUF_EVT_RX_COUNT=11 CONFIG_BT_BUF_ACL_TX_COUNT=10 CONFIG_BT_BUF_ACL_TX_SIZE=502 diff --git a/samples/cellular/at_client/prj.conf b/samples/cellular/at_client/prj.conf index cff74317d9d5..36656414bfa0 100644 --- a/samples/cellular/at_client/prj.conf +++ b/samples/cellular/at_client/prj.conf @@ -24,5 +24,3 @@ CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_MAIN_STACK_SIZE=3072 CONFIG_HEAP_MEM_POOL_SIZE=16384 CONFIG_AT_MONITOR_HEAP_SIZE=512 - -CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n diff --git a/samples/cellular/modem_shell/boards/thingy91x_nrf9151_ns.conf b/samples/cellular/modem_shell/boards/thingy91x_nrf9151_ns.conf index b71baefe0809..c8844553121e 100644 --- a/samples/cellular/modem_shell/boards/thingy91x_nrf9151_ns.conf +++ b/samples/cellular/modem_shell/boards/thingy91x_nrf9151_ns.conf @@ -14,6 +14,3 @@ CONFIG_IMG_MANAGER=y CONFIG_STREAM_FLASH=y CONFIG_MCUBOOT_IMG_MANAGER=y CONFIG_IMG_ERASE_PROGRESSIVELY=y - -# Hopefully a temporary UART config to fix jam in the boot -CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n diff --git a/samples/cellular/modem_shell/overlay-ppp.conf b/samples/cellular/modem_shell/overlay-ppp.conf index a292d7adb9e1..c0fcfe7ffe0c 100644 --- a/samples/cellular/modem_shell/overlay-ppp.conf +++ b/samples/cellular/modem_shell/overlay-ppp.conf @@ -38,7 +38,6 @@ CONFIG_NET_CONFIG_AUTO_INIT=y CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_PACKET=y -CONFIG_NET_SOCKETS_PACKET_DGRAM=n CONFIG_NET_IF_MAX_IPV4_COUNT=2 CONFIG_NET_IF_MAX_IPV6_COUNT=2 diff --git a/samples/cellular/modem_shell/prj.conf b/samples/cellular/modem_shell/prj.conf index 777fc3138ac6..404c99c79ef3 100644 --- a/samples/cellular/modem_shell/prj.conf +++ b/samples/cellular/modem_shell/prj.conf @@ -73,7 +73,6 @@ CONFIG_NET_IPV4=y CONFIG_NET_IPV6=y CONFIG_POSIX_API=y -CONFIG_PTHREAD_IPC=n # There are issues with posix api if this is set CONFIG_ZVFS_OPEN_MAX=10 # Need to be the same as MAX_FDS CONFIG_NET_SOCKETS_POLL_MAX=10 diff --git a/samples/cellular/modem_shell/src/location/location_shell.c b/samples/cellular/modem_shell/src/location/location_shell.c index 32c27dd53e9c..7187dffd814c 100644 --- a/samples/cellular/modem_shell/src/location/location_shell.c +++ b/samples/cellular/modem_shell/src/location/location_shell.c @@ -9,7 +9,7 @@ #include #include -#ifdef CONFIG_GETOPT +#ifdef CONFIG_POSIX_C_LIB_EXT #include #endif #include diff --git a/samples/cellular/modem_shell/src/ping/icmp_ping_shell.c b/samples/cellular/modem_shell/src/ping/icmp_ping_shell.c index 9bcd55a10855..66b34bf096a9 100644 --- a/samples/cellular/modem_shell/src/ping/icmp_ping_shell.c +++ b/samples/cellular/modem_shell/src/ping/icmp_ping_shell.c @@ -8,7 +8,7 @@ #include #include -#ifdef CONFIG_GETOPT +#ifdef CONFIG_POSIX_C_LIB_EXT #include #endif #include diff --git a/samples/cellular/modem_shell/src/ppp/ppp_ctrl.c b/samples/cellular/modem_shell/src/ppp/ppp_ctrl.c index a5b663e08fdb..e7bc0d231268 100644 --- a/samples/cellular/modem_shell/src/ppp/ppp_ctrl.c +++ b/samples/cellular/modem_shell/src/ppp/ppp_ctrl.c @@ -377,9 +377,9 @@ static int ppp_ctrl_zephyr_sckt_create(void) return 0; } - /* Create raw Zephyr socket for passing data to/from ppp link: */ - ppp_data_socket_fd = socket(AF_PACKET, SOCK_RAW | SOCK_NATIVE, - htons(IPPROTO_RAW)); + /* Create Zephyr packet socket for passing data to/from ppp link: */ + ppp_data_socket_fd = socket(AF_PACKET, SOCK_DGRAM | SOCK_NATIVE, + htons(ETH_P_ALL)); if (ppp_data_socket_fd < 0) { mosh_error("PPP Zephyr data socket creation failed: (%d)\n", -errno); goto return_error; @@ -392,6 +392,7 @@ static int ppp_ctrl_zephyr_sckt_create(void) dst.sll_ifindex = net_if_get_by_iface(ppp_iface_global); dst.sll_family = AF_PACKET; + dst.sll_protocol = htons(ETH_P_ALL); ret = bind(ppp_data_socket_fd, (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll)); diff --git a/samples/cellular/modem_shell/src/ppp/ppp_mdm_data_rcv.c b/samples/cellular/modem_shell/src/ppp/ppp_mdm_data_rcv.c index f892813608ac..708793426cfc 100644 --- a/samples/cellular/modem_shell/src/ppp/ppp_mdm_data_rcv.c +++ b/samples/cellular/modem_shell/src/ppp/ppp_mdm_data_rcv.c @@ -10,6 +10,7 @@ #include +#include #include #include @@ -68,6 +69,17 @@ static void ppp_modem_dl_data_thread_handler(void) recv_data_len = recv(ppp_modem_data_socket_fd, receive_buffer, used_mtu_mru, 0); if (recv_data_len > 0) { + uint8_t type = receive_buffer[0] & 0xf0; + + if (type == 0x60) { + dst.sll_protocol = htons(ETH_P_IPV6); + } else if (type == 0x40) { + dst.sll_protocol = htons(ETH_P_IP); + } else { + /* Not IP traffic, ignore. */ + continue; + } + ret = sendto(ppp_data_socket_fd, receive_buffer, recv_data_len, 0, (const struct sockaddr *)&dst, sizeof(struct sockaddr_ll)); diff --git a/samples/cellular/modem_shell/src/rest/rest_shell.c b/samples/cellular/modem_shell/src/rest/rest_shell.c index 9fb1c8fed559..c727bf1185d4 100644 --- a/samples/cellular/modem_shell/src/rest/rest_shell.c +++ b/samples/cellular/modem_shell/src/rest/rest_shell.c @@ -9,7 +9,7 @@ #include #include -#ifdef CONFIG_GETOPT +#ifdef CONFIG_POSIX_C_LIB_EXT #include #endif #include diff --git a/samples/cellular/modem_shell/src/sms/sms_shell.c b/samples/cellular/modem_shell/src/sms/sms_shell.c index 5791b844193d..e26ca9d88f33 100644 --- a/samples/cellular/modem_shell/src/sms/sms_shell.c +++ b/samples/cellular/modem_shell/src/sms/sms_shell.c @@ -8,7 +8,7 @@ #include #include #include -#ifdef CONFIG_GETOPT +#ifdef CONFIG_POSIX_C_LIB_EXT #include #endif #include diff --git a/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf index 38109d9644ce..229be81f5322 100644 --- a/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf +++ b/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf @@ -5,7 +5,7 @@ # # General -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_HW_STACK_PROTECTION=y CONFIG_HW_ID_LIBRARY=y CONFIG_HW_ID_LIBRARY_SOURCE_NET_MAC=y diff --git a/samples/ipc/ipc_service/README.rst b/samples/ipc/ipc_service/README.rst index 33736ec75d8a..28ddb56c5023 100644 --- a/samples/ipc/ipc_service/README.rst +++ b/samples/ipc/ipc_service/README.rst @@ -15,12 +15,12 @@ Overview The sample application tests throughput of the IPC service with available backends. Currently, the sample supports the following backends: -* :ref:`zephyr:nrf5340dk_nrf5340` board: +* :zephyr:board:`nrf5340dk` board: * `OpenAMP`_ library * :ref:`zephyr:ipc_service_backend_icmsg` -* :ref:`zephyr:nrf54h20dk_nrf54h20` board: +* :zephyr:board:`nrf54h20dk` board: * :ref:`zephyr:ipc_service_backend_icbmsg` diff --git a/samples/net/aws_iot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/net/aws_iot/boards/nrf54l15dk_nrf54l15_cpuapp.conf index dbc5dc262d8a..75f4b9a885cb 100644 --- a/samples/net/aws_iot/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/net/aws_iot/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -56,7 +56,7 @@ CONFIG_MQTT_HELPER_PROVISION_CERTIFICATES=y # Kernel options CONFIG_POSIX_NETWORKING=y -CONFIG_POSIX_MAX_FDS=21 +CONFIG_ZVFS_OPEN_MAX=21 # Shell CONFIG_SHELL=y 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 6f8a7880c27f..ca36102659d7 100644 --- a/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -9,7 +9,7 @@ # set here will take precedence if they are present in both files. # General -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_HEAP_MEM_POOL_SIZE=40144 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000 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 762c0cf3b757..35b96402d8e0 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 @@ -5,7 +5,7 @@ # # General -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_HW_ID_LIBRARY=y CONFIG_HW_ID_LIBRARY_SOURCE_NET_MAC=y CONFIG_DK_LIBRARY=y diff --git a/samples/net/coap_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/net/coap_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf index c38ad1a06e48..131d2de445d6 100644 --- a/samples/net/coap_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/net/coap_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -57,7 +57,7 @@ CONFIG_NRF70_MAX_TX_AGGREGATION=1 # Kernel options CONFIG_POSIX_NETWORKING=y -CONFIG_POSIX_MAX_FDS=21 +CONFIG_ZVFS_OPEN_MAX=21 # Shell CONFIG_SHELL=y 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 dceb3fc3fddc..8a6f64cd50be 100644 --- a/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -9,7 +9,7 @@ # set here will take precedence if they are present in both files. # General -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_LOG_BUFFER_SIZE=4096 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_MAIN_STACK_SIZE=6144 diff --git a/samples/net/download/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/net/download/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 5940186d69da..c24fde07854d 100644 --- a/samples/net/download/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/net/download/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -57,7 +57,7 @@ CONFIG_NRF70_MAX_TX_AGGREGATION=1 # Kernel options CONFIG_POSIX_NETWORKING=y -CONFIG_POSIX_MAX_FDS=21 +CONFIG_ZVFS_OPEN_MAX=21 # Shell CONFIG_SHELL=y diff --git a/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index bf5ec2b037ce..993079dedec0 100644 --- a/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -7,7 +7,7 @@ # General CONFIG_LOG=y CONFIG_LOG_MODE_IMMEDIATE=y -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_HEAP_MEM_POOL_SIZE=40144 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000 diff --git a/samples/net/http_server/boards/native_sim.conf b/samples/net/http_server/boards/native_sim.conf index 87df9e6695da..da26607a8f19 100644 --- a/samples/net/http_server/boards/native_sim.conf +++ b/samples/net/http_server/boards/native_sim.conf @@ -14,4 +14,4 @@ CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1" CONFIG_NET_HOSTNAME_ENABLE=y CONFIG_NET_HOSTNAME_UNIQUE=n CONFIG_NET_HOSTNAME="httpserver" -CONFIG_POSIX_UNAME=n +CONFIG_POSIX_SINGLE_PROCESS=n diff --git a/samples/net/http_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/net/http_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 61bf36dfa918..27fafe0a620c 100644 --- a/samples/net/http_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/net/http_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -40,7 +40,7 @@ CONFIG_MDNS_RESPONDER_DNS_SD=y CONFIG_NET_HOSTNAME_ENABLE=y CONFIG_NET_HOSTNAME_UNIQUE=n CONFIG_NET_HOSTNAME="httpserver" -CONFIG_POSIX_UNAME=n +CONFIG_POSIX_SINGLE_PROCESS=n # NET buffers CONFIG_NET_PKT_TX_COUNT=6 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 2c76ead822d2..86d04a9be3d7 100644 --- a/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -33,7 +33,7 @@ CONFIG_MDNS_RESPONDER_DNS_SD=y CONFIG_NET_HOSTNAME_ENABLE=y CONFIG_NET_HOSTNAME_UNIQUE=n CONFIG_NET_HOSTNAME="httpserver" -CONFIG_POSIX_UNAME=n +CONFIG_POSIX_SINGLE_PROCESS=n # Zephyr NET Connection Manager connectivity layer CONFIG_L2_WIFI_CONNECTIVITY=y diff --git a/samples/net/https_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/net/https_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf index fc8a57dedf05..65b052f9aeef 100644 --- a/samples/net/https_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/net/https_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -53,7 +53,7 @@ CONFIG_NRF70_MAX_TX_AGGREGATION=1 # Kernel options CONFIG_POSIX_NETWORKING=y -CONFIG_POSIX_MAX_FDS=21 +CONFIG_ZVFS_OPEN_MAX=21 # Shell CONFIG_SHELL=y 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 3167ed614d93..cc6a771230e5 100644 --- a/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -5,7 +5,7 @@ # # General -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=20000 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=40000 diff --git a/samples/net/mqtt/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/net/mqtt/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 2189f6e68503..f858ffbbf0e8 100644 --- a/samples/net/mqtt/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/net/mqtt/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -57,7 +57,7 @@ CONFIG_NRF70_MAX_TX_AGGREGATION=1 # Kernel options CONFIG_POSIX_NETWORKING=y -CONFIG_POSIX_MAX_FDS=21 +CONFIG_ZVFS_OPEN_MAX=21 # Shell CONFIG_SHELL=y diff --git a/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index 5e5cb1b0c72b..72084a2a8172 100644 --- a/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -9,7 +9,7 @@ # set here will take precedence if they are present in both files. # General -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_MAIN_STACK_SIZE=4096 CONFIG_LOG_BUFFER_SIZE=3072 diff --git a/samples/net/udp/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/net/udp/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 4a8aa443c322..6ab7e42924d1 100644 --- a/samples/net/udp/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/net/udp/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -57,7 +57,7 @@ CONFIG_NRF70_MAX_TX_AGGREGATION=1 # Kernel options CONFIG_POSIX_NETWORKING=y -CONFIG_POSIX_MAX_FDS=21 +CONFIG_ZVFS_OPEN_MAX=21 # Shell CONFIG_SHELL=y diff --git a/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index 563249edea07..d1477be278ee 100644 --- a/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -5,7 +5,7 @@ # # General -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_HEAP_MEM_POOL_SIZE=40144 CONFIG_NRF_WIFI_CTRL_HEAP_SIZE=15000 CONFIG_NRF_WIFI_DATA_HEAP_SIZE=64856 diff --git a/samples/nrf_rpc/protocols_serialization/server/CMakeLists.txt b/samples/nrf_rpc/protocols_serialization/server/CMakeLists.txt index 066bcdecc97f..07ef33684103 100644 --- a/samples/nrf_rpc/protocols_serialization/server/CMakeLists.txt +++ b/samples/nrf_rpc/protocols_serialization/server/CMakeLists.txt @@ -24,5 +24,5 @@ endif() # Link OpenThread CLI even though OPENTHREAD_SHELL is not selected if(CONFIG_OPENTHREAD_RPC) - zephyr_link_libraries(openthread-cli-ftd) + target_link_libraries(zephyr PRIVATE openthread-cli-ftd) endif() diff --git a/samples/pmic/native/npm1300_fuel_gauge/README.rst b/samples/pmic/native/npm1300_fuel_gauge/README.rst index 49ad0d74722c..816a16e58fe0 100644 --- a/samples/pmic/native/npm1300_fuel_gauge/README.rst +++ b/samples/pmic/native/npm1300_fuel_gauge/README.rst @@ -92,7 +92,7 @@ To connect your DK to the nPM1300 EK, complete the following steps: * On the **P14** pin header, connect **RSET2** and **VSET2** pins with a jumper. .. note:: - When using the :ref:`zephyr:nrf54l15dk_nrf54l15`, the nPM1300 **GPIO3** interrupt pin assignment uses the DK's **LED 1** pin. + When using the :zephyr:board:`nrf54l15dk`, the nPM1300 **GPIO3** interrupt pin assignment uses the DK's **LED 1** pin. Building and running ******************** diff --git a/samples/pmic/native/npm1300_one_button/README.rst b/samples/pmic/native/npm1300_one_button/README.rst index 441ff1cc8340..6ff842c7662a 100644 --- a/samples/pmic/native/npm1300_one_button/README.rst +++ b/samples/pmic/native/npm1300_one_button/README.rst @@ -94,7 +94,7 @@ To connect your DK to the nPM1300 EK, complete the following steps: .. note:: - When using the :ref:`zephyr:nrf54l15dk_nrf54l15`, the nPM1300 **GPIO3** interrupt pin assignment uses the DK's **LED 1** pin. + When using the :zephyr:board:`nrf54l15dk`, the nPM1300 **GPIO3** interrupt pin assignment uses the DK's **LED 1** pin. Building and running ******************** diff --git a/samples/pmic/native/npm2100_one_button/README.rst b/samples/pmic/native/npm2100_one_button/README.rst index 8ef267ccf1d6..6d94f0301043 100644 --- a/samples/pmic/native/npm2100_one_button/README.rst +++ b/samples/pmic/native/npm2100_one_button/README.rst @@ -102,7 +102,7 @@ To connect your DK to the nPM2100 EK, complete the following steps: .. note:: - When using the :ref:`zephyr:nrf54l15dk_nrf54l15`, the nPM2100 **GPIO1** interrupt + When using the :zephyr:board:`nrf54l15dk`, the nPM2100 **GPIO1** interrupt pin assignment uses the **BUTTON 2** pin of the DK. Building and running diff --git a/samples/wifi/ble_coex/prj.conf b/samples/wifi/ble_coex/prj.conf index ca4829016eea..45d035860b23 100644 --- a/samples/wifi/ble_coex/prj.conf +++ b/samples/wifi/ble_coex/prj.conf @@ -52,7 +52,7 @@ CONFIG_ENTROPY_GENERATOR=y # Logging CONFIG_LOG=y CONFIG_PRINTK=y -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y # Benchmarking CONFIG_NET_ZPERF=y diff --git a/samples/wifi/monitor/overlay-netusb.conf b/samples/wifi/monitor/overlay-netusb.conf index d4bed2c98ee5..82f89fa32f60 100644 --- a/samples/wifi/monitor/overlay-netusb.conf +++ b/samples/wifi/monitor/overlay-netusb.conf @@ -19,6 +19,6 @@ CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=10 CONFIG_POSIX_THREAD_THREADS_MAX=5 # Every pthread_create needs a mutex, and WFA DUT needs an extra mutex/thread # CONFIG_POSIX_THREAD_THREADS_MAX * 2 -CONFIG_MAX_PTHREAD_MUTEX_COUNT=10 +CONFIG_MAX_POSIX_THREADS_COUNT=10 # Same as above: CONFIG_POSIX_THREAD_THREADS_MAX * 2 -CONFIG_MAX_PTHREAD_COND_COUNT=10 +CONFIG_MAX_POSIX_THREADS_COUNT=10 diff --git a/samples/wifi/monitor/prj.conf b/samples/wifi/monitor/prj.conf index 8a2fa9aa50e4..bfa51381a38d 100644 --- a/samples/wifi/monitor/prj.conf +++ b/samples/wifi/monitor/prj.conf @@ -45,7 +45,7 @@ CONFIG_NET_RX_STACK_SIZE=4096 # Logging CONFIG_LOG=y CONFIG_LOG_MODE_IMMEDIATE=y -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_POSIX_API=y # printing of scan results puts pressure on queues in new locking diff --git a/samples/wifi/promiscuous/overlay-netusb.conf b/samples/wifi/promiscuous/overlay-netusb.conf index d4bed2c98ee5..82f89fa32f60 100644 --- a/samples/wifi/promiscuous/overlay-netusb.conf +++ b/samples/wifi/promiscuous/overlay-netusb.conf @@ -19,6 +19,6 @@ CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=10 CONFIG_POSIX_THREAD_THREADS_MAX=5 # Every pthread_create needs a mutex, and WFA DUT needs an extra mutex/thread # CONFIG_POSIX_THREAD_THREADS_MAX * 2 -CONFIG_MAX_PTHREAD_MUTEX_COUNT=10 +CONFIG_MAX_POSIX_THREADS_COUNT=10 # Same as above: CONFIG_POSIX_THREAD_THREADS_MAX * 2 -CONFIG_MAX_PTHREAD_COND_COUNT=10 +CONFIG_MAX_POSIX_THREADS_COUNT=10 diff --git a/samples/wifi/promiscuous/prj.conf b/samples/wifi/promiscuous/prj.conf index b1ef17bbdf4b..2dfa2d02b46e 100644 --- a/samples/wifi/promiscuous/prj.conf +++ b/samples/wifi/promiscuous/prj.conf @@ -72,7 +72,7 @@ CONFIG_ENTROPY_GENERATOR=y # Logging CONFIG_LOG=y CONFIG_LOG_BUFFER_SIZE=2048 -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y # printing of scan results puts pressure on queues in new locking # design in net_mgmt. So, use a higher timeout for a crowded diff --git a/samples/wifi/provisioning/softap/prj.conf b/samples/wifi/provisioning/softap/prj.conf index 1e3eeebd5dda..a76683c601b8 100644 --- a/samples/wifi/provisioning/softap/prj.conf +++ b/samples/wifi/provisioning/softap/prj.conf @@ -83,7 +83,7 @@ CONFIG_MDNS_RESPONDER_DNS_SD=y CONFIG_NET_HOSTNAME_ENABLE=y CONFIG_NET_HOSTNAME="wifiprov" # Disable POSIX uname support to suppress build warning that hostname is too long. -CONFIG_POSIX_UNAME=n +CONFIG_POSIX_SINGLE_PROCESS=n # DHCPv4 client and server CONFIG_NET_DHCPV4=y diff --git a/samples/wifi/radio_test/multi_domain/prj.conf b/samples/wifi/radio_test/multi_domain/prj.conf index a73e66385d20..782fefceb2f3 100644 --- a/samples/wifi/radio_test/multi_domain/prj.conf +++ b/samples/wifi/radio_test/multi_domain/prj.conf @@ -31,7 +31,7 @@ CONFIG_PRINTK=y CONFIG_SHELL=y CONFIG_SHELL_GETOPT=y CONFIG_DEVICE_SHELL=y -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_DATE_SHELL=y CONFIG_LOG_BUFFER_SIZE=4096 CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=1024 diff --git a/samples/wifi/radio_test/single_domain/prj.conf b/samples/wifi/radio_test/single_domain/prj.conf index 53fb88ec874a..02db2cd7edbd 100644 --- a/samples/wifi/radio_test/single_domain/prj.conf +++ b/samples/wifi/radio_test/single_domain/prj.conf @@ -32,7 +32,7 @@ CONFIG_PRINTK=y CONFIG_SHELL=y CONFIG_SHELL_GETOPT=y CONFIG_DEVICE_SHELL=y -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_DATE_SHELL=y CONFIG_LOG_BUFFER_SIZE=4096 CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=1024 diff --git a/samples/wifi/raw_tx_packet/prj.conf b/samples/wifi/raw_tx_packet/prj.conf index 4f230edbe1f6..a3b57ca6f521 100644 --- a/samples/wifi/raw_tx_packet/prj.conf +++ b/samples/wifi/raw_tx_packet/prj.conf @@ -69,7 +69,7 @@ CONFIG_ENTROPY_GENERATOR=y # Logging CONFIG_LOG=y CONFIG_LOG_BUFFER_SIZE=2048 -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_POSIX_API=y CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.99" diff --git a/samples/wifi/shell/overlay-netusb.conf b/samples/wifi/shell/overlay-netusb.conf index d4bed2c98ee5..82f89fa32f60 100644 --- a/samples/wifi/shell/overlay-netusb.conf +++ b/samples/wifi/shell/overlay-netusb.conf @@ -19,6 +19,6 @@ CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=10 CONFIG_POSIX_THREAD_THREADS_MAX=5 # Every pthread_create needs a mutex, and WFA DUT needs an extra mutex/thread # CONFIG_POSIX_THREAD_THREADS_MAX * 2 -CONFIG_MAX_PTHREAD_MUTEX_COUNT=10 +CONFIG_MAX_POSIX_THREADS_COUNT=10 # Same as above: CONFIG_POSIX_THREAD_THREADS_MAX * 2 -CONFIG_MAX_PTHREAD_COND_COUNT=10 +CONFIG_MAX_POSIX_THREADS_COUNT=10 diff --git a/samples/wifi/shell/prj.conf b/samples/wifi/shell/prj.conf index 0fd875b1b2f6..4bd53cd9c6bf 100644 --- a/samples/wifi/shell/prj.conf +++ b/samples/wifi/shell/prj.conf @@ -72,7 +72,7 @@ CONFIG_PRINTK=y CONFIG_SHELL=y CONFIG_SHELL_GETOPT=y CONFIG_DEVICE_SHELL=y -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_DATE_SHELL=y CONFIG_NET_CONFIG_AUTO_INIT=n CONFIG_POSIX_API=y diff --git a/samples/wifi/softap/prj.conf b/samples/wifi/softap/prj.conf index d2b459dc1e32..4a956bf8366b 100644 --- a/samples/wifi/softap/prj.conf +++ b/samples/wifi/softap/prj.conf @@ -70,7 +70,7 @@ CONFIG_ENTROPY_GENERATOR=y # Logging CONFIG_LOG=y CONFIG_LOG_BUFFER_SIZE=2048 -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.1" CONFIG_NET_CONFIG_MY_IPV4_NETMASK="255.255.255.0" diff --git a/samples/wifi/sta/prj.conf b/samples/wifi/sta/prj.conf index 1be8a75a11c2..dc509898c10d 100644 --- a/samples/wifi/sta/prj.conf +++ b/samples/wifi/sta/prj.conf @@ -72,7 +72,7 @@ CONFIG_ENTROPY_GENERATOR=y # Logging CONFIG_LOG=y CONFIG_LOG_BUFFER_SIZE=2048 -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.99" CONFIG_NET_CONFIG_MY_IPV4_NETMASK="255.255.255.0" diff --git a/samples/wifi/thread_coex/prj.conf b/samples/wifi/thread_coex/prj.conf index 54ba471023d7..86a76c57730e 100644 --- a/samples/wifi/thread_coex/prj.conf +++ b/samples/wifi/thread_coex/prj.conf @@ -48,7 +48,7 @@ CONFIG_ENTROPY_GENERATOR=y # Logging CONFIG_LOG=y CONFIG_PRINTK=y -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y # Benchmarking CONFIG_NET_ZPERF=y @@ -117,7 +117,7 @@ CONFIG_NET_BUF_TX_COUNT=16 # Wi-Fi zperf configuration CONFIG_WIFI_ZPERF_PROT_UDP=y -CONFIG_WIFI_ZPERF_SERVER=n +CONFIG_NET_ZPERF_SERVER=y # Thread zperf configuration CONFIG_OT_ZPERF_PROT_UDP=y diff --git a/samples/wifi/throughput/prj.conf b/samples/wifi/throughput/prj.conf index 97d1a4719f55..b1e4c809d53b 100644 --- a/samples/wifi/throughput/prj.conf +++ b/samples/wifi/throughput/prj.conf @@ -73,7 +73,7 @@ CONFIG_PRINTK=y CONFIG_SHELL=y CONFIG_SHELL_GETOPT=y CONFIG_DEVICE_SHELL=y -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_DATE_SHELL=y CONFIG_NET_CONFIG_AUTO_INIT=n diff --git a/samples/wifi/twt/prj.conf b/samples/wifi/twt/prj.conf index c108c798b3f7..54ae11c00273 100644 --- a/samples/wifi/twt/prj.conf +++ b/samples/wifi/twt/prj.conf @@ -72,7 +72,7 @@ CONFIG_ENTROPY_GENERATOR=y # Logging CONFIG_LOG=y CONFIG_LOG_BUFFER_SIZE=2048 -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_POSIX_API=y CONFIG_PM=y diff --git a/samples/wifi/wfa_qt_app/prj.conf b/samples/wifi/wfa_qt_app/prj.conf index f44ecfeffad5..623bdf07ac98 100644 --- a/samples/wifi/wfa_qt_app/prj.conf +++ b/samples/wifi/wfa_qt_app/prj.conf @@ -82,7 +82,7 @@ CONFIG_PRINTK=y CONFIG_SHELL=y CONFIG_SHELL_GETOPT=y CONFIG_DEVICE_SHELL=y -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_DATE_SHELL=y CONFIG_NET_CONFIG_AUTO_INIT=n CONFIG_NET_CONFIG_SETTINGS=y diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index d752d231ca4a..1c355fd5108b 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -5,7 +5,7 @@ # This configurations come from tests/samples in sdk-zephyr - scenarios: - - libraries.hash_map.newlib.cxx_unordered_map.djb2 + - sample.libraries.hash_map.newlib.cxx_unordered_map.djb2 comment: "https://nordicsemi.atlassian.net/browse/NCSDK-21219" - scenarios: @@ -281,6 +281,39 @@ - nrf52840dk/nrf52840 comment: "Not compatible with NCS. https://nordicsemi.atlassian.net/browse/KRKNWK-20183" +- scenarios: + - bluetooth.shell.shell_br + platforms: + - qemu_cortex_m3/ti_lm3s6965 + comment: "https://github.com/zephyrproject-rtos/zephyr/issues/89488" + +- scenarios: + - portability.posix.xsi_realtime + - portability.posix.xsi_realtime.minimal + - portability.posix.xsi_realtime.newlib + - portability.posix.xsi_realtime.picolibc + platforms: + - qemu_cortex_m3/ti_lm3s6965 + comment: "https://github.com/zephyrproject-rtos/zephyr/issues/89485" + +- scenarios: + - drivers.gpio.build + platforms: + - nrf54l15dk/nrf54l15/cpuflpr + comment: "https://nordicsemi.atlassian.net/browse/NCSDK-33288" + +- scenarios: + - kernel.scheduler.simple_timeslicing + platforms: + - nrf52dk/nrf52832 + comment: "https://nordicsemi.atlassian.net/browse/NCSDK-33279" + +- scenarios: + - usb.device_next.build_all + platforms: + - qemu_cortex_m3/ti_lm3s6965 + comment: "https://github.com/zephyrproject-rtos/zephyr/issues/89484" + # --------------------------------- Won't fix section ----------------------------------- - scenarios: @@ -441,6 +474,11 @@ - .*secure_storage.* - kernel.scheduler.simple_timeslicing - kernel.scheduler.simple_no_timeslicing + - sample.input.input_dump_shell + - sample.harness.shell.vt100_colors_off + - sample.harness.shell + - filesystem.lib_link + - sample.pytest.shell.vt100_colors_off platforms: - nrf54h20dk@0.9.0/nrf54h20/cpuppr comment: "region RAM/FLASH overflowed" @@ -561,3 +599,9 @@ platforms: - native_sim/native comment: "clang is not available in our toolchain" + +- scenarios: + - sample.bluetooth.peripheral_hr.frdm_kw41z_shield + platforms: + - nrf5340dk/nrf5340/cpuapp/ns + comment: "Not compatible" diff --git a/scripts/west_commands/ncs_west_helpers.py b/scripts/west_commands/ncs_west_helpers.py index 46ab4faacb38..6763bdf15488 100644 --- a/scripts/west_commands/ncs_west_helpers.py +++ b/scripts/west_commands/ncs_west_helpers.py @@ -264,6 +264,11 @@ def _downstream_outstanding_commits(self) -> list[pygit2.Commit]: # so just ignore it. if rsha == 'fe339b14b3effd069458f5e4710f17cda8295229': continue + # Revert 5156ca3db2741f009306aaa555c9bb70d9fe8777 + # references the wrong commit, the correct reference is + # b381f5633df2f28c318bc86cf6fc9d059e57a056 + if sha == '5156ca3db2741f009306aaa555c9bb70d9fe8777': + rsha = 'b381f5633df2f28c318bc86cf6fc9d059e57a056' if rsha in downstream_out: log.dbg('** commit {} ("{}") was reverted in {}'. diff --git a/snippets/nordic-bt-rpc/README.rst b/snippets/nordic-bt-rpc/README.rst index 7a2ea7fa240a..e76373ea6c9c 100644 --- a/snippets/nordic-bt-rpc/README.rst +++ b/snippets/nordic-bt-rpc/README.rst @@ -19,8 +19,8 @@ Supported SoCs Currently, the following SoCs from Nordic Semiconductor are supported for use with the snippet: -* :ref:`zephyr:nrf5340dk_nrf5340` -* :ref:`zephyr:nrf54h20dk_nrf54h20` +* :zephyr:board:`nrf5340dk` +* :zephyr:board:`nrf54h20dk` .. note:: On the nRF54H20 SoC, the snippet modifies the memory map to make room for settings storage for the radio core. diff --git a/subsys/bluetooth/controller/hci_internal_wrappers.c b/subsys/bluetooth/controller/hci_internal_wrappers.c index 74847e921c9d..7b04b763a671 100644 --- a/subsys/bluetooth/controller/hci_internal_wrappers.c +++ b/subsys/bluetooth/controller/hci_internal_wrappers.c @@ -36,7 +36,9 @@ * to avoid deadlocks due to missing CMD buffers, if the host is only allocating the next command * once the previous is completed. */ -BUILD_ASSERT(BT_BUF_ACL_RX_COUNT < CONFIG_BT_BUF_CMD_TX_COUNT, +#define BT_BUF_CMD_TX_COUNT CONFIG_BT_BUF_CMD_TX_COUNT + +BUILD_ASSERT(BT_BUF_ACL_RX_COUNT < BT_BUF_CMD_TX_COUNT, "Too low HCI command buffers compared to ACL Rx buffers."); #else /* controller-only build */ /* @@ -46,7 +48,9 @@ BUILD_ASSERT(BT_BUF_ACL_RX_COUNT < CONFIG_BT_BUF_CMD_TX_COUNT, * do flow control, at least one more buffer is needed. * */ -BUILD_ASSERT((CONFIG_BT_BUF_CMD_TX_COUNT - 1) > 0, +#define BT_BUF_CMD_TX_COUNT (BT_BUF_RX_COUNT + 1) + +BUILD_ASSERT((BT_BUF_CMD_TX_COUNT - 1) > 0, "We need at least two HCI command buffers to avoid deadlocks."); #endif /* CONFIG_BT_CONN && CONFIG_BT_HCI_HOST */ @@ -71,7 +75,7 @@ int sdc_hci_cmd_cb_host_buffer_size_wrapper(const sdc_hci_cmd_cb_host_buffer_siz sdc_hci_cmd_cb_host_buffer_size_t ctrl_cmd_params = *cmd_params; ctrl_cmd_params.host_total_num_acl_data_packets = MIN( - ctrl_cmd_params.host_total_num_acl_data_packets, (CONFIG_BT_BUF_CMD_TX_COUNT - 1)); + ctrl_cmd_params.host_total_num_acl_data_packets, (BT_BUF_CMD_TX_COUNT - 1)); return sdc_hci_cmd_cb_host_buffer_size(&ctrl_cmd_params); } diff --git a/subsys/bluetooth/gatt_pool.c b/subsys/bluetooth/gatt_pool.c index 0e5458f8a289..c43c6d908892 100644 --- a/subsys/bluetooth/gatt_pool.c +++ b/subsys/bluetooth/gatt_pool.c @@ -379,7 +379,7 @@ int bt_gatt_pool_desc_alloc(struct bt_gatt_pool *gp, } int bt_gatt_pool_ccc_alloc(struct bt_gatt_pool *gp, - struct _bt_gatt_ccc *ccc, + struct bt_gatt_ccc_managed_user_data *ccc, uint8_t perm) { struct bt_gatt_attr *attr; diff --git a/subsys/bluetooth/rpc/client/bt_rpc_conn_client.c b/subsys/bluetooth/rpc/client/bt_rpc_conn_client.c index ae5487e8c021..1f28e6fc2cb0 100644 --- a/subsys/bluetooth/rpc/client/bt_rpc_conn_client.c +++ b/subsys/bluetooth/rpc/client/bt_rpc_conn_client.c @@ -392,7 +392,7 @@ static void bt_conn_get_remote_info_rpc_rsp(const struct nrf_rpc_group *group, bt_conn_remote_info_dec(ctx, res->conn, res->remote_info); } -int bt_conn_get_remote_info(struct bt_conn *conn, +int bt_conn_get_remote_info(const struct bt_conn *conn, struct bt_conn_remote_info *remote_info) { struct nrf_rpc_cbor_ctx ctx; @@ -403,7 +403,7 @@ int bt_conn_get_remote_info(struct bt_conn *conn, bt_rpc_encode_bt_conn(&ctx, conn); - result.conn = conn; + result.conn = (struct bt_conn *)conn; result.remote_info = remote_info; nrf_rpc_cbor_cmd_no_err(&bt_rpc_grp, BT_CONN_GET_REMOTE_INFO_RPC_CMD, diff --git a/subsys/bluetooth/rpc/client/bt_rpc_gatt_client.c b/subsys/bluetooth/rpc/client/bt_rpc_gatt_client.c index af47caa32d0d..9a497d4c5853 100644 --- a/subsys/bluetooth/rpc/client/bt_rpc_gatt_client.c +++ b/subsys/bluetooth/rpc/client/bt_rpc_gatt_client.c @@ -143,7 +143,7 @@ static void bt_rpc_gatt_ccc_cfg_changed_cb_rpc_handler(const struct nrf_rpc_grou uint32_t attr_index; uint16_t ccc_value; const struct bt_gatt_attr *attr; - struct _bt_gatt_ccc *ccc; + struct bt_gatt_ccc_managed_user_data *ccc; attr_index = nrf_rpc_decode_uint(ctx); ccc_value = nrf_rpc_decode_uint(ctx); @@ -157,7 +157,7 @@ static void bt_rpc_gatt_ccc_cfg_changed_cb_rpc_handler(const struct nrf_rpc_grou return; } - ccc = (struct _bt_gatt_ccc *) attr->user_data; + ccc = (struct bt_gatt_ccc_managed_user_data *) attr->user_data; if (ccc->cfg_changed) { ccc->cfg_changed(attr, ccc_value); @@ -181,7 +181,7 @@ static void bt_rpc_gatt_ccc_cfg_write_cb_rpc_handler(const struct nrf_rpc_group uint32_t attr_index; struct bt_conn *conn; const struct bt_gatt_attr *attr; - struct _bt_gatt_ccc *ccc; + struct bt_gatt_ccc_managed_user_data *ccc; uint16_t ccc_value; ssize_t write_len = 0; @@ -198,7 +198,7 @@ static void bt_rpc_gatt_ccc_cfg_write_cb_rpc_handler(const struct nrf_rpc_group return; } - ccc = (struct _bt_gatt_ccc *) attr->user_data; + ccc = (struct bt_gatt_ccc_managed_user_data *) attr->user_data; if (ccc->cfg_write) { write_len = ccc->cfg_write(conn, attr, ccc_value); @@ -222,7 +222,7 @@ static void bt_rpc_gatt_ccc_cfg_match_cb_rpc_handler(const struct nrf_rpc_group uint32_t attr_index; struct bt_conn *conn; const struct bt_gatt_attr *attr; - struct _bt_gatt_ccc *ccc; + struct bt_gatt_ccc_managed_user_data *ccc; bool match = false; conn = bt_rpc_decode_bt_conn(ctx); @@ -237,7 +237,7 @@ static void bt_rpc_gatt_ccc_cfg_match_cb_rpc_handler(const struct nrf_rpc_group return; } - ccc = (struct _bt_gatt_ccc *) attr->user_data; + ccc = (struct bt_gatt_ccc_managed_user_data *) attr->user_data; if (ccc->cfg_match) { match = ccc->cfg_match(conn, attr); @@ -511,9 +511,10 @@ static int bt_rpc_gatt_send_desc_attr(uint8_t special_attr, uint16_t param, uint static int send_ccc_attr(uint8_t special_attr, const struct bt_gatt_attr *attr) { - struct _bt_gatt_ccc *ccc = (struct _bt_gatt_ccc *)attr->user_data; + struct bt_gatt_ccc_managed_user_data *ccc; uint16_t data = attr->perm; + ccc = (struct bt_gatt_ccc_managed_user_data *)attr->user_data; if (ccc->cfg_changed) { data |= BT_RPC_GATT_CCC_CFG_CHANGE_PRESENT_FLAG; } diff --git a/subsys/bluetooth/rpc/host/bt_rpc_gatt_host.c b/subsys/bluetooth/rpc/host/bt_rpc_gatt_host.c index e24c5d464c1d..1cc1f94fb725 100644 --- a/subsys/bluetooth/rpc/host/bt_rpc_gatt_host.c +++ b/subsys/bluetooth/rpc/host/bt_rpc_gatt_host.c @@ -582,14 +582,15 @@ static bool bt_ccc_cfg_match_call(struct bt_conn *conn, const struct bt_gatt_att static int add_ccc_attr(struct bt_gatt_attr *attr, uint16_t param) { - struct _bt_gatt_ccc *ccc; + struct bt_gatt_ccc_managed_user_data *ccc; - ccc = (struct _bt_gatt_ccc *)bt_rpc_gatt_add(&gatt_buffer, sizeof(struct _bt_gatt_ccc)); + ccc = (struct bt_gatt_ccc_managed_user_data *)bt_rpc_gatt_add(&gatt_buffer, + sizeof(struct bt_gatt_ccc_managed_user_data)); if (!ccc) { return -ENOMEM; } - memset(ccc, 0, sizeof(struct _bt_gatt_ccc)); + memset(ccc, 0, sizeof(struct bt_gatt_ccc_managed_user_data)); ccc->cfg_changed = (param & BT_RPC_GATT_CCC_CFG_CHANGE_PRESENT_FLAG) ? bt_ccc_cfg_changed_call : NULL; diff --git a/subsys/bluetooth/services/hids.c b/subsys/bluetooth/services/hids.c index 0e5f47b2ad5b..17ba503c7acb 100644 --- a/subsys/bluetooth/services/hids.c +++ b/subsys/bluetooth/services/hids.c @@ -474,7 +474,7 @@ static void hids_input_report_ccc_changed(struct bt_gatt_attr const *attr, LOG_DBG("Input Report CCCD has changed."); struct bt_hids_inp_rep *inp_rep = - CONTAINER_OF((struct _bt_gatt_ccc *)attr->user_data, + CONTAINER_OF((struct bt_gatt_ccc_managed_user_data *)attr->user_data, struct bt_hids_inp_rep, ccc); uint8_t report_id = inp_rep->id; @@ -533,7 +533,7 @@ static void hids_boot_mouse_inp_rep_ccc_changed(struct bt_gatt_attr const *attr, LOG_DBG("Boot Mouse Input Report CCCD has changed."); struct bt_hids_boot_mouse_inp_rep *boot_mouse_rep = - CONTAINER_OF((struct _bt_gatt_ccc *)attr->user_data, + CONTAINER_OF((struct bt_gatt_ccc_managed_user_data *)attr->user_data, struct bt_hids_boot_mouse_inp_rep, ccc); if (value == BT_GATT_CCC_NOTIFY) { @@ -588,7 +588,7 @@ static void hids_boot_kb_inp_rep_ccc_changed(struct bt_gatt_attr const *attr, LOG_DBG("Boot Keyboard Input Report CCCD has changed."); struct bt_hids_boot_kb_inp_rep *boot_kb_inp_rep = - CONTAINER_OF((struct _bt_gatt_ccc *)attr->user_data, + CONTAINER_OF((struct bt_gatt_ccc_managed_user_data *)attr->user_data, struct bt_hids_boot_kb_inp_rep, ccc); if (value == BT_GATT_CCC_NOTIFY) { diff --git a/subsys/bluetooth/services/mds.c b/subsys/bluetooth/services/mds.c index b96ecc6c6c3b..82a7de89da14 100644 --- a/subsys/bluetooth/services/mds.c +++ b/subsys/bluetooth/services/mds.c @@ -355,9 +355,10 @@ static ssize_t data_export_ccc_write(struct bt_conn *conn, return sizeof(value); } -static struct _bt_gatt_ccc mds_data_export_ccc = BT_GATT_CCC_INITIALIZER(data_export_ccc_changed, - data_export_ccc_write, - NULL); +static struct bt_gatt_ccc_managed_user_data mds_data_export_ccc = + BT_GATT_CCC_MANAGED_USER_DATA_INIT(data_export_ccc_changed, + data_export_ccc_write, + NULL); BT_GATT_SERVICE_DEFINE(mds_svc, BT_GATT_PRIMARY_SERVICE(BT_UUID_MEMFAULT_DIAG), diff --git a/subsys/bluetooth/services/ras/rrsp/ras_rrsp.c b/subsys/bluetooth/services/ras/rrsp/ras_rrsp.c index bbf05bcb1513..69f8eb882580 100644 --- a/subsys/bluetooth/services/ras/rrsp/ras_rrsp.c +++ b/subsys/bluetooth/services/ras/rrsp/ras_rrsp.c @@ -215,14 +215,14 @@ BT_GATT_SERVICE_DEFINE( /* On-demand Ranging Data */ BT_GATT_CHARACTERISTIC(BT_UUID_RAS_ONDEMAND_RD, BT_GATT_CHRC_INDICATE | BT_GATT_CHRC_NOTIFY, BT_GATT_PERM_NONE, NULL, NULL, NULL), - BT_GATT_CCC_MANAGED(((struct _bt_gatt_ccc[]){BT_GATT_CCC_INITIALIZER( - NULL, ondemand_rd_ccc_cfg_write_cb, NULL)}), + BT_GATT_CCC_MANAGED(((struct bt_gatt_ccc_managed_user_data[]){ + BT_GATT_CCC_MANAGED_USER_DATA_INIT(NULL, ondemand_rd_ccc_cfg_write_cb, NULL)}), BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT), /* Real-time Ranging Data */ BT_GATT_CHARACTERISTIC(BT_UUID_RAS_REALTIME_RD, BT_GATT_CHRC_INDICATE | BT_GATT_CHRC_NOTIFY, BT_GATT_PERM_NONE, NULL, NULL, NULL), - BT_GATT_CCC_MANAGED(((struct _bt_gatt_ccc[]){BT_GATT_CCC_INITIALIZER( - NULL, realtime_rd_ccc_cfg_write_cb, NULL)}), + BT_GATT_CCC_MANAGED(((struct bt_gatt_ccc_managed_user_data[]){ + BT_GATT_CCC_MANAGED_USER_DATA_INIT(NULL, realtime_rd_ccc_cfg_write_cb, NULL)}), BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT), /* RAS-CP */ BT_GATT_CHARACTERISTIC(BT_UUID_RAS_CP, diff --git a/subsys/dfu/dfu_target/src/dfu_stream_flatten.c b/subsys/dfu/dfu_target/src/dfu_stream_flatten.c index 63281e4a81ed..68f1f90b54ae 100644 --- a/subsys/dfu/dfu_target/src/dfu_stream_flatten.c +++ b/subsys/dfu/dfu_target/src/dfu_stream_flatten.c @@ -22,11 +22,11 @@ int stream_flash_flatten_page(struct stream_flash_ctx *ctx, off_t off) } #if defined(CONFIG_STREAM_FLASH_ERASE) - if (ctx->last_erased_page_start_offset == page.start_offset) { + if (ctx->erased_up_to >= (page.start_offset + page.size)) { return 0; } #else - if (ctx->bytes_written + ctx->offset > page.start_offset) { + if (ctx->bytes_written > (page.start_offset + page.size)) { return 0; } #endif @@ -39,7 +39,7 @@ int stream_flash_flatten_page(struct stream_flash_ctx *ctx, off_t off) LOG_ERR("Error %d while flattening page", rc); #if defined(CONFIG_STREAM_FLASH_ERASE) } else { - ctx->last_erased_page_start_offset = page.start_offset; + ctx->erased_up_to = page.start_offset + page.size - ctx->offset; #endif } diff --git a/subsys/dfu/dfu_target/src/dfu_target_stream.c b/subsys/dfu/dfu_target/src/dfu_target_stream.c index 2fb40eb5bd9b..fbc6ed7d3200 100644 --- a/subsys/dfu/dfu_target/src/dfu_target_stream.c +++ b/subsys/dfu/dfu_target/src/dfu_target_stream.c @@ -68,7 +68,7 @@ static int settings_set(const char *key, size_t len_rd, /* Zero bytes written - set last erased page to its default. */ if (stream.bytes_written == 0) { - stream.last_erased_page_start_offset = -1; + stream.erased_up_to = 0; return 0; } @@ -85,7 +85,7 @@ static int settings_set(const char *key, size_t len_rd, /* Update the last erased page to avoid deleting already * written data. */ - stream.last_erased_page_start_offset = page.start_offset; + stream.erased_up_to = page.start_offset + page.size - stream.offset; } return 0; diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/ground_fix_obj.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/ground_fix_obj.c index 11940820f8e7..fff965c08ce8 100644 --- a/subsys/net/lib/lwm2m_client_utils/lwm2m/ground_fix_obj.c +++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/ground_fix_obj.c @@ -119,7 +119,7 @@ static int forward_to_location_obj(uint16_t obj_inst_id, switch (res_id) { case GROUND_FIX_LATITUDE: - if (IS_ENABLED(CONFIG_POSIX_CLOCK)) { + if (IS_ENABLED(CONFIG_POSIX_TIMERS)) { /* Update timestamp as well */ lwm2m_set_time( &LWM2M_OBJ(LWM2M_OBJECT_LOCATION_ID, 0, LOCATION_TIMESTAMP_ID), diff --git a/subsys/net/openthread/Kconfig b/subsys/net/openthread/Kconfig index 0a926f8dee7c..9b4581866c02 100644 --- a/subsys/net/openthread/Kconfig +++ b/subsys/net/openthread/Kconfig @@ -8,7 +8,7 @@ # Separate Kconfig exists in nrfxlib repository responsible solely for managing # OpenThread precompiled libraries. -if NET_L2_OPENTHREAD +if OPENTHREAD menu "OpenThread" @@ -16,7 +16,6 @@ config NORDIC_SECURITY_PROMPTLESS default y if !CUSTOM_OPENTHREAD_SECURITY choice OPENTHREAD_SECURITY - depends on !OPENTHREAD_SECURITY_INTERNAL config OPENTHREAD_NRF_SECURITY_PSA_CHOICE bool "nRF Security with PSA crypto enabled" @@ -146,7 +145,7 @@ endchoice endmenu # "OpenThread" -endif # NET_L2_OPENTHREAD +endif # OPENTHREAD rsource "rpc/Kconfig" rsource "report/Kconfig" diff --git a/subsys/net/openthread/Kconfig.defconfig b/subsys/net/openthread/Kconfig.defconfig index 407cc3011d09..e116041ca9f5 100644 --- a/subsys/net/openthread/Kconfig.defconfig +++ b/subsys/net/openthread/Kconfig.defconfig @@ -8,7 +8,7 @@ # This file only changes defaults and thus all symbols here must be prompltless # and safeguarded so that they only are applied when building Thread. -if NET_L2_OPENTHREAD +if OPENTHREAD choice OPENTHREAD_STACK_VERSION default OPENTHREAD_THREAD_VERSION_1_4 @@ -54,20 +54,6 @@ config LOG_BUFFER_SIZE config INIT_STACKS default y -config NET_IPV6_NBR_CACHE - default n - -config NET_IPV6_MLD - default n - -config NET_PKT_RX_COUNT - default 4 if OPENTHREAD_COPROCESSOR_RCP - default 10 - -config NET_PKT_TX_COUNT - default 4 if OPENTHREAD_COPROCESSOR_RCP - default 16 - config OPENTHREAD_MANUAL_START default y @@ -146,28 +132,6 @@ config MBEDTLS_HEAP_SIZE default 15360 if OPENTHREAD_NRF_SECURITY_PSA default 12440 if !OPENTHREAD_NRF_SECURITY_PSA -if !OPENTHREAD_THREAD_VERSION_1_1 - -# Thread 1.2 dependencies -config NRF_802154_ENCRYPTION - default y - -config NET_PKT_TXTIME - default y - -config NET_PKT_TIMESTAMP - default y - -# CSL Transmitter configuration -config IEEE802154_NRF5_DELAY_TRX_ACC - default 50 if BOARD_NRF52840DONGLE_NRF52840 || BOARD_NRF54L15DK - default 20 - -config IEEE802154_CSL_ENDPOINT - default y if OPENTHREAD_CSL_RECEIVER - -endif # !OPENTHREAD_THREAD_VERSION_1_1 - if OPENTHREAD_COPROCESSOR_RCP config MBEDTLS_PSA_KEY_SLOT_COUNT @@ -182,12 +146,6 @@ config IDLE_STACK_SIZE config MPSL_WORK_STACK_SIZE default 512 -config NET_RX_STACK_SIZE - default 300 - -config NET_TX_STACK_SIZE - default 300 - endif # OPENTHREAD_COPROCESSOR_RCP if OPENTHREAD_BLE_TCAT @@ -223,4 +181,13 @@ config ZMS config NVS default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM) -endif # NET_L2_OPENTHREAD +if !OPENTHREAD_THREAD_VERSION_1_1 + +# Thread 1.2 dependencies +config NRF_802154_ENCRYPTION + default y + +endif # !OPENTHREAD_THREAD_VERSION_1_1 +endif # OPENTHREAD + +rsource "Kconfig.defconfig.l2" diff --git a/subsys/net/openthread/Kconfig.defconfig.l2 b/subsys/net/openthread/Kconfig.defconfig.l2 new file mode 100644 index 000000000000..94fbc463a240 --- /dev/null +++ b/subsys/net/openthread/Kconfig.defconfig.l2 @@ -0,0 +1,54 @@ +# Copyright (c) 2025 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# The purpose of this file is to define new default values of settings related +# to building Thread from sources. +# This file only changes defaults related to the Zephyr L2 layer. + +if NET_L2_OPENTHREAD + +config NET_IPV6_NBR_CACHE + default n + +config NET_IPV6_MLD + default n + +config NET_PKT_RX_COUNT + default 4 if OPENTHREAD_COPROCESSOR_RCP + default 10 + +config NET_PKT_TX_COUNT + default 4 if OPENTHREAD_COPROCESSOR_RCP + default 16 + +if !OPENTHREAD_THREAD_VERSION_1_1 + +config NET_PKT_TXTIME + default y + +config NET_PKT_TIMESTAMP + default y + +# CSL Transmitter configuration +config IEEE802154_NRF5_DELAY_TRX_ACC + default 50 if BOARD_NRF52840DONGLE_NRF52840 || BOARD_NRF54L15DK + default 20 + +config IEEE802154_CSL_ENDPOINT + default y if OPENTHREAD_CSL_RECEIVER + +endif # !OPENTHREAD_THREAD_VERSION_1_1 + +if OPENTHREAD_COPROCESSOR_RCP + +config NET_RX_STACK_SIZE + default 300 + +config NET_TX_STACK_SIZE + default 300 + +endif # OPENTHREAD_COPROCESSOR_RCP + +endif # NET_L2_OPENTHREAD diff --git a/subsys/net/openthread/report/Kconfig b/subsys/net/openthread/report/Kconfig index 0a26c942feaf..3f29cf2a81d6 100644 --- a/subsys/net/openthread/report/Kconfig +++ b/subsys/net/openthread/report/Kconfig @@ -6,7 +6,7 @@ menuconfig OPENTHREAD_REPORT bool "OpenThread report generation" default y - depends on NET_L2_OPENTHREAD + depends on OPENTHREAD help Enables report generation that contains the OpenThread version, NCS revision, OpenThread library build information, List of enabled diff --git a/subsys/net/openthread/rpc/server/ot_rpc_if.c b/subsys/net/openthread/rpc/server/ot_rpc_if.c index fd90b35022da..2c2173eb6404 100644 --- a/subsys/net/openthread/rpc/server/ot_rpc_if.c +++ b/subsys/net/openthread/rpc/server/ot_rpc_if.c @@ -12,6 +12,7 @@ #include +#include /* For ETH_P_ALL */ #include #include #include @@ -97,14 +98,13 @@ static void ot_rpc_cmd_if_enable(const struct nrf_rpc_group *group, struct nrf_r if (enable) { struct sockaddr_ll addr; - ret = net_context_get(AF_PACKET, SOCK_RAW, IPPROTO_RAW, &recv_net_context); + ret = net_context_get(AF_PACKET, SOCK_DGRAM, ETH_P_ALL, &recv_net_context); if (ret) { NET_ERR("Failed to allocate recv net context"); goto out; } addr.sll_family = AF_PACKET; - addr.sll_protocol = htons(IPPROTO_RAW); addr.sll_ifindex = net_if_get_by_iface(iface); ret = net_context_bind(recv_net_context, (const struct sockaddr *)&addr, diff --git a/subsys/nrf_security/Kconfig.legacy b/subsys/nrf_security/Kconfig.legacy index 5ac7c23359ca..f1ffe4ec092f 100644 --- a/subsys/nrf_security/Kconfig.legacy +++ b/subsys/nrf_security/Kconfig.legacy @@ -401,7 +401,7 @@ comment "Cipher Selection" config MBEDTLS_CIPHER_MODE_CBC bool "AES-CBC - AES Cipher Block Chaining mode" - default y if !NET_L2_OPENTHREAD + default y if !OPENTHREAD select PSA_WANT_ALG_CBC_NO_PADDING if PSA_CRYPTO_CLIENT select PSA_WANT_KEY_TYPE_AES if PSA_CRYPTO_CLIENT help @@ -414,7 +414,7 @@ menu "CBC cipher padding modes" config MBEDTLS_CIPHER_PADDING_PKCS7 bool prompt "Enable MBEDTLS_CIPHER_PADDING_PKCS7" - default y if !NET_L2_OPENTHREAD + default y if !OPENTHREAD select PSA_WANT_ALG_CBC_PKCS7 if PSA_CRYPTO_CLIENT select PSA_WANT_KEY_TYPE_AES if PSA_CRYPTO_CLIENT help @@ -507,7 +507,7 @@ config MBEDTLS_CCM_C config MBEDTLS_GCM_C bool prompt "AES-GCM - AES Galois/Counter Mode support" - default y if !(NET_L2_OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) + default y if !(OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) select PSA_WANT_ALG_GCM if PSA_CRYPTO_CLIENT select PSA_WANT_KEY_TYPE_AES if PSA_CRYPTO_CLIENT help @@ -517,7 +517,7 @@ config MBEDTLS_GCM_C config MBEDTLS_CHACHA20_C bool prompt "CHACHA20 stream cipher support" - default y if !(NET_L2_OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) + default y if !(OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) select PSA_WANT_ALG_CHACHA20 if PSA_CRYPTO_CLIENT select PSA_WANT_ALG_CHACHA20_POLY1305 if PSA_CRYPTO_CLIENT select PSA_WANT_ALG_STREAM_CIPHER if PSA_CRYPTO_CLIENT @@ -528,7 +528,7 @@ config MBEDTLS_CHACHA20_C config MBEDTLS_POLY1305_C bool prompt "POLY1305 module support" - default y if !(NET_L2_OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) + default y if !(OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) select PSA_WANT_ALG_CHACHA20_POLY1305 if PSA_CRYPTO_CLIENT help Enable the POLY1305 module. @@ -538,7 +538,7 @@ config MBEDTLS_CHACHAPOLY_C bool prompt "CHACHA-POLY module support" depends on (MBEDTLS_CHACHA20_C && MBEDTLS_POLY1305_C) - default y if !(NET_L2_OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) + default y if !(OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) select PSA_WANT_ALG_CHACHA20_POLY1305 if PSA_CRYPTO_CLIENT help Enable the CHACHA-POLY module. @@ -782,7 +782,7 @@ config MBEDTLS_MD5_C config MBEDTLS_SHA1_C bool prompt "SHA-1 hash functionality" - default y if !(NET_L2_OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) + default y if !(OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) select PSA_WANT_ALG_SHA_1 if PSA_CRYPTO_CLIENT help SHA-1 hash functionality. @@ -790,7 +790,7 @@ config MBEDTLS_SHA1_C config MBEDTLS_SHA224_C bool prompt "SHA-224 hash functionality" - default y if !(NET_L2_OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) + default y if !(OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) select PSA_WANT_ALG_SHA_224 if PSA_CRYPTO_CLIENT help SHA-224 hash functionality. @@ -813,7 +813,7 @@ config MBEDTLS_SHA384_C bool prompt "SHA-384 hash functionality" select MBEDTLS_SHA512_C - default y if !(NET_L2_OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) + default y if !(OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) select PSA_WANT_ALG_SHA_384 if PSA_CRYPTO_CLIENT help SHA-384 hash functionality. @@ -821,7 +821,7 @@ config MBEDTLS_SHA384_C config MBEDTLS_SHA512_C bool prompt "SHA-512 hash functionality" - default y if !(NET_L2_OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) + default y if !(OPENTHREAD || MBEDTLS_USE_PSA_CRYPTO) select PSA_WANT_ALG_SHA_512 if PSA_CRYPTO_CLIENT help SHA-512 hash functionality. diff --git a/subsys/nrf_security/Kconfig.tls b/subsys/nrf_security/Kconfig.tls index 36ef5f2f0cdb..6e0f416331a4 100644 --- a/subsys/nrf_security/Kconfig.tls +++ b/subsys/nrf_security/Kconfig.tls @@ -420,47 +420,47 @@ config MBEDTLS_HAS_ECJPAKE_CIPHERSUITE_REQUIREMENTS config MBEDTLS_KEY_EXCHANGE_PSK_ENABLED bool prompt "PSK" - default y if OPENTHREAD_COAPS || !NET_L2_OPENTHREAD + default y if OPENTHREAD_COAPS || !OPENTHREAD depends on MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS config MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED bool prompt "DHE PSK" - default y if !NET_L2_OPENTHREAD + default y if !OPENTHREAD depends on MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_RSA_CIPHERSUITE_REQUIREMENTS config MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED bool prompt "ECDHE PSK" - default y if !NET_L2_OPENTHREAD + default y if !OPENTHREAD depends on MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_ECDH_CIPHERSUITE_REQUIREMENTS config MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED bool prompt "RSA PSK" - default y if !NET_L2_OPENTHREAD + default y if !OPENTHREAD depends on MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_RSA_CIPHERSUITE_REQUIREMENTS config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED bool prompt "RSA" - default y if !NET_L2_OPENTHREAD + default y if !OPENTHREAD depends on MBEDTLS_HAS_RSA_CIPHERSUITE_REQUIREMENTS config MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED bool prompt "DHE RSA" - default y if !NET_L2_OPENTHREAD + default y if !OPENTHREAD depends on MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_RSA_CIPHERSUITE_REQUIREMENTS config MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED bool prompt "ECDHE RSA" - default y if !NET_L2_OPENTHREAD + default y if !OPENTHREAD depends on MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_ECDH_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_RSA_CIPHERSUITE_REQUIREMENTS @@ -468,7 +468,7 @@ config MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED config MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED bool prompt "ECDHE ECDSA" - default y if OPENTHREAD_ECDSA || !NET_L2_OPENTHREAD + default y if OPENTHREAD_ECDSA || !OPENTHREAD depends on MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_ECDH_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_ECDSA_CIPHERSUITE_REQUIREMENTS @@ -476,7 +476,7 @@ config MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED config MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED bool prompt "ECDH ECDSA" - default y if !NET_L2_OPENTHREAD + default y if !OPENTHREAD depends on MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_ECDH_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_ECDSA_CIPHERSUITE_REQUIREMENTS @@ -484,7 +484,7 @@ config MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED config MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED bool prompt "ECDH RSA" - default y if !NET_L2_OPENTHREAD + default y if !OPENTHREAD depends on MBEDTLS_HAS_CIPHER_MODE_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_ECDH_CIPHERSUITE_REQUIREMENTS && \ MBEDTLS_HAS_RSA_CIPHERSUITE_REQUIREMENTS diff --git a/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt b/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt index 35eb09401597..efd4cfe99d10 100644 --- a/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt +++ b/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt @@ -32,14 +32,6 @@ target_link_libraries(oberon_psa_core psa_interface ) -# Disable warnings showing up in Oberon PSA crypto code. -target_compile_options(oberon_psa_core - PRIVATE - -Wno-stringop-overflow - -Wno-stringop-overread - -Wno-strict-aliasing -) - target_compile_definitions(oberon_psa_core PRIVATE BUILDING_MBEDTLS_CRYPTO diff --git a/subsys/nrf_security/src/drivers/cracen/CMakeLists.txt b/subsys/nrf_security/src/drivers/cracen/CMakeLists.txt index 84411a3c5bb8..d6ed509fb30c 100644 --- a/subsys/nrf_security/src/drivers/cracen/CMakeLists.txt +++ b/subsys/nrf_security/src/drivers/cracen/CMakeLists.txt @@ -50,6 +50,10 @@ if(BUILD_INSIDE_TFM) platform_s tfm_sp_log ) +else() + # Ensure zephyr/offsets.h is generated as this is a dependency for CRACEN driver + # But not when building OpenThread because this casues a cyclic dependency + add_dependencies(cracen_psa_driver zephyr_generated_headers) endif() # Link oberon_psa_core with this PSA crypto driver diff --git a/subsys/nrf_security/src/drivers/legacy/CMakeLists.txt b/subsys/nrf_security/src/drivers/legacy/CMakeLists.txt index 4f997f5fc175..79d928ae39b3 100644 --- a/subsys/nrf_security/src/drivers/legacy/CMakeLists.txt +++ b/subsys/nrf_security/src/drivers/legacy/CMakeLists.txt @@ -4,32 +4,34 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# This include resolves include-folders from binaries for legacy API usage +# This resolves include-folders from binaries for legacy API usage # This is not used inside TF-M which doesn't use legacy APIs +add_library(mbedcrypto_legacy_includes INTERFACE) + if(TARGET nrf_cc3xx_platform) - target_include_directories(${mbedcrypto_target} + target_include_directories(mbedcrypto_legacy_includes INTERFACE $ ) endif() if(TARGET nrf_cc3xx_core_imported) - target_include_directories(${mbedcrypto_target} + target_include_directories(mbedcrypto_legacy_includes INTERFACE $ ) endif() if(TARGET mbedcrypto_oberon_imported) - target_include_directories(${mbedcrypto_target} + target_include_directories(mbedcrypto_legacy_includes INTERFACE $ ) endif() if(TARGET mbedcrypto_oberon_mbedtls_imported) - target_include_directories(${mbedcrypto_target} + target_include_directories(mbedcrypto_legacy_includes INTERFACE $ ) diff --git a/subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt b/subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt index 76c811cb6c19..7b5151617983 100644 --- a/subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt +++ b/subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt @@ -48,11 +48,20 @@ add_library(oberon_psa_driver STATIC target_compile_options(oberon_psa_driver PRIVATE -Wno-uninitialized - -Wno-maybe-uninitialized -Wno-unused-variable -Wno-unused-function ) +# Clang does not support -Wno-maybe-uninitialized so the following +# warning option is only used for GNU (GCC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(oberon_psa_driver + PRIVATE + -Wno-maybe-uninitialized + ) +endif() + + target_include_directories(oberon_psa_driver PRIVATE $ diff --git a/subsys/nrf_security/src/zephyr/CMakeLists.txt b/subsys/nrf_security/src/zephyr/CMakeLists.txt index 5423e0d3c1cd..501d4e0f1d97 100644 --- a/subsys/nrf_security/src/zephyr/CMakeLists.txt +++ b/subsys/nrf_security/src/zephyr/CMakeLists.txt @@ -87,7 +87,12 @@ if(TARGET mbedx509) target_link_libraries(mbedtls_external INTERFACE mbedx509) endif() +# Link with legacy include library to get includes for Mbed TLS _ALT files +if(TARGET mbedcrypto_legacy_includes) + zephyr_link_libraries(mbedcrypto_legacy_includes) +endif() + # Link with mbedcrypto library (in NS build or by default) target_link_libraries(mbedtls_external INTERFACE ${mbedcrypto_target}) -zephyr_link_libraries(mbedtls_external) +target_link_libraries(zephyr PRIVATE mbedtls_external) diff --git a/tests/bluetooth/bsim/nrf_auraconfig/app.overlay b/tests/bluetooth/bsim/nrf_auraconfig/app.overlay new file mode 100644 index 000000000000..5092a21e0450 --- /dev/null +++ b/tests/bluetooth/bsim/nrf_auraconfig/app.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + ramdisk0 { + compatible = "zephyr,ram-disk"; + disk-name = "RAM"; + sector-size = <512>; + sector-count = <80>; + }; +}; diff --git a/tests/bluetooth/bsim/nrf_auraconfig/tester/src/nrf_auraconfig_test.c b/tests/bluetooth/bsim/nrf_auraconfig/tester/src/nrf_auraconfig_test.c index b1149c68c2cc..26d0e955da3b 100644 --- a/tests/bluetooth/bsim/nrf_auraconfig/tester/src/nrf_auraconfig_test.c +++ b/tests/bluetooth/bsim/nrf_auraconfig/tester/src/nrf_auraconfig_test.c @@ -640,6 +640,17 @@ static int init(void) LOG_DBG("Bluetooth initialized"); + const struct bt_pacs_register_param pacs_param = { + .snk_pac = true, + .snk_loc = true, + }; + + err = bt_pacs_register(&pacs_param); + if (err) { + LOG_ERR("Could not register PACS (err %d)\n", err); + return err; + } + err = bt_pacs_cap_register(BT_AUDIO_DIR_SINK, &cap); if (err) { LOG_DBG("Capability register failed (err %d)", err); diff --git a/tests/bluetooth/iso/modules/iso_broadcast_sink.c b/tests/bluetooth/iso/modules/iso_broadcast_sink.c index 1dc6fbeecf66..c5bad632f29a 100644 --- a/tests/bluetooth/iso/modules/iso_broadcast_sink.c +++ b/tests/bluetooth/iso/modules/iso_broadcast_sink.c @@ -239,8 +239,19 @@ static void iso_recv(struct bt_iso_chan *chan, const struct bt_iso_recv_info *in static void iso_connected(struct bt_iso_chan *chan) { + const struct bt_iso_chan_path hci_path = { + .pid = BT_ISO_DATA_PATH_HCI, + .format = BT_HCI_CODING_FORMAT_TRANSPARENT, + }; + int err; + LOG_INF("ISO Channel %p connected", chan); k_sem_give(&sem_big_sync); + + err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_CTLR_TO_HOST, &hci_path); + if (err != 0) { + LOG_ERR("Failed to setup ISO RX data path: %d", err); + } } static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason) diff --git a/tests/bluetooth/iso/modules/iso_broadcast_src.c b/tests/bluetooth/iso/modules/iso_broadcast_src.c index 82ef9683127c..74723e78b4b5 100644 --- a/tests/bluetooth/iso/modules/iso_broadcast_src.c +++ b/tests/bluetooth/iso/modules/iso_broadcast_src.c @@ -46,10 +46,21 @@ static K_SEM_DEFINE(tx_sent, 0, 1); static void iso_connected(struct bt_iso_chan *chan) { + const struct bt_iso_chan_path hci_path = { + .pid = BT_ISO_DATA_PATH_HCI, + .format = BT_HCI_CODING_FORMAT_TRANSPARENT, + }; + int err; + LOG_INF("ISO Channel %p connected", chan); seq_num = 0U; + err = bt_iso_setup_data_path(chan, BT_HCI_DATAPATH_DIR_HOST_TO_CTLR, &hci_path); + if (err != 0) { + LOG_ERR("Failed to setup ISO TX data path: %d", err); + } + k_sem_give(&sem_big_cmplt); } diff --git a/tests/bluetooth/iso/prj.conf b/tests/bluetooth/iso/prj.conf index 0c1345b02748..fa82bbcc73fd 100644 --- a/tests/bluetooth/iso/prj.conf +++ b/tests/bluetooth/iso/prj.conf @@ -23,6 +23,7 @@ CONFIG_BT_NUS=y CONFIG_BT_NUS_CLIENT=y CONFIG_BT_GATT_DM=y CONFIG_BT_GATT_CLIENT=y +CONFIG_BT_BUF_EVT_RX_COUNT=11 CONFIG_BT_BUF_ACL_TX_COUNT=10 CONFIG_BT_ATT_PREPARE_COUNT=2 CONFIG_BT_L2CAP_TX_BUF_COUNT=10 @@ -57,7 +58,7 @@ CONFIG_MINIMAL_LIBC=n CONFIG_NEWLIB_LIBC=y # Need to disable devmem shell since it enforces Zephyr's internal version of getopt CONFIG_DEVMEM_SHELL=n -CONFIG_GETOPT=y +CONFIG_POSIX_C_LIB_EXT=y CONFIG_GETOPT_LONG=y CONFIG_SHELL_GETOPT=y diff --git a/tests/drivers/grtc/grtc_clk_output/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/drivers/grtc/grtc_clk_output/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay index 65d7cb1acc11..1027328ec6fa 100644 --- a/tests/drivers/grtc/grtc_clk_output/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay +++ b/tests/drivers/grtc/grtc_clk_output/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay @@ -30,6 +30,6 @@ pinctrl-0 = <&grtc_default>; pinctrl-1 = <&grtc_sleep>; pinctrl-names = "default", "sleep"; - clkout-fast-frequency = <50000>; /* 16 MHz / (160 * 2) */ + clkout-fast-frequency-hz = <50000>; /* 16 MHz / (160 * 2) */ nordic,clockpin-enable = ; }; diff --git a/tests/drivers/grtc/grtc_clk_output/boards/nrf54l15dk_nrf54l15_cpuapp_fast.overlay b/tests/drivers/grtc/grtc_clk_output/boards/nrf54l15dk_nrf54l15_cpuapp_fast.overlay index 24a47f712e38..c511d53d1f48 100644 --- a/tests/drivers/grtc/grtc_clk_output/boards/nrf54l15dk_nrf54l15_cpuapp_fast.overlay +++ b/tests/drivers/grtc/grtc_clk_output/boards/nrf54l15dk_nrf54l15_cpuapp_fast.overlay @@ -30,5 +30,5 @@ pinctrl-0 = <&grtc_default>; pinctrl-1 = <&grtc_sleep>; pinctrl-names = "default", "sleep"; - clkout-fast-frequency = <40000>; /* 16 MHz / (200 * 2) */ + clkout-fast-frequency-hz = <40000>; /* 16 MHz / (200 * 2) */ }; diff --git a/tests/drivers/grtc/grtc_clk_output/boards/nrf54lm20pdk_nrf54lm20a_cpuapp_0_2_0_csp_fast.overlay b/tests/drivers/grtc/grtc_clk_output/boards/nrf54lm20pdk_nrf54lm20a_cpuapp_0_2_0_csp_fast.overlay index 94bcaba4a653..588bae03575e 100644 --- a/tests/drivers/grtc/grtc_clk_output/boards/nrf54lm20pdk_nrf54lm20a_cpuapp_0_2_0_csp_fast.overlay +++ b/tests/drivers/grtc/grtc_clk_output/boards/nrf54lm20pdk_nrf54lm20a_cpuapp_0_2_0_csp_fast.overlay @@ -26,5 +26,5 @@ pinctrl-0 = <&grtc_default>; pinctrl-1 = <&grtc_sleep>; pinctrl-names = "default", "sleep"; - clkout-fast-frequency = <32000>; /* 16 MHz / (250 * 2) */ + clkout-fast-frequency-hz = <32000>; /* 16 MHz / (250 * 2) */ }; diff --git a/tests/drivers/grtc/grtc_clk_output/boards/nrf54lm20pdk_nrf54lm20a_cpuapp_fast.overlay b/tests/drivers/grtc/grtc_clk_output/boards/nrf54lm20pdk_nrf54lm20a_cpuapp_fast.overlay index 94bcaba4a653..588bae03575e 100644 --- a/tests/drivers/grtc/grtc_clk_output/boards/nrf54lm20pdk_nrf54lm20a_cpuapp_fast.overlay +++ b/tests/drivers/grtc/grtc_clk_output/boards/nrf54lm20pdk_nrf54lm20a_cpuapp_fast.overlay @@ -26,5 +26,5 @@ pinctrl-0 = <&grtc_default>; pinctrl-1 = <&grtc_sleep>; pinctrl-names = "default", "sleep"; - clkout-fast-frequency = <32000>; /* 16 MHz / (250 * 2) */ + clkout-fast-frequency-hz = <32000>; /* 16 MHz / (250 * 2) */ }; diff --git a/tests/drivers/nrf_wifi/raw_tx_rx/prj.conf b/tests/drivers/nrf_wifi/raw_tx_rx/prj.conf index 2a5729150682..9944d05ce225 100644 --- a/tests/drivers/nrf_wifi/raw_tx_rx/prj.conf +++ b/tests/drivers/nrf_wifi/raw_tx_rx/prj.conf @@ -47,7 +47,7 @@ CONFIG_NET_RX_STACK_SIZE=4096 # Logging CONFIG_LOG=y CONFIG_LOG_MODE_IMMEDIATE=y -CONFIG_POSIX_CLOCK=y +CONFIG_POSIX_TIMERS=y CONFIG_POSIX_API=y # printing of scan results puts pressure on queues in new locking diff --git a/tests/lib/app_jwt/src/main.c b/tests/lib/app_jwt/src/main.c index 86837dff2ecc..844a3b9da9e0 100644 --- a/tests/lib/app_jwt/src/main.c +++ b/tests/lib/app_jwt/src/main.c @@ -31,21 +31,21 @@ static psa_key_id_t kid; #define EXPECTED_JWT_MIN \ "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9." \ - "eyJzdWIiOiJucmYtMzU4Mjk5ODQwMTIzNDU2IiwiZXhwIjoxNzM5ODgxODg5fQ.cYGNV8-" \ - "DxTKyV3MlsSALKlva3Aarx3u0Owj8cxAH5tm3WRPLC8-xZtTW0djJp-j3V8sU1Mt_xjm3OIzMx4RNcw" + "eyJzdWIiOiJucmYtMzU4Mjk5ODQwMTIzNDU2IiwiZXhwIjoxNzM5ODgxODg5fQ." \ + "OG3Ug9iPJmKYoV5AbhlVuxXxRloNL80QsJmBexR40f5BVISYg4FjXc8FdVnCLMaRlMGTKRd5cFaST4_DB21Vkw" #define EXPECTED_JWT_MIN_UUID \ "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9." \ "eyJzdWIiOiI2YzBmMTIyNi1mNTA2LTExZWYtYTViYi05Mzc2M2I0YmRmMTEiLCJleHAiOjE3Mzk4ODE4ODl9." \ - "oIDg_ptVr7EP0Bg4qxmj5jh53d30FaBtzHOdeQJXyakz9_WQALqPXIrPl4immMvYhgcQD12KWxFiHh4YPjhBaw" + "je3nWh-f5IaBsypVQReXZY1z10gYAwyfFckhkXDAJOK8bDpdS3UVNRpN5eBBGph-RVEgqZG5RhRLD8gENa7a0w" #define EXPECTED_JWT_NRF91 \ "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiIsImtpZCI6IjJhNTNkMjBmODcxYjFkZWVhYjUzYTFiZmNlMDJhZTVk" \ "NWVmYzEyZjFlMGY0YjVjZTY2YzRhMWMyOGRhZDExMmMifQ." \ "eyJpYXQiOjE3Mzk4ODEyODksImp0aSI6Im5SRjkxNjAuNTY0YWIzNTYtZjUwNS0xMWVmLWIyODctYjc2OTAyMWQ1" \ "ZmQ2LjlmZjE3NTI0OWFmZTQ4OTQxMiIsImlzcyI6Im5SRjkxNjAuNTY0YWIzNTYtZjUwNS0xMWVmLWIyODctYjc2" \ - "OTAyMWQ1ZmQ2Iiwic3ViIjoibnJmLTM1ODI5OTg0MDEyMzQ1NiIsImV4cCI6MTczOTg4MTg4OX0." \ - "i3xPhJ1dQw2bb_2OgaAZ8w-IP_EpLiDgt97agpAdIsWDSdzCWd2iwwCpV937mAyqXWe-eoc-VjnBlWfXk5nXqQ" + "OTAyMWQ1ZmQ2Iiwic3ViIjoibnJmLTM1ODI5OTg0MDEyMzQ1NiIsImV4cCI6MTczOTg4MTg4OX0.YhaArF-_" \ + "7NNOd4ngnTT_KCQCcNfarxDlDuRvsSbE_RX_r5HC1nXduc4KDjc-7FJ9NUaKNcPAHg3BwJ7kOZ3NAQ" #define EC_PRV_KEY \ "-----BEGIN PRIVATE KEY-----\n" \ diff --git a/tests/lib/hw_id/src/main.c b/tests/lib/hw_id/src/main.c index b07a0a9775d7..807090e8898d 100644 --- a/tests/lib/hw_id/src/main.c +++ b/tests/lib/hw_id/src/main.c @@ -28,11 +28,10 @@ FAKE_VALUE_FUNC(struct net_if *, net_if_get_default); FAKE_VALUE_FUNC(ssize_t, z_impl_hwinfo_get_device_id, uint8_t *, size_t); FAKE_VALUE_FUNC_VARARG(int, nrf_modem_at_cmd, void *, size_t, const char *, ...); -static uint8_t link_addr[6] = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66}; static struct net_if_dev net_if_dev_example = { .link_addr = { - .addr = link_addr, - .len = ARRAY_SIZE(link_addr) + .addr = {0x11, 0x22, 0x33, 0x44, 0x55, 0x66}, + .len = 6, } }; static struct net_if net_if_example = { diff --git a/tests/lib/location/CMakeLists.txt b/tests/lib/location/CMakeLists.txt index add304d2a4ca..dc7b5facb95f 100644 --- a/tests/lib/location/CMakeLists.txt +++ b/tests/lib/location/CMakeLists.txt @@ -29,15 +29,20 @@ cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/net/nrf_cloud_rest.h) # that CMock is not able to parse properly. cmock_handle(${ZEPHYR_BASE}/include/zephyr/net/net_if.h FUNC_EXCLUDE ".*net_if_send_data" + FUNC_EXCLUDE ".*net_if_try_send_data" FUNC_EXCLUDE ".*net_if_recv_data" FUNC_EXCLUDE ".*net_if_queue_tx" + FUNC_EXCLUDE ".*net_if_try_queue_tx" FUNC_EXCLUDE ".*net_if_register_timestamp_cb" FUNC_EXCLUDE ".*net_if_call_timestamp_cb" FUNC_EXCLUDE ".*net_if_add_tx_timestamp" FUNC_EXCLUDE ".*net_if_ipv4_get_netmask" FUNC_EXCLUDE ".*net_if_ipv4_set_netmask" WORD_EXCLUDE ".*deprecated.*" - WORD_EXCLUDE ".*struct net_pkt.*") + WORD_EXCLUDE ".*net_if_send_data.*" + WORD_EXCLUDE ".*net_if_try_send_data.*" + WORD_EXCLUDE ".*net_if_try_queue_tx.*" + WORD_EXCLUDE ".*net_if_register_timestamp_cb.*") cmock_handle(${ZEPHYR_BASE}/include/zephyr/net/net_mgmt.h FUNC_EXCLUDE ".*net_mgmt_event_notify" FUNC_EXCLUDE ".*net_mgmt_event_notify_with_info" diff --git a/tests/subsys/dfu/dfu_target_stream/src/main.c b/tests/subsys/dfu/dfu_target_stream/src/main.c index 93632e434345..f262cb355c2a 100644 --- a/tests/subsys/dfu/dfu_target_stream/src/main.c +++ b/tests/subsys/dfu/dfu_target_stream/src/main.c @@ -200,11 +200,6 @@ ZTEST(dfu_target_stream_test, test_dfu_target_stream_save_progress) err = dfu_target_stream_write(write_buf, 0); zassert_equal(err, 0, "Unexpected failure: %d", err); - /* Store the last erased page start offset from before load. */ - ctx = dfu_target_stream_get_stream(); - zassert_not_null(ctx, "Expected non-null ctx."); - erased_page_offset = ctx->last_erased_page_start_offset; - /* Re-initialize to reload the progress */ err = dfu_target_stream_done(false); zassert_equal(err, 0, "Unexpected failure: %d", err); @@ -216,7 +211,7 @@ ZTEST(dfu_target_stream_test, test_dfu_target_stream_save_progress) /* Check that last erased page offset was set correctly when loading */ ctx = dfu_target_stream_get_stream(); zassert_not_null(ctx, "Expected non-null ctx."); - zassert_equal(erased_page_offset, ctx->last_erased_page_start_offset, + zassert_equal(0, ctx->erased_up_to, "Expected last erased page offset to be unchanged."); /* Next, check that writes that end up right after a page boundary @@ -227,10 +222,10 @@ ZTEST(dfu_target_stream_test, test_dfu_target_stream_save_progress) err = dfu_target_stream_write(write_buf, page_size); zassert_equal(err, 0, "Unexpected failure: %d", err); - /* Store the last erased page start offset from before load */ + /* Storea how far the erase went so far */ ctx = dfu_target_stream_get_stream(); zassert_not_null(ctx, "Expected non-null ctx."); - erased_page_offset = ctx->last_erased_page_start_offset; + erased_page_offset = ctx->erased_up_to; /* Verify that at least one page was erased. */ zassert_true(erased_page_offset >= 0, "Expected pages to be erased."); @@ -241,12 +236,6 @@ ZTEST(dfu_target_stream_test, test_dfu_target_stream_save_progress) err = DFU_TARGET_STREAM_INIT(TEST_ID_2, fdev, sbuf, sizeof(sbuf), FLASH_BASE, FLASH_AVAILABLE, NULL); zassert_equal(err, 0, "Unexpected failure: %d", err); - - /* Check that last erased page offset was set correctly when loading */ - ctx = dfu_target_stream_get_stream(); - zassert_not_null(ctx, "Expected non-null ctx."); - zassert_equal(erased_page_offset, ctx->last_erased_page_start_offset, - "Expected last erased page offset to be unchanged."); } static size_t get_flash_page_size(const struct device *dev) diff --git a/tests/subsys/net/lib/download_client/prj.conf b/tests/subsys/net/lib/download_client/prj.conf index 5efcf4c5ba4c..2f3b125160c0 100644 --- a/tests/subsys/net/lib/download_client/prj.conf +++ b/tests/subsys/net/lib/download_client/prj.conf @@ -15,7 +15,6 @@ CONFIG_NET_IPV4=y CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_OFFLOAD=y CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=2048 -CONFIG_PIPES=y CONFIG_POSIX_API=y CONFIG_COAP=n diff --git a/tests/subsys/net/lib/download_client/src/main.c b/tests/subsys/net/lib/download_client/src/main.c index 2e14f3357add..6013cc66d107 100644 --- a/tests/subsys/net/lib/download_client/src/main.c +++ b/tests/subsys/net/lib/download_client/src/main.c @@ -13,7 +13,6 @@ #include "mock/socket.h" #include "mock/dl_coap.h" -K_PIPE_DEFINE(event_pipe, 10, _Alignof(struct download_client_evt)); static struct download_client client; static const struct sockaddr_in addr_coap_me_http = { .sin_family = AF_INET, @@ -26,16 +25,64 @@ static const struct sockaddr_in addr_example_com = { .sin_addr.s4_addr = {93, 184, 216, 34}, }; -static int download_client_callback(const struct download_client_evt *event) +struct pipe { + struct download_client_evt data[10]; + uint8_t wr_idx; + uint8_t rd_idx; +}; + +static struct pipe event_pipe; +K_SEM_DEFINE(pipe_sem, 0, 10); + +static void pipe_reset(struct pipe *pipe) +{ + memset(pipe, 0, sizeof(struct pipe)); +} + +static int pipe_put(struct pipe *pipe, const struct download_client_evt *evt) +{ + if (k_sem_count_get(&pipe_sem) >= 10) { + printk("Pipe is full! Please check size!"); + return -ENOSPC; + } + + memcpy(&pipe->data[pipe->wr_idx], evt, sizeof(struct download_client_evt)); + + pipe->wr_idx++; + pipe->wr_idx = CLAMP(pipe->wr_idx, 0, + (sizeof(pipe->data) / sizeof(struct download_client_evt)) - 1); + + k_sem_give(&pipe_sem); + + return 0; +} + +static int pipe_get(struct pipe *pipe, struct download_client_evt *evt, k_timeout_t timeo) { - size_t written; + int err; + + err = k_sem_take(&pipe_sem, timeo); + if (err) { + return err; + } + + memcpy(evt, &pipe->data[pipe->rd_idx], sizeof(struct download_client_evt)); + pipe->rd_idx++; + pipe->rd_idx = CLAMP(pipe->rd_idx, 0, + (sizeof(pipe->data) / sizeof(struct download_client_evt)) - 1); + + return 0; +} + +static int download_client_callback(const struct download_client_evt *event) +{ if (event == NULL) { return -EINVAL; } printk("event: %d\n", event->id); - k_pipe_put(&event_pipe, (void *)event, sizeof(*event), &written, sizeof(*event), K_FOREVER); + pipe_put(&event_pipe, event); return 0; } @@ -52,13 +99,11 @@ static void mock_return_values(const char *func, int32_t *val, size_t len) static struct download_client_evt wait_for_event(enum download_client_evt_id event, k_timeout_t timeout) { - size_t read; struct download_client_evt evt; int err; while (true) { - err = k_pipe_get(&event_pipe, &evt, sizeof(evt), &read, sizeof(evt), - timeout); + err = pipe_get(&event_pipe, &evt, timeout); zassert_ok(err); if (evt.id == event) { break; @@ -70,11 +115,10 @@ static struct download_client_evt wait_for_event(enum download_client_evt_id eve static struct download_client_evt get_next_event(k_timeout_t timeout) { - size_t read; struct download_client_evt evt; int err; - err = k_pipe_get(&event_pipe, &evt, sizeof(evt), &read, sizeof(evt), timeout); + err = pipe_get(&event_pipe, &evt, timeout); zassert_ok(err); return evt; } @@ -95,7 +139,7 @@ static void init(void) zassert_ok(err, NULL); initialized = true; } - k_pipe_flush(&event_pipe); + pipe_reset(&event_pipe); } static void dl_coap_start(void) diff --git a/tests/subsys/net/lib/downloader/CMakeLists.txt b/tests/subsys/net/lib/downloader/CMakeLists.txt index f3a9b61c6c18..9f4bfa786a21 100644 --- a/tests/subsys/net/lib/downloader/CMakeLists.txt +++ b/tests/subsys/net/lib/downloader/CMakeLists.txt @@ -45,4 +45,9 @@ target_compile_options(app -DCONFIG_COAP_BACKOFF_PERCENT=5 -DCONFIG_COAP_BLOCK_SIZE=5 -DCONFIG_DOWNLOADER_MAX_REDIRECTS=1 + -DCONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=2 + -DCONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=1 + -DCONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2 + -DCONFIG_NET_IF_MCAST_IPV4_ADDR_COUNT=1 + -DCONFIG_NET_IF_IPV6_PREFIX_COUNT=2 ) diff --git a/tests/subsys/net/lib/downloader/prj.conf b/tests/subsys/net/lib/downloader/prj.conf index 845e0c0a40b5..3bf790e9f33b 100644 --- a/tests/subsys/net/lib/downloader/prj.conf +++ b/tests/subsys/net/lib/downloader/prj.conf @@ -4,4 +4,3 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_UNITY=y -CONFIG_PIPES=y diff --git a/tests/subsys/net/lib/downloader/src/main.c b/tests/subsys/net/lib/downloader/src/main.c index c0160dbfb37c..8cd6a3035286 100644 --- a/tests/subsys/net/lib/downloader/src/main.c +++ b/tests/subsys/net/lib/downloader/src/main.c @@ -1123,8 +1123,54 @@ struct coap_transmission_parameters coap_get_transmission_parameters_ok(void) return coap_transmission_params; } -K_PIPE_DEFINE(event_pipe, 10*sizeof(struct downloader_evt), - _Alignof(struct downloader_evt)); +struct pipe { + struct downloader_evt data[10]; + uint8_t wr_idx; + uint8_t rd_idx; +}; + +static struct pipe event_pipe; +K_SEM_DEFINE(pipe_sem, 0, 10); + +static void pipe_reset(struct pipe *pipe) +{ + memset(pipe, 0, sizeof(struct pipe)); +} + +static int pipe_put(struct pipe *pipe, const struct downloader_evt *evt) +{ + if (k_sem_count_get(&pipe_sem) >= 10) { + return -ENOSPC; + } + + memcpy(&pipe->data[pipe->wr_idx], evt, sizeof(struct downloader_evt)); + + pipe->wr_idx++; + pipe->wr_idx = CLAMP(pipe->wr_idx, 0, + (sizeof(pipe->data) / sizeof(struct downloader_evt)) - 1); + + k_sem_give(&pipe_sem); + + return 0; +} + +static int pipe_get(struct pipe *pipe, struct downloader_evt *evt, k_timeout_t timeo) +{ + int err; + + err = k_sem_take(&pipe_sem, timeo); + if (err) { + return err; + } + + memcpy(evt, &pipe->data[pipe->rd_idx], sizeof(struct downloader_evt)); + + pipe->rd_idx++; + pipe->rd_idx = CLAMP(pipe->rd_idx, 0, + (sizeof(pipe->data) / sizeof(struct downloader_evt)) - 1); + + return 0; +} static const char *dl_event_id_str(int evt_id) { @@ -1141,8 +1187,6 @@ static const char *dl_event_id_str(int evt_id) static int dl_callback(const struct downloader_evt *event) { - size_t written; - TEST_ASSERT(event != NULL); printk("event: %s ", dl_event_id_str(event->id)); @@ -1156,15 +1200,13 @@ static int dl_callback(const struct downloader_evt *event) printk("\n"); } - k_pipe_put(&event_pipe, (void *)event, sizeof(*event), &written, sizeof(*event), K_FOREVER); + pipe_put(&event_pipe, event); return 0; } static int dl_callback_abort(const struct downloader_evt *event) { - size_t written; - TEST_ASSERT(event != NULL); printk("event: %s\n", dl_event_id_str(event->id)); @@ -1172,7 +1214,7 @@ static int dl_callback_abort(const struct downloader_evt *event) /* avoid spamming error events during development */ k_sleep(K_MSEC(100)); } - k_pipe_put(&event_pipe, (void *)event, sizeof(*event), &written, sizeof(*event), K_FOREVER); + pipe_put(&event_pipe, event); return 1; /* stop download*/ } @@ -1180,13 +1222,11 @@ static int dl_callback_abort(const struct downloader_evt *event) static struct downloader_evt dl_wait_for_event(enum downloader_evt_id event, k_timeout_t timeout) { - size_t read; struct downloader_evt evt; int err; while (true) { - err = k_pipe_get(&event_pipe, &evt, sizeof(evt), &read, sizeof(evt), - timeout); + err = pipe_get(&event_pipe, &evt, K_FOREVER); TEST_ASSERT_EQUAL(0, err); if (evt.id == event) { break; @@ -2455,7 +2495,7 @@ void setUp(void) RESET_FAKE(coap_get_transmission_parameters); RESET_FAKE(coap_pending_init); - k_pipe_flush(&event_pipe); + pipe_reset(&event_pipe); } void tearDown(void) diff --git a/tests/subsys/net/lib/nrf_provisioning/src/coap.c b/tests/subsys/net/lib/nrf_provisioning/src/coap.c index 261633a42ba5..2bc497ed08a5 100644 --- a/tests/subsys/net/lib/nrf_provisioning/src/coap.c +++ b/tests/subsys/net/lib/nrf_provisioning/src/coap.c @@ -416,6 +416,8 @@ void test_coap_auth_valid(void) .connect_socket = -1, }; + struct coap_client_option block2_option = {}; + __cmock_modem_info_string_get_ExpectAnyArgsAndReturn(sizeof(MFW_VER)); __cmock_modem_info_string_get_ReturnArrayThruPtr_buf(MFW_VER, strlen(MFW_VER) + 1); @@ -427,6 +429,7 @@ void test_coap_auth_valid(void) __cmock_coap_client_req_AddCallback(coap_client_auth_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); nrf_provisioning_coap_req(&coap_ctx); } @@ -516,6 +519,8 @@ void test_coap_no_more_commands(void) .connect_socket = -1, }; + struct coap_client_option block2_option = {}; + __cmock_modem_info_string_get_ExpectAnyArgsAndReturn(sizeof(MFW_VER)); __cmock_modem_info_string_get_ReturnArrayThruPtr_buf(MFW_VER, strlen(MFW_VER) + 1); @@ -527,6 +532,7 @@ void test_coap_no_more_commands(void) __cmock_coap_client_req_AddCallback(coap_client_no_commands_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); int ret = nrf_provisioning_coap_req(&coap_ctx); @@ -542,6 +548,8 @@ void test_coap_cmds_valid_path(void) .connect_socket = -1, }; + struct coap_client_option block2_option = {}; + __cmock_modem_info_string_get_ExpectAnyArgsAndReturn(sizeof(MFW_VER)); __cmock_modem_info_string_get_ReturnArrayThruPtr_buf(MFW_VER, strlen(MFW_VER) + 1); @@ -553,6 +561,7 @@ void test_coap_cmds_valid_path(void) __cmock_coap_client_req_AddCallback(coap_client_cmds_valid_path_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); int ret = nrf_provisioning_coap_req(&coap_ctx); @@ -569,6 +578,8 @@ void test_coap_cmds_bad_request(void) .connect_socket = -1, }; + struct coap_client_option block2_option = {}; + __cmock_modem_info_string_get_ExpectAnyArgsAndReturn(sizeof(MFW_VER)); __cmock_modem_info_string_get_ReturnArrayThruPtr_buf(MFW_VER, strlen(MFW_VER) + 1); @@ -580,6 +591,7 @@ void test_coap_cmds_bad_request(void) __cmock_coap_client_req_AddCallback(coap_client_cmds_bad_request_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); int ret = nrf_provisioning_coap_req(&coap_ctx); @@ -596,6 +608,8 @@ void test_coap_cmds_server_error(void) .connect_socket = -1, }; + struct coap_client_option block2_option = {}; + __cmock_modem_info_string_get_ExpectAnyArgsAndReturn(sizeof(MFW_VER)); __cmock_modem_info_string_get_ReturnArrayThruPtr_buf(MFW_VER, strlen(MFW_VER) + 1); @@ -607,6 +621,7 @@ void test_coap_cmds_server_error(void) __cmock_coap_client_req_AddCallback(coap_client_cmds_server_error_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); int ret = nrf_provisioning_coap_req(&coap_ctx); @@ -623,6 +638,8 @@ void test_coap_cmds_unsupported_code(void) .connect_socket = -1, }; + struct coap_client_option block2_option = {}; + __cmock_modem_info_string_get_ExpectAnyArgsAndReturn(sizeof(MFW_VER)); __cmock_modem_info_string_get_ReturnArrayThruPtr_buf(MFW_VER, strlen(MFW_VER) + 1); @@ -634,6 +651,7 @@ void test_coap_cmds_unsupported_code(void) __cmock_coap_client_req_AddCallback(coap_client_cmds_unsupported_code_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); int ret = nrf_provisioning_coap_req(&coap_ctx); @@ -735,6 +753,8 @@ void test_provisioning_task_valid(void) static struct nrf_provisioning_mm_change mm = {.cb = dummy_nrf_provisioning_modem_mode_cb, .user_data = NULL}; + struct coap_client_option block2_option = {}; + k_work_init_delayable(&trigger_data.work, provisioning_condvar_signal); __cmock_modem_key_mgmt_exists_AddCallback(modem_key_mgmt_exists_true); @@ -775,6 +795,8 @@ void test_provisioning_task_valid(void) CONFIG_NRF_PROVISIONING_JWT_MAX_VALID_TIME_S, tok_jwt_plain, strlen(tok_jwt_plain) + 1); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); + __cmock_coap_client_req_AddCallback(coap_client_ok_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); @@ -804,6 +826,8 @@ void test_provisioning_commands(void) static struct nrf_provisioning_mm_change mm = {.cb = dummy_nrf_provisioning_modem_mode_cb, .user_data = NULL}; + struct coap_client_option block2_option = {}; + k_work_init_delayable(&trigger_data.work, provisioning_condvar_signal); __cmock_modem_key_mgmt_exists_AddCallback(modem_key_mgmt_exists_true); @@ -853,6 +877,8 @@ void test_provisioning_commands(void) CONFIG_NRF_PROVISIONING_JWT_MAX_VALID_TIME_S, tok_jwt_plain, strlen(tok_jwt_plain) + 1); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); + __cmock_coap_client_req_AddCallback(coap_client_commands_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); @@ -889,6 +915,8 @@ void test_coap_rps_bad_request(void) struct nrf_provisioning_mm_change mm = {.cb = dummy_nrf_provisioning_modem_mode_cb, .user_data = NULL}; + struct coap_client_option block2_option = {}; + __cmock_lte_lc_func_mode_get_IgnoreAndReturn(0); __cmock_nrf_provisioning_at_cmee_enable_ExpectAndReturn(0); __cmock_nrf_provisioning_at_cmee_control_ExpectAnyArgsAndReturn(0); @@ -904,6 +932,8 @@ void test_coap_rps_bad_request(void) CONFIG_NRF_PROVISIONING_JWT_MAX_VALID_TIME_S, tok_jwt_plain, strlen(tok_jwt_plain) + 1); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); + __cmock_coap_client_req_AddCallback(coap_client_rsp_bad_request_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); @@ -927,6 +957,8 @@ void test_coap_rsp_server_error(void) struct nrf_provisioning_mm_change mm = {.cb = dummy_nrf_provisioning_modem_mode_cb, .user_data = NULL}; + struct coap_client_option block2_option = {}; + __cmock_lte_lc_func_mode_get_IgnoreAndReturn(0); __cmock_nrf_provisioning_at_cmee_enable_ExpectAndReturn(0); __cmock_nrf_provisioning_at_cmee_control_ExpectAnyArgsAndReturn(0); @@ -942,6 +974,8 @@ void test_coap_rsp_server_error(void) CONFIG_NRF_PROVISIONING_JWT_MAX_VALID_TIME_S, tok_jwt_plain, strlen(tok_jwt_plain) + 1); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); + __cmock_coap_client_req_AddCallback(coap_client_rsp_server_error_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); @@ -965,6 +999,8 @@ void test_coap_rsp_unsupported_code(void) struct nrf_provisioning_mm_change mm = {.cb = dummy_nrf_provisioning_modem_mode_cb, .user_data = NULL}; + struct coap_client_option block2_option = {}; + __cmock_lte_lc_func_mode_get_IgnoreAndReturn(0); __cmock_nrf_provisioning_at_cmee_enable_ExpectAndReturn(0); __cmock_nrf_provisioning_at_cmee_control_ExpectAnyArgsAndReturn(0); @@ -980,6 +1016,8 @@ void test_coap_rsp_unsupported_code(void) CONFIG_NRF_PROVISIONING_JWT_MAX_VALID_TIME_S, tok_jwt_plain, strlen(tok_jwt_plain) + 1); + __cmock_coap_client_option_initial_block2_CMockIgnoreAndReturn(0, block2_option); + __cmock_coap_client_req_AddCallback(coap_client_rsp_unsupported_code_cb); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); __cmock_coap_client_req_ExpectAnyArgsAndReturn(0); diff --git a/west.yml b/west.yml index 757bf01b3231..3f8ab90e73a7 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 12907948f027e64dacd95d0dfff26270bf08f6b5 + revision: 9999e1ca91c7705a1d53e5eed570c8007ac3440a import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -127,7 +127,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: 46d7e22cf34a0682585aee529f7af1b613e415d2 + revision: 5afc0aab0cdd3034861a89a64238d8fff80c6a4d path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR @@ -156,7 +156,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: 73537ddf6c29f81d23e5c8e576c127c723dee2b1 + revision: 9229594d0853fdd1def09c192325ea04ce2efd9b west-commands: scripts/west/west-commands.yml submodules: - name: nlio