diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj.conf index 77bc3fde197c..f602c4dc969f 100644 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj.conf +++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/prj.conf @@ -167,9 +167,6 @@ CONFIG_USB_CDC_ACM=y CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y -# Use CDC_ACM_0 for UART console -CONFIG_USB_UART_CONSOLE=y - ################################################################################ # Bootloader Configuration diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj.conf index 77bc3fde197c..f602c4dc969f 100644 --- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj.conf +++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/prj.conf @@ -167,9 +167,6 @@ CONFIG_USB_CDC_ACM=y CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y -# Use CDC_ACM_0 for UART console -CONFIG_USB_UART_CONSOLE=y - ################################################################################ # Bootloader Configuration diff --git a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf index 3754e1c162f1..64d9ac971006 100644 --- a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf +++ b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf @@ -118,9 +118,9 @@ CONFIG_USB_DEVICE_PID=0x530D CONFIG_USB_CDC_ACM=y CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y -CONFIG_USB_UART_CONSOLE=y CONFIG_UART_LINE_CTRL=y CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 +CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y # Configure Thingy:53 sensors CONFIG_I2C=y diff --git a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf index fa2b3a65777e..1436a895c2b6 100644 --- a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf +++ b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf @@ -1,7 +1,8 @@ CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="LLPM sample console" -CONFIG_USB_UART_CONSOLE=y +CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y +CONFIG_UART_CONSOLE=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_LINE_CTRL=y diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf index 64d69be4e9a1..5bd2bb4334db 100644 --- a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf +++ b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf @@ -79,7 +79,6 @@ CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y # Use CDC_ACM0 for logs -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_USE_SEGGER_RTT=n CONFIG_LOG_BACKEND_RTT=n diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf index 64d69be4e9a1..5bd2bb4334db 100644 --- a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf +++ b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf @@ -79,7 +79,6 @@ CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y # Use CDC_ACM0 for logs -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_USE_SEGGER_RTT=n CONFIG_LOG_BACKEND_RTT=n diff --git a/samples/bluetooth/mesh/light_ctrl/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/light_ctrl/boards/thingy53_nrf5340_cpuapp.conf index 64d69be4e9a1..5bd2bb4334db 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/thingy53_nrf5340_cpuapp.conf +++ b/samples/bluetooth/mesh/light_ctrl/boards/thingy53_nrf5340_cpuapp.conf @@ -79,7 +79,6 @@ CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y # Use CDC_ACM0 for logs -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_USE_SEGGER_RTT=n CONFIG_LOG_BACKEND_RTT=n diff --git a/samples/bluetooth/mesh/light_ctrl/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/light_ctrl/boards/thingy53_nrf5340_cpuapp_ns.conf index 64d69be4e9a1..5bd2bb4334db 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/thingy53_nrf5340_cpuapp_ns.conf +++ b/samples/bluetooth/mesh/light_ctrl/boards/thingy53_nrf5340_cpuapp_ns.conf @@ -79,7 +79,6 @@ CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y # Use CDC_ACM0 for logs -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_USE_SEGGER_RTT=n CONFIG_LOG_BACKEND_RTT=n diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf index 9bbbce8bbc3a..655c4c3e762e 100644 --- a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf +++ b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf @@ -80,7 +80,6 @@ CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y # Use CDC_ACM0 for logs -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_USE_SEGGER_RTT=n CONFIG_LOG_BACKEND_RTT=n diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.conf index 9bbbce8bbc3a..655c4c3e762e 100644 --- a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.conf +++ b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.conf @@ -80,7 +80,6 @@ CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y # Use CDC_ACM0 for logs -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_USE_SEGGER_RTT=n CONFIG_LOG_BACKEND_RTT=n diff --git a/samples/bluetooth/mesh/sensor_server/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/sensor_server/boards/thingy53_nrf5340_cpuapp.conf index 46150776bc8d..56e496e379ce 100644 --- a/samples/bluetooth/mesh/sensor_server/boards/thingy53_nrf5340_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_server/boards/thingy53_nrf5340_cpuapp.conf @@ -79,7 +79,6 @@ CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y # Use CDC_ACM0 for logs -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_USE_SEGGER_RTT=n CONFIG_LOG_BACKEND_RTT=n diff --git a/samples/bluetooth/mesh/sensor_server/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/sensor_server/boards/thingy53_nrf5340_cpuapp_ns.conf index 46150776bc8d..56e496e379ce 100644 --- a/samples/bluetooth/mesh/sensor_server/boards/thingy53_nrf5340_cpuapp_ns.conf +++ b/samples/bluetooth/mesh/sensor_server/boards/thingy53_nrf5340_cpuapp_ns.conf @@ -79,7 +79,6 @@ CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y # Use CDC_ACM0 for logs -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_USE_SEGGER_RTT=n CONFIG_LOG_BACKEND_RTT=n diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf index 64d69be4e9a1..5bd2bb4334db 100644 --- a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf +++ b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf @@ -79,7 +79,6 @@ CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y # Use CDC_ACM0 for logs -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_USE_SEGGER_RTT=n CONFIG_LOG_BACKEND_RTT=n diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf index 64d69be4e9a1..5bd2bb4334db 100644 --- a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf +++ b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf @@ -79,7 +79,6 @@ CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y # Use CDC_ACM0 for logs -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_USE_SEGGER_RTT=n CONFIG_LOG_BACKEND_RTT=n diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf index 8db88baf3a98..32c0b21cc24d 100644 --- a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf +++ b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf @@ -68,7 +68,6 @@ CONFIG_USB_CDC_ACM=y CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_LOG_PRINTK=y CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024 diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf index 8db88baf3a98..32c0b21cc24d 100644 --- a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf +++ b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf @@ -68,7 +68,6 @@ CONFIG_USB_CDC_ACM=y CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y -CONFIG_USB_UART_CONSOLE=y CONFIG_LOG_BACKEND_UART=y CONFIG_LOG_PRINTK=y CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024 diff --git a/samples/bluetooth/peripheral_uart/prj_cdc.conf b/samples/bluetooth/peripheral_uart/prj_cdc.conf index bdd1d09a18bf..8a9ace3fdc49 100644 --- a/samples/bluetooth/peripheral_uart/prj_cdc.conf +++ b/samples/bluetooth/peripheral_uart/prj_cdc.conf @@ -15,6 +15,3 @@ CONFIG_BT_NUS_UART_DEV="CDC_ACM_0" # Disable the UARTE0 enabled in default project configuration CONFIG_NRFX_UARTE0=n CONFIG_UART_NRFX=n - -# Redirect console to CDC -CONFIG_USB_UART_CONSOLE=y diff --git a/samples/openthread/cli/overlay-usb.conf b/samples/openthread/cli/overlay-usb.conf index 4bbe9ee3cece..db09a1ef07e3 100644 --- a/samples/openthread/cli/overlay-usb.conf +++ b/samples/openthread/cli/overlay-usb.conf @@ -7,10 +7,11 @@ CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 CONFIG_UART_LINE_CTRL=y +CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y +CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" CONFIG_USB_DEVICE_PRODUCT="Thread CLI" CONFIG_USB_DEVICE_VID=0x1915 CONFIG_USB_DEVICE_PID=0x0000 -CONFIG_USB_UART_CONSOLE=y diff --git a/samples/openthread/cli/src/main.c b/samples/openthread/cli/src/main.c index 9420aefeb264..ed8b3ed04944 100644 --- a/samples/openthread/cli/src/main.c +++ b/samples/openthread/cli/src/main.c @@ -11,10 +11,8 @@ #include "ble.h" #endif -#if defined(CONFIG_USB_UART_CONSOLE) #include #include -#endif LOG_MODULE_REGISTER(cli_sample, CONFIG_OT_COMMAND_LINE_INTERFACE_LOG_LEVEL); @@ -30,7 +28,7 @@ LOG_MODULE_REGISTER(cli_sample, CONFIG_OT_COMMAND_LINE_INTERFACE_LOG_LEVEL); void main(void) { -#if defined(CONFIG_USB_UART_CONSOLE) +#if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_shell_uart), zephyr_cdc_acm_uart) int ret; const struct device *dev; uint32_t dtr = 0U; diff --git a/west.yml b/west.yml index 5b05d0971e53..ee38f227eb89 100644 --- a/west.yml +++ b/west.yml @@ -54,7 +54,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: v2.7.0-ncs1-rc1 + revision: eb0a5b6574d7cd1942ffce0d7424528565de1cb2 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above