samples/applications: remove option CONFIG_USB_UART_CONSOLE

jfischer-no · jfischer-no · commit a5031dd9b9c7 · 2021-11-29T18:04:19.000+01:00
Update sdk-zephyr revision to include the patches that resolve
configuration dependency between console and shell and remove
unnecessary option CONFIG_USB_UART_CONSOLE.

Remove CONFIG_USB_UART_CONSOLE usage in the samples and applications
or enable CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR.

samples: openthread: check the compatibility of chosen property
instead of usage of CONFIG_USB_UART_CONSOLE option.

Signed-off-by: Johann Fischer &lt;johann.fischer@nordicsemi.no&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,10 +11,8 @@
 #include "ble.h"
 #endif
 
-#if defined(CONFIG_USB_UART_CONSOLE)
 #include <drivers/uart.h>
 #include <usb/usb_device.h>
-#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
@@ -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
