Skip to content

Commit 4465217

Browse files
jfischer-nocarlescufi
authored andcommitted
[nrf fromtree] sampes: shell: remove usage of CONFIG_USB_UART_CONSOLE
Remove option CONFIG_USB_UART_CONSOLE where it has no influence or enable CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR without taking a detour through CONFIG_USB_UART_CONSOLE. Check the compatibility of chosen property instead of usage of CONFIG_USB_UART_CONSOLE option. Signed-off-by: Johann Fischer <[email protected]>
1 parent a70db88 commit 4465217

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

samples/boards/sensortile_box/prj.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ CONFIG_USB_DEVICE_PID=0x1234
2929
CONFIG_USB_DEVICE_STACK=y
3030
CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC SensorTile.box"
3131

32-
CONFIG_USB_UART_CONSOLE=y
3332
CONFIG_UART_INTERRUPT_DRIVEN=y
3433
CONFIG_UART_LINE_CTRL=y
3534
CONFIG_CBPRINTF_FP_SUPPORT=y
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CONFIG_USB_DEVICE_STACK=y
22
CONFIG_USB_DEVICE_PRODUCT="Zephyr USB shell sample"
3-
CONFIG_USB_UART_CONSOLE=y
3+
CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y
44
CONFIG_UART_LINE_CTRL=y
55
CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51

samples/subsys/shell/shell_module/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ void main(void)
334334
login_init();
335335
}
336336

337-
#if defined(CONFIG_USB_UART_CONSOLE)
337+
#if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_shell_uart), zephyr_cdc_acm_uart)
338338
const struct device *dev;
339339
uint32_t dtr = 0;
340340

0 commit comments

Comments
 (0)