Skip to content

Commit 6ac2239

Browse files
committed
manifest: Update to v3.3.0-preview2 NCS with upmerge
Update sdk-nrf and adapt to the 2026.01.12 upmerge: nrfconnect/sdk-nrf#26468 Signed-off-by: Tommi Rantanen <tommi.rantanen@nordicsemi.no>
1 parent 79e9caa commit 6ac2239

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.github/workflows/compliance.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ jobs:
5858
-e KconfigBasicNoModules \
5959
-e ClangFormat \
6060
-e Ruff \
61-
-e SysbuildKconfigBasicNoModules
61+
-e SysbuildKconfigBasicNoModules \
62+
-e LicenseAndCopyrightCheck
6263
6364
- name: Process Compliance Results
6465
working-directory: serial_modem

app/prj.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ CONFIG_AT_MONITOR=y
119119
# Eventfd's to use with AT-commands.
120120
CONFIG_ZVFS_EVENTFD_MAX=2
121121

122-
# Disable TF-M logging.
123-
# TF-M log sending will block until remote end is ready, when HWFC is used on UART1.
122+
# TF-M
123+
CONFIG_TFM_PROFILE_TYPE_MINIMAL=y
124+
# Disable TF-M log sending as it will block until remote end is ready, when HWFC is used on UART1.
124125
CONFIG_TFM_LOG_LEVEL_SILENCE=y
125126

126127
#

app/src/sm_uart_handler.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static void rx_process(struct k_work *work)
227227
} else {
228228
rx_event.len -= processed;
229229
rx_event.buf += processed;
230-
err = k_msgq_put_front(&rx_event_queue, &rx_event, K_NO_WAIT);
230+
err = k_msgq_put_front(&rx_event_queue, &rx_event);
231231
if (err) {
232232
LOG_ERR("RX event queue full, dropped %zu bytes", rx_event.len);
233233
rx_buf_unref(rx_event.buf);
@@ -802,7 +802,7 @@ static int pipe_receive(void *data, uint8_t *buf, size_t size)
802802
} else {
803803
rx_event.len -= copy_size;
804804
rx_event.buf += copy_size;
805-
err = k_msgq_put_front(&rx_event_queue, &rx_event, K_NO_WAIT);
805+
err = k_msgq_put_front(&rx_event_queue, &rx_event);
806806
if (err) {
807807
LOG_ERR("RX event queue full, dropped %zu bytes", rx_event.len);
808808
rx_buf_unref(rx_event.buf);

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ manifest:
1313
- name: nrf
1414
remote: ncs
1515
repo-path: sdk-nrf
16-
revision: v3.2.2
16+
revision: v3.3.0-preview2
1717
import: true

0 commit comments

Comments
 (0)