michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sampes: shell: remove usage of CONFIG_USB_UART_CONSOLE

Browse source 
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 <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2021-11-17 13:37:50 +01:00 • committed by Carles Cufí
commit 5315c285cc
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
samples/boards/sensortile_box/prj.conf
View file

@ -29,7 +29,6 @@ CONFIG_USB_DEVICE_PID=0x1234
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC SensorTile.box"
CONFIG_USB_UART_CONSOLE=y
CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_UART_LINE_CTRL=y
CONFIG_CBPRINTF_FP_SUPPORT=y

2
samples/subsys/shell/shell_module/overlay-usb.conf
View file

@ -1,5 +1,5 @@
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_PRODUCT="Zephyr USB shell sample"
CONFIG_USB_UART_CONSOLE=y
CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y
CONFIG_UART_LINE_CTRL=y
CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51

2
samples/subsys/shell/shell_module/src/main.c
View file

@ -345,7 +345,7 @@ void main(void)
login_init();
}
#if defined(CONFIG_USB_UART_CONSOLE)
#if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_shell_uart), zephyr_cdc_acm_uart)
const struct device *dev;
uint32_t dtr = 0;