Browse Source

debug_uart: Adjust the declaration of debug_uart_init()

We want to be able to add other common code to this function. So change the
driver's version to have an underscore before it, just like
_debug_uart_putc(). Define debug_uart_init() to call this version.

Update all drivers to this new method.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
scm-imx_v2016.03_4.1.15_2.0.0_ga
Simon Glass 5 years ago
parent
commit
97b0597302
5 changed files with 11 additions and 6 deletions
  1. +1
    -1
      drivers/serial/ns16550.c
  2. +1
    -1
      drivers/serial/serial_efi.c
  3. +1
    -1
      drivers/serial/serial_s5p.c
  4. +7
    -2
      include/debug_uart.h
  5. +1
    -1
      lib/efi/efi_stub.c

+ 1
- 1
drivers/serial/ns16550.c View File

@ -257,7 +257,7 @@ int NS16550_tstc(NS16550_t com_port)
(1 << CONFIG_DEBUG_UART_SHIFT), \
CONFIG_DEBUG_UART_SHIFT)
void debug_uart_init(void)
static inline void _debug_uart_init(void)
{
struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE;
int baud_divisor;


+ 1
- 1
drivers/serial/serial_efi.c View File

@ -107,7 +107,7 @@ static int serial_efi_pending(struct udevice *dev, bool input)
* There is nothing to init here since the EFI console is already running by
* the time we enter U-Boot.
*/
void debug_uart_init(void)
static inline void _debug_uart_init(void)
{
}


+ 1
- 1
drivers/serial/serial_s5p.c View File

@ -207,7 +207,7 @@ U_BOOT_DRIVER(serial_s5p) = {
#include <debug_uart.h>
void debug_uart_init(void)
static inline void _debug_uart_init(void)
{
struct s5p_uart *uart = (struct s5p_uart *)CONFIG_DEBUG_UART_BASE;


+ 7
- 2
include/debug_uart.h View File

@ -38,7 +38,7 @@
* To enable the debug UART in your serial driver:
*
* - #include <debug_uart.h>
* - Define debug_uart_init(), trying to avoid using the stack
* - Define _debug_uart_init(), trying to avoid using the stack
* - Define _debug_uart_putc() as static inline (avoiding stack usage)
* - Immediately afterwards, add DEBUG_UART_FUNCS to define the rest of the
* functionality (printch(), etc.)
@ -132,6 +132,11 @@ void printhex8(uint value);
void printhex8(uint value) \
{ \
printhex(value, 8); \
}
} \
\
void debug_uart_init(void) \
{ \
_debug_uart_init(); \
} \
#endif

+ 1
- 1
lib/efi/efi_stub.c View File

@ -59,7 +59,7 @@ struct __packed desctab_info {
* considering if we start needing more U-Boot functionality. Note that we
* could then move get_codeseg32() to arch/x86/cpu/cpu.c.
*/
void debug_uart_init(void)
void _debug_uart_init(void)
{
}


Loading…
Cancel
Save