Skip to content

Commit 6fd0843

Browse files
jfischer-nocarlescufi
authored andcommitted
drivers: console: limit scope of CONFIG_USB_UART_CONSOLE
Do not change init level and priority of console driver if Kconfig option CONFIG_USB_UART_CONSOLE is enabled because commit 37f4d9b ("usb: cdc_acm: rework cdc_acm_poll_out to non-blocking") changed CDC ACM UART driver so that it more closely mimics the real controller and CDC ACM UART driver now uses the same init level and priority as regular serial driver. Signed-off-by: Johann Fischer <[email protected]>
1 parent 4151f42 commit 6fd0843

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

drivers/console/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ config CONSOLE_HANDLER
3434

3535
config CONSOLE_INIT_PRIORITY
3636
int "Console init priority"
37-
default 95 if USB_UART_CONSOLE || UART_MUX
37+
default 95 if UART_MUX
3838
default 60 if UART_CONSOLE || XTENSA_SIM_CONSOLE
3939
default KERNEL_INIT_PRIORITY_DEFAULT
4040
help

drivers/console/uart_console.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -606,9 +606,7 @@ static int uart_console_init(const struct device *arg)
606606

607607
/* UART console initializes after the UART device itself */
608608
SYS_INIT(uart_console_init,
609-
#if defined(CONFIG_USB_UART_CONSOLE)
610-
APPLICATION,
611-
#elif defined(CONFIG_EARLY_CONSOLE)
609+
#if defined(CONFIG_EARLY_CONSOLE)
612610
PRE_KERNEL_1,
613611
#else
614612
POST_KERNEL,

0 commit comments

Comments
 (0)