samples: bluetooth: Align with USB changes

rlubos · rlubos · commit bf162a3f30fb · 2021-11-09T12:30:05.000+01:00
Align Bluetooth samples with USB changes.

Signed-off-by: Robert Lubos &lt;robert.lubos@nordicsemi.no&gt;
diff --git a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf
@@ -4,7 +4,6 @@ CONFIG_USB_UART_CONSOLE=y
 
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_LINE_CTRL=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 
 # Since the default LOG_MODE_MINIMAL is synchronous, it will mess with the USB
 # driver/subsys. Use the deferred mode instead.
diff --git a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
diff --git a/samples/bluetooth/llpm/prj.conf b/samples/bluetooth/llpm/prj.conf
@@ -5,6 +5,7 @@
 #
 CONFIG_NCS_SAMPLES_DEFAULTS=y
 
+CONFIG_CONSOLE=y
 CONFIG_CONSOLE_SUBSYS=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_CONSOLE_GETCHAR=y
diff --git a/samples/bluetooth/llpm/src/main.c b/samples/bluetooth/llpm/src/main.c
@@ -421,8 +421,7 @@ void main(void)
 	};
 
 #if defined(CONFIG_USB_DEVICE_STACK)
-	const struct device *uart_dev = device_get_binding(
-			CONFIG_UART_CONSOLE_ON_DEV_NAME);
+	const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 	uint32_t dtr = 0;
 
 	if (usb_enable(NULL)) {
diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf
@@ -89,4 +89,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.overlay b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf
@@ -89,4 +89,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.overlay b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf
@@ -90,4 +90,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.overlay b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
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
@@ -90,4 +90,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.overlay b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf
@@ -89,4 +89,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.overlay b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf
@@ -89,4 +89,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.overlay b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf
@@ -74,17 +74,13 @@ CONFIG_USB_CDC_ACM=y
 CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y
 CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 
-# Use CDC_ACM0 for logs, CDC_ACM1 has application-specific usage
-CONFIG_USB_CDC_ACM_DEVICE_COUNT=2
-CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
 CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_LOG_PRINTK=y
 CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
 CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=4000
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 
 CONFIG_BT_NUS_UART_ASYNC_ADAPTER=y
 CONFIG_BT_NUS_UART_DEV="CDC_ACM_1"
diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.overlay b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.overlay
@@ -60,4 +60,20 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+
+	cdc_acm_uart1: cdc_acm_uart1 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_1";
+	};
 };
diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf
@@ -74,17 +74,13 @@ CONFIG_USB_CDC_ACM=y
 CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y
 CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 
-# Use CDC_ACM0 for logs, CDC_ACM1 has application-specific usage
-CONFIG_USB_CDC_ACM_DEVICE_COUNT=2
-CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
 CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_LOG_PRINTK=y
 CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
 CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=4000
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 
 CONFIG_BT_NUS_UART_ASYNC_ADAPTER=y
 CONFIG_BT_NUS_UART_DEV="CDC_ACM_1"
diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.overlay b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.overlay
@@ -60,4 +60,20 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+
+	cdc_acm_uart1: cdc_acm_uart1 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_1";
+	};
 };
diff --git a/samples/bluetooth/peripheral_uart/prj_cdc.conf b/samples/bluetooth/peripheral_uart/prj_cdc.conf
@@ -18,4 +18,3 @@ CONFIG_UART_NRFX=n
 
 # Redirect console to CDC
 CONFIG_USB_UART_CONSOLE=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/peripheral_uart/sample.yaml b/samples/bluetooth/peripheral_uart/sample.yaml
@@ -28,9 +28,9 @@ tests:
     tags: bluetooth ci_build
   samples.bluetooth.peripheral_uart_cdc:
     extra_args: OVERLAY_CONFIG=prj_cdc.conf
+                DTC_OVERLAY_FILE="usb.overlay"
     build_only: true
     platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833
-      nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf52833dk_nrf52833
diff --git a/samples/bluetooth/peripheral_uart/usb.overlay b/samples/bluetooth/peripheral_uart/usb.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#`
`6`	`6`	`CONFIG_NCS_SAMPLES_DEFAULTS=y`
`7`	`7`
	`8`	`+CONFIG_CONSOLE=y`
`8`	`9`	`CONFIG_CONSOLE_SUBSYS=y`
`9`	`10`	`CONFIG_CONSOLE_HANDLER=y`
`10`	`11`	`CONFIG_CONSOLE_GETCHAR=y`