qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: serial: introduce DEBUG_UART_ALWAYS_MODE configure 

Rename CONSOLE_SERIAL_SKIP_INIT to DEBUG_UART_ALWAYS_MODE for
easy understand.

Select this to always use debug UART, skip complicated
console UART register.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3c265840bde015fe5fd7c73d959ba0538297b7c2
This commit is contained in:
Joseph Chen 2020-06-15 14:58:12 +08:00 committed by Jianhong Chen
parent 08d70ef365
commit 558b8198d4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/Kconfig
View File

@ -256,11 +256,6 @@ config CONSOLE_DISABLE_CLI
help
This disable CLI interactive in verified-boot.
config CONSOLE_SERIAL_SKIP_INIT
bool "Skip console serial init"
help
Skip console serial init and always use debug uart.
config DISABLE_CONSOLE
bool "disable console in & out"
help

5
drivers/serial/Kconfig
View File

@ -346,6 +346,11 @@ config DEBUG_UART_SKIP_INIT
Select this if the UART you want to use for debug output is already
initialized by the time U-Boot starts its execution.
config DEBUG_UART_ALWAYS_MODE
bool "Always use debug UART mode"
help
Select this to always use debug UART, skip complicated console UART register.
config ALTERA_JTAG_UART
bool "Altera JTAG UART support"
depends on DM_SERIAL

6
drivers/serial/serial-uclass.c
View File

@ -28,7 +28,7 @@ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
#error "Serial is required before relocation - define CONFIG_$(SPL_)SYS_MALLOC_F_LEN to make this work"
#endif
#ifndef CONFIG_CONSOLE_SERIAL_SKIP_INIT
#ifndef CONFIG_DEBUG_UART_ALWAYS_MODE
static int serial_check_stdout(const void *blob, struct udevice **devp)
{
int node;
@ -90,7 +90,7 @@ static int serial_check_stdout(const void *blob, struct udevice **devp)
}
#endif
#if defined(CONFIG_OF_LIVE) && !defined(CONFIG_CONSOLE_SERIAL_SKIP_INIT)
#if defined(CONFIG_OF_LIVE) && !defined(CONFIG_DEBUG_UART_ALWAYS_MODE)
/*
* Hide and present pinctrl prop int live device tree
*
@ -148,7 +148,7 @@ static inline void serial_console_hide_prop(char **p1, char **p2) {}
static inline void serial_console_present_prop(char *p1, char *p2) {}
#endif
#ifndef CONFIG_CONSOLE_SERIAL_SKIP_INIT
#ifndef CONFIG_DEBUG_UART_ALWAYS_MODE
static void serial_find_console_or_panic(void)
{
const void *blob = gd->fdt_blob;