Skip to content

Commit 2c4cec1

Browse files
committed
[nrf fromtree] 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 d51f4b6 commit 2c4cec1

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

drivers/console/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ config UART_CONSOLE
4141

4242
config UART_CONSOLE_INIT_PRIORITY
4343
int "Init priority"
44-
default 95 if USB_UART_CONSOLE
4544
default 60
4645
depends on UART_CONSOLE
4746
help

drivers/console/uart_console.c

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

610610
/* UART console initializes after the UART device itself */
611611
SYS_INIT(uart_console_init,
612-
#if defined(CONFIG_USB_UART_CONSOLE)
613-
APPLICATION,
614-
#elif defined(CONFIG_EARLY_CONSOLE)
612+
#if defined(CONFIG_EARLY_CONSOLE)
615613
PRE_KERNEL_1,
616614
#else
617615
POST_KERNEL,

0 commit comments

Comments
 (0)