commit f2f7f03aff2df2471fce08f48bb0a6583263158e
author Kyösti Mälkki <kyosti.malkki@gmail.com> Fri Apr 04 15:05:28 2014 +0300
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Mon May 26 10:52:16 2014 +0200
tree 45aa9e5c906b6184f9699fcc707c42f0995baa44
parent c009601f29847aa91ec2f5a89a02f46a2119c5a4

console: Add console for GDB

Connection of UARTs to GDB stub got lost in the console transition
process, bring it back. In theory, GDB stub should work also over
usbdebug, but that solution is not really tested at all yet.

Change-Id: I90e05e8132889e788b92e055ee191f35add43bbc
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5343
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>

src/include/console/usb.h

diff --git a/src/include/console/usb.h b/src/include/console/usb.h
index 57ea4eb..b5aab666 100644
--- a/src/include/console/usb.h
+++ b/src/include/console/usb.h
@@ -34,14 +34,26 @@
 #define __CONSOLE_USB_ENABLE__	CONFIG_CONSOLE_USB && \
 	((ENV_ROMSTAGE && CONFIG_USBDEBUG_IN_ROMSTAGE) || ENV_RAMSTAGE)
 
+#define USB_PIPE_FOR_CONSOLE 0
+#define USB_PIPE_FOR_GDB 0
+
 #if __CONSOLE_USB_ENABLE__
 static inline void __usbdebug_init(void)	{ usbdebug_init(); }
-static inline void __usb_tx_byte(u8 data)	{ usb_tx_byte(0, data); }
-static inline void __usb_tx_flush(void)	{ usb_tx_flush(0); }
+static inline void __usb_tx_byte(u8 data)	{ usb_tx_byte(USB_PIPE_FOR_CONSOLE, data); }
+static inline void __usb_tx_flush(void)	{ usb_tx_flush(USB_PIPE_FOR_CONSOLE); }
 #else
 static inline void __usbdebug_init(void)	{}
 static inline void __usb_tx_byte(u8 data)	{}
 static inline void __usb_tx_flush(void)	{}
 #endif
 
+/*  */
+#if 0 && CONFIG_GDB_STUB && \
+	((ENV_ROMSTAGE && CONFIG_USBDEBUG_IN_ROMSTAGE) || ENV_RAMSTAGE)
+static inline void __gdb_hw_init(void)	{ usbdebug_init(); }
+static inline void __gdb_tx_byte(u8 data)	{ usb_tx_byte(USB_PIPE_FOR_GDB, data); }
+static inline void __gdb_tx_flush(void)	{ usb_tx_flush(USB_PIPE_FOR_GDB); }
+static inline u8 __gdb_rx_byte(void)		{ return usb_rx_byte(USB_PIPE_FOR_GDB); }
+#endif
+
 #endif /* _CONSOLE_USB_H_ */