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>
master
Simon Glass 9 years ago
parent 5ac98cb9bd
commit 97b0597302
  1. 2
      drivers/serial/ns16550.c
  2. 2
      drivers/serial/serial_efi.c
  3. 2
      drivers/serial/serial_s5p.c
  4. 9
      include/debug_uart.h
  5. 2
      lib/efi/efi_stub.c

@ -257,7 +257,7 @@ int NS16550_tstc(NS16550_t com_port)
(1 << CONFIG_DEBUG_UART_SHIFT), \ (1 << CONFIG_DEBUG_UART_SHIFT), \
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; struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE;
int baud_divisor; int baud_divisor;

@ -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 * There is nothing to init here since the EFI console is already running by
* the time we enter U-Boot. * the time we enter U-Boot.
*/ */
void debug_uart_init(void) static inline void _debug_uart_init(void)
{ {
} }

@ -207,7 +207,7 @@ U_BOOT_DRIVER(serial_s5p) = {
#include <debug_uart.h> #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; struct s5p_uart *uart = (struct s5p_uart *)CONFIG_DEBUG_UART_BASE;

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

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

Loading…
Cancel
Save