Skip to content

manifest: update collab-nrfx-4.0 to have UARTE reworked #25130

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 30, 2025
+23 −153
Merged

manifest: update collab-nrfx-4.0 to have UARTE reworked #25130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf2b6ac
manifest: update collab-nrfx-4.0 to have UARTE reworked
mstasiaknordic Oct 20, 2025
fdaf41d
applications: remove UARTE instance config symbols
mstasiaknordic Oct 20, 2025
6166db3
modules: remove UARTE instance config symbols
mstasiaknordic Oct 20, 2025
3b5603c
samples: remove UARTE instance config symbols
mstasiaknordic Oct 20, 2025
543b20f
tests: remove UARTE instance config symbols
mstasiaknordic Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions applications/connectivity_bridge/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ CONFIG_UART_1_NRF_HW_ASYNC=y
CONFIG_UART_0_NRF_HW_ASYNC_TIMER=1
CONFIG_UART_1_NRF_HW_ASYNC_TIMER=2
CONFIG_UART_USE_RUNTIME_CONFIGURE=y
CONFIG_NRFX_UARTE0=y
CONFIG_NRFX_UARTE1=y
CONFIG_NRFX_UARTE=y
CONFIG_NRFX_TIMER1=y
CONFIG_NRFX_TIMER2=y
CONFIG_NRFX_PPI=y
Expand Down
14 changes: 7 additions & 7 deletions modules/trusted-firmware-m/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,43 +397,43 @@ config TFM_SECURE_UART0
bool "TF-M logging will use UART0 instance"
depends on $(dt_nodelabel_has_prop,uart0,pinctrl-names)
select NRF_UARTE0_SECURE
select TFM_SECURE_UART_SHARE_INSTANCE if NRFX_UARTE0 || HAS_HW_NRF_UARTE0
select TFM_SECURE_UART_SHARE_INSTANCE if HAS_HW_NRF_UARTE0

config TFM_SECURE_UART1
bool "TF-M logging will use UART1 instance"
depends on $(dt_nodelabel_has_prop,uart1,pinctrl-names)
select NRF_UARTE1_SECURE
select TFM_SECURE_UART_SHARE_INSTANCE if NRFX_UARTE1 || HAS_HW_NRF_UARTE1
select TFM_SECURE_UART_SHARE_INSTANCE if HAS_HW_NRF_UARTE1

config TFM_SECURE_UART00
bool "TF-M logging will use UART00 instance"
depends on $(dt_nodelabel_has_prop,uart00,pinctrl-names)
select NRF_UARTE00_SECURE
select TFM_SECURE_UART_SHARE_INSTANCE if NRFX_UARTE00 || HAS_HW_NRF_UARTE00
select TFM_SECURE_UART_SHARE_INSTANCE if HAS_HW_NRF_UARTE00

config TFM_SECURE_UART20
bool "TF-M logging will use UART20 instance"
depends on $(dt_nodelabel_has_prop,uart20,pinctrl-names)
select NRF_UARTE20_SECURE
select TFM_SECURE_UART_SHARE_INSTANCE if NRFX_UARTE20 || HAS_HW_NRF_UARTE20
select TFM_SECURE_UART_SHARE_INSTANCE if HAS_HW_NRF_UARTE20

config TFM_SECURE_UART21
bool "TF-M logging will use UART21 instance"
depends on $(dt_nodelabel_has_prop,uart21,pinctrl-names)
select NRF_UARTE21_SECURE
select TFM_SECURE_UART_SHARE_INSTANCE if NRFX_UARTE21 || HAS_HW_NRF_UARTE21
select TFM_SECURE_UART_SHARE_INSTANCE if HAS_HW_NRF_UARTE21

config TFM_SECURE_UART22
bool "TF-M logging will use UART22 instance"
depends on $(dt_nodelabel_has_prop,uart22,pinctrl-names)
select NRF_UARTE22_SECURE
select TFM_SECURE_UART_SHARE_INSTANCE if NRFX_UARTE22 || HAS_HW_NRF_UARTE22
select TFM_SECURE_UART_SHARE_INSTANCE if HAS_HW_NRF_UARTE22

config TFM_SECURE_UART30
bool "TF-M logging will use UART30 instance"
depends on $(dt_nodelabel_has_prop,uart30,pinctrl-names)
select NRF_UARTE30_SECURE
select TFM_SECURE_UART_SHARE_INSTANCE if NRFX_UARTE30 || HAS_HW_NRF_UARTE30
select TFM_SECURE_UART_SHARE_INSTANCE if HAS_HW_NRF_UARTE30

endchoice

Expand Down
3 changes: 0 additions & 3 deletions samples/bluetooth/central_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable the unsupported driver
CONFIG_NRFX_UARTE0=n

# Don't get entropy from HCI on nRF54H20 devices
CONFIG_BT_HOST_CRYPTO_PRNG=y
CONFIG_ENTROPY_BT_HCI=n
Expand Down
8 changes: 0 additions & 8 deletions samples/bluetooth/central_uart/boards/nrf54l15dk_nrf54l05_cpuapp.conf
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/bluetooth/central_uart/boards/nrf54l15dk_nrf54l10_cpuapp.conf
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/bluetooth/central_uart/boards/nrf54l15dk_nrf54l15_cpuapp.conf
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/bluetooth/central_uart/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/bluetooth/central_uart/boards/nrf54lv10dk_nrf54lv10a_cpuapp.conf
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion samples/bluetooth/central_uart/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Enable the UART driver
CONFIG_UART_ASYNC_API=y
CONFIG_NRFX_UARTE0=y
CONFIG_NRFX_UARTE=y
CONFIG_SERIAL=y
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
Expand Down
2 changes: 1 addition & 1 deletion samples/bluetooth/direct_test_mode/sysbuild/remote_shell/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CONFIG_MBOX=y
CONFIG_IPC_SERVICE=y
CONFIG_IPC_SERVICE_BACKEND_RPMSG=y

CONFIG_NRFX_UARTE0=y
CONFIG_NRFX_UARTE=y

CONFIG_HEAP_MEM_POOL_SIZE=4096

Expand Down
3 changes: 0 additions & 3 deletions samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable the unspupported UART0 driver
CONFIG_NRFX_UARTE0=n

# Don't get entropy from HCI on nRF54H20 devices
CONFIG_BT_HOST_CRYPTO_PRNG=y
CONFIG_ENTROPY_BT_HCI=n
Expand Down
8 changes: 0 additions & 8 deletions samples/bluetooth/peripheral_uart/boards/nrf54h20dk_nrf54h20_cpurad.conf
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/bluetooth/peripheral_uart/boards/nrf54l15dk_nrf54l05_cpuapp.conf
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/bluetooth/peripheral_uart/boards/nrf54l15dk_nrf54l10_cpuapp.conf
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/bluetooth/peripheral_uart/boards/nrf54l15dk_nrf54l15_cpuapp.conf
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/bluetooth/peripheral_uart/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions samples/bluetooth/peripheral_uart/boards/nrf54lv10dk_nrf54lv10a_cpuapp.conf
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ CONFIG_LOG_BACKEND_UART=y
CONFIG_UART_ASYNC_ADAPTER=y
CONFIG_UART_INTERRUPT_DRIVEN=y

# Disable the UARTE0 enabled in default project configuration
CONFIG_NRFX_UARTE0=n
# Disable the UARTE enabled in default project configuration
CONFIG_UART_NRFX=n
3 changes: 1 addition & 2 deletions samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ CONFIG_LOG_BACKEND_UART=y
CONFIG_UART_ASYNC_ADAPTER=y
CONFIG_UART_INTERRUPT_DRIVEN=y

# Disable the UARTE0 enabled in default project configuration
CONFIG_NRFX_UARTE0=n
# Disable the UARTE enabled in default project configuration
CONFIG_UART_NRFX=n
2 changes: 1 addition & 1 deletion samples/bluetooth/peripheral_uart/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Enable the UART driver
CONFIG_UART_ASYNC_API=y
CONFIG_NRFX_UARTE0=y
CONFIG_NRFX_UARTE=y
CONFIG_SERIAL=y

CONFIG_GPIO=y
Expand Down
3 changes: 1 addition & 2 deletions samples/bluetooth/peripheral_uart/prj_cdc.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ CONFIG_USB_DEVICE_STACK_NEXT=y
CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y
CONFIG_USBD_CDC_ACM_LOG_LEVEL_OFF=y

# Disable the UARTE0 enabled in default project configuration
CONFIG_NRFX_UARTE0=n
# Disable the UARTE enabled in default project configuration
CONFIG_UART_NRFX=n
2 changes: 1 addition & 1 deletion samples/bluetooth/peripheral_uart/prj_minimal.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Enable the UART driver
CONFIG_UART_ASYNC_API=y
CONFIG_NRFX_UARTE0=y
CONFIG_NRFX_UARTE=y
CONFIG_SERIAL=y

CONFIG_HEAP_MEM_POOL_SIZE=1536
Expand Down
2 changes: 1 addition & 1 deletion samples/cellular/slm_shell/boards/nrf52840dk_nrf52840.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# This file is merged with prj.conf in the application folder, and options
# set here will take precedence if they are present in both files.

CONFIG_NRFX_UARTE1=y
CONFIG_NRFX_UARTE=y
CONFIG_UART_1_INTERRUPT_DRIVEN=n
CONFIG_UART_1_ASYNC=y
CONFIG_MODEM_SLM_POWER_PIN=11
Expand Down
2 changes: 1 addition & 1 deletion samples/cellular/slm_shell/boards/nrf5340dk_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# This file is merged with prj.conf in the application folder, and options
# set here will take precedence if they are present in both files.

CONFIG_NRFX_UARTE2=y
CONFIG_NRFX_UARTE=y
CONFIG_UART_2_INTERRUPT_DRIVEN=n
CONFIG_UART_2_ASYNC=y
CONFIG_MODEM_SLM_POWER_PIN=23
Expand Down
2 changes: 1 addition & 1 deletion samples/cellular/slm_shell/boards/nrf7002dk_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# This file is merged with prj.conf in the application folder, and options
# set here will take precedence if they are present in both files.

CONFIG_NRFX_UARTE2=y
CONFIG_NRFX_UARTE=y
CONFIG_UART_2_INTERRUPT_DRIVEN=n
CONFIG_UART_2_ASYNC=y
CONFIG_MODEM_SLM_POWER_PIN=30
Expand Down
2 changes: 1 addition & 1 deletion samples/nrf5340/remote_shell/prj_uart.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ CONFIG_IPC_SERVICE_BACKEND_RPMSG=y
CONFIG_MBOX=y

CONFIG_MBOX_NRFX_IPC=y
CONFIG_NRFX_UARTE0=y
CONFIG_NRFX_UARTE=y

CONFIG_HEAP_MEM_POOL_SIZE=4096

Expand Down
3 changes: 0 additions & 3 deletions samples/openthread/cli/boards/nrf54l15dk_nrf54l10_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable the unsupported driver
CONFIG_NRFX_UARTE0=n

# Increase Main and shell stack sizes to avoid stack overflow
# while using CRACEN
CONFIG_MAIN_STACK_SIZE=6144
Expand Down
3 changes: 0 additions & 3 deletions samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable the unsupported driver
CONFIG_NRFX_UARTE0=n

# Increase Main and shell stack sizes to avoid stack overflow
# while using CRACEN
CONFIG_MAIN_STACK_SIZE=6144
Expand Down
8 changes: 0 additions & 8 deletions samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...les/peripheral/802154_phy_test/sysbuild/remote_shell/boards/nrf5340dk_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
#

CONFIG_SOC_NRF53_CPUNET_ENABLE=y
CONFIG_NRFX_UARTE0=y
CONFIG_NRFX_UARTE=y
2 changes: 1 addition & 1 deletion samples/peripheral/radio_test/sysbuild/remote_shell/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CONFIG_MBOX=y
CONFIG_IPC_SERVICE=y
CONFIG_IPC_SERVICE_BACKEND_RPMSG=y

CONFIG_NRFX_UARTE0=y
CONFIG_NRFX_UARTE=y

CONFIG_HEAP_MEM_POOL_SIZE=4096

Expand Down
18 changes: 0 additions & 18 deletions tests/drivers/nrfx_integration_test/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,24 +84,6 @@ config NRFX_ALL_DRIVERS
select NRFX_TWIS2 if HAS_HW_NRF_TWIS2
select NRFX_TWIS3 if HAS_HW_NRF_TWIS3
select NRFX_UART0 if HAS_HW_NRF_UART0
select NRFX_UARTE0 if HAS_HW_NRF_UARTE0
select NRFX_UARTE1 if HAS_HW_NRF_UARTE1
select NRFX_UARTE2 if HAS_HW_NRF_UARTE2
select NRFX_UARTE3 if HAS_HW_NRF_UARTE3
select NRFX_UARTE00 if HAS_HW_NRF_UARTE00
select NRFX_UARTE20 if HAS_HW_NRF_UARTE20
select NRFX_UARTE21 if HAS_HW_NRF_UARTE21
select NRFX_UARTE22 if HAS_HW_NRF_UARTE22
select NRFX_UARTE30 if HAS_HW_NRF_UARTE30
select NRFX_UARTE120 if HAS_HW_NRF_UARTE120
select NRFX_UARTE130 if HAS_HW_NRF_UARTE130
select NRFX_UARTE131 if HAS_HW_NRF_UARTE131
select NRFX_UARTE132 if HAS_HW_NRF_UARTE132
select NRFX_UARTE133 if HAS_HW_NRF_UARTE133
select NRFX_UARTE134 if HAS_HW_NRF_UARTE134
select NRFX_UARTE135 if HAS_HW_NRF_UARTE135
select NRFX_UARTE136 if HAS_HW_NRF_UARTE136
select NRFX_UARTE137 if HAS_HW_NRF_UARTE137
select NRFX_USBD if HAS_HW_NRF_USBD
select NRFX_USBREG if HAS_HW_NRF_USBREG
select NRFX_PRS_BOX_0
Expand Down
4 changes: 2 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: b9bf21a1e92d9416dcf191c502c20c2b6b862e77
revision: 8895787ac530999ea26e3018d65ba43a8ae5c8d8
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -280,7 +280,7 @@ manifest:
path: nrfx
groups:
- nrfx
revision: 0746a590c62e039fd1e453b423d594f5fa57ddc9
revision: 4e70199c3df9a1e5033d74e483751caba1cdde67

# West-related configuration for the nrf repository.
self:
Expand Down
Loading