net/ethoc: add Kconfig entry for the driver

[people/ms/u-boot.git] / include / debug_uart.h

diff --git a/include/debug_uart.h b/include/debug_uart.h
index 257ba004d6e9d3858254625eb0cd40ba38a6d485..0d640b96e7b11337cb2cffb045a5d5887c415fdf 100644 (file)
--- a/include/debug_uart.h
+++ b/include/debug_uart.h
@@ -42,6 +42,11 @@
  * - 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.)
+ *
+ * If your board needs additional init for the UART to work, enable
+ * CONFIG_DEBUG_UART_BOARD_INIT and write a function called
+ * board_debug_uart_init() to perform that init. When debug_uart_init() is
+ * called, the init will happen automatically.
  */
 
 /**
@@ -57,6 +62,14 @@
  */
 void debug_uart_init(void);
 
+#ifdef CONFIG_DEBUG_UART_BOARD_INIT
+void board_debug_uart_init(void);
+#else
+static inline void board_debug_uart_init(void)
+{
+}
+#endif
+
 /**
  * printch() - Output a character to the debug UART
  *
@@ -92,19 +105,27 @@ void printhex4(uint value);
  */
 void printhex8(uint value);
 
+#ifdef CONFIG_DEBUG_UART_ANNOUNCE
+#define _DEBUG_UART_ANNOUNCE   printascii("<debug_uart> ");
+#else
+#define _DEBUG_UART_ANNOUNCE
+#endif
+
 /*
  * Now define some functions - this should be inserted into the serial driver
  */
 #define DEBUG_UART_FUNCS \
        void printch(int ch) \
        { \
+               if (ch == '\n') \
+                       _debug_uart_putc('\r'); \
                _debug_uart_putc(ch); \
        } \
 \
        void printascii(const char *str) \
        { \
                while (*str) \
-                       _debug_uart_putc(*str++); \
+                       printch(*str++); \
        } \
 \
        static inline void printhex1(uint digit) \
@@ -136,7 +157,9 @@ void printhex8(uint value);
 \
        void debug_uart_init(void) \
        { \
+               board_debug_uart_init(); \
                _debug_uart_init(); \
+               _DEBUG_UART_ANNOUNCE \
        } \
 
 #endif