brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-22 12:40:37 +09:00
Code Issues Projects Releases Wiki Activity

serial: ns16550: Allow serial to enabled/disabled in SPL

Browse Source 
At present this driver uses the wrong condition for including the code and
drivers in SPL/TPL. Update it so that the code is only included if
DM_SERIAL is enabled for SPL/TPL.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2019-09-25 08:11:14 -06:00 committed by Bin Meng
parent 7e45bb0867
commit 2e2c514a40
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/serial/ns16550.c
View File

@ -21,7 +21,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define UART_MCRVAL (UART_MCR_DTR | \ #define UART_MCRVAL (UART_MCR_DTR | \
UART_MCR_RTS) /* RTS/DTR */ UART_MCR_RTS) /* RTS/DTR */
#ifndef CONFIG_DM_SERIAL #if !CONFIG_IS_ENABLED(DM_SERIAL)
#ifdef CONFIG_SYS_NS16550_PORT_MAPPED #ifdef CONFIG_SYS_NS16550_PORT_MAPPED
#define serial_out(x, y) outb(x, (ulong)y) #define serial_out(x, y) outb(x, (ulong)y)
#define serial_in(y) inb((ulong)y) #define serial_in(y) inb((ulong)y)
@ -86,7 +86,7 @@ static inline int serial_in_shift(void *addr, int shift)
#endif #endif
} }
#ifdef CONFIG_DM_SERIAL #if CONFIG_IS_ENABLED(DM_SERIAL)
#ifndef CONFIG_SYS_NS16550_CLK #ifndef CONFIG_SYS_NS16550_CLK
#define CONFIG_SYS_NS16550_CLK 0 #define CONFIG_SYS_NS16550_CLK 0
@ -301,7 +301,7 @@ DEBUG_UART_FUNCS
#endif #endif
#ifdef CONFIG_DM_SERIAL #if CONFIG_IS_ENABLED(DM_SERIAL)
static int ns16550_serial_putc(struct udevice *dev, const char ch) static int ns16550_serial_putc(struct udevice *dev, const char ch)
{ {
struct NS16550 *const com_port = dev_get_priv(dev); struct NS16550 *const com_port = dev_get_priv(dev);