boards: bl654_usb: add chosen nodes for shell and console

Remove UART_CONSOLE_ON_DEV_NAME and UART_SHELL_ON_DEV_NAME options
and add chosen nodes for shell and console.

Signed-off-by: Johann Fischer <[email protected]>

Author: jfischer-no

boards/arm/bl654_usb/Kconfig.defconfig

@@ -31,12 +31,6 @@ config USB_UART_CONSOLE
 config UART_LINE_CTRL
 	default y
 
-config UART_CONSOLE_ON_DEV_NAME
-	default "CDC_ACM_0"
-
-config UART_SHELL_ON_DEV_NAME
-	default "CDC_ACM_0"
-
 endif # USB_DEVICE_STACK
 
 if IEEE802154

boards/arm/bl654_usb/bl654_usb.dts

@@ -14,6 +14,8 @@
 	chosen {
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
+		zephyr,console = &bl654_cdc_acm_uart;
+		zephyr,shell-uart = &bl654_cdc_acm_uart;
 		zephyr,code-partition = &slot0_partition;
 	};
 
@@ -101,4 +103,9 @@
 zephyr_udc0: &usbd {
 	compatible = "nordic,nrf-usbd";
 	status = "okay";
+
+	bl654_cdc_acm_uart: bl654_cdc_acm_uart {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };