michaelh/zephyr
1
0
Fork 0
Code Releases Activity

console: tty: Remove dependency on older "consoles"

Browse source 
Console subsystem doesn't depend on older consoles-in-drivers, the
only common thing between them is CONFIG_UART_CONSOLE_ON_DEV_NAME
setting, so make it so (by depending on either UART_CONSOLE or
CONSOLE_SUBSYS.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
This commit is contained in:
Paul Sokolovsky 2019-02-25 12:10:31 +03:00 • committed by Andrew Boie
commit 9ec9c430b3
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
drivers/console/Kconfig
View file

@ -7,6 +7,16 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
# Setting shared by different subsystems
config UART_CONSOLE_ON_DEV_NAME
string "Device Name of UART Device for UART Console"
default "$(dt_str_val,DT_UART_CONSOLE_ON_DEV_NAME)" if HAS_DTS
default "UART_0"
depends on (UART_CONSOLE || CONSOLE_SUBSYS)
help
This option specifies the name of UART device to be used for
UART console.
menuconfig CONSOLE menuconfig CONSOLE
bool "Console drivers" bool "Console drivers"
@ -41,15 +51,6 @@ config UART_CONSOLE
Enable this option to use one UART for console. Make sure Enable this option to use one UART for console. Make sure
CONFIG_UART_CONSOLE_ON_DEV_NAME is also set correctly. CONFIG_UART_CONSOLE_ON_DEV_NAME is also set correctly.
config UART_CONSOLE_ON_DEV_NAME
string "Device Name of UART Device for UART Console"
default "$(dt_str_val,DT_UART_CONSOLE_ON_DEV_NAME)" if HAS_DTS
default "UART_0"
depends on UART_CONSOLE
help
This option specifies the name of UART device to be used for
UART console.
config UART_CONSOLE_INIT_PRIORITY config UART_CONSOLE_INIT_PRIORITY
int "Init priority" int "Init priority"
default 60 default 60

2
subsys/console/tty.c
View file

@ -8,8 +8,6 @@
#include <uart.h> #include <uart.h>
#include <misc/printk.h> #include <misc/printk.h>
#include <tty.h> #include <tty.h>
#include <drivers/console/console.h>
#include <drivers/console/uart_console.h>
static int tty_irq_input_hook(struct tty_serial *tty, u8_t c); static int tty_irq_input_hook(struct tty_serial *tty, u8_t c);
static int tty_putchar(struct tty_serial *tty, u8_t c); static int tty_putchar(struct tty_serial *tty, u8_t c);