summaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
authorSven Schnelle <svens@stackframe.org>2011-10-30 09:57:35 +0100
committerStefan Reinauer <stefan.reinauer@coreboot.org>2011-10-31 04:06:10 +0100
commit20fc631ad2c483fd2bc12e56f3ca8a1572688fb5 (patch)
tree627cbfe2eccc644bec4019097481b6f136e55905 /src/console
parent28f6a43755246641186f2c436b158d2dab4243a5 (diff)
Fix usb debug dongle support
- move enable_usbdebug() declaration to usbdebug.h - reinitialize debug driver in ramstage, as copying the data structure from romstage doesn't work right now. This way of copying data from romstage to ramstage is really board/cpu specific, and is likely to break often. So don't do it. Change-Id: I394678ded6679c1803e29eb691b926182bdcab68 Signed-off-by: Sven Schnelle <svens@stackframe.org> Reviewed-on: http://review.coreboot.org/355 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/console')
-rw-r--r--src/console/console.c4
-rw-r--r--src/console/usbdebug_console.c10
2 files changed, 5 insertions, 9 deletions
diff --git a/src/console/console.c b/src/console/console.c
index a73616e948..325170d060 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -30,6 +30,10 @@
#include <console/ne2k.h>
#endif
+#if CONFIG_USBDEBUG
+#include <usbdebug.h>
+#endif
+
#ifndef __PRE_RAM__
#include <string.h>
#include <pc80/mc146818rtc.h>
diff --git a/src/console/usbdebug_console.c b/src/console/usbdebug_console.c
index 2270cebda4..a624b9dd21 100644
--- a/src/console/usbdebug_console.c
+++ b/src/console/usbdebug_console.c
@@ -50,15 +50,7 @@ unsigned get_ehci_debug(void)
static void dbgp_init(void)
{
- struct ehci_debug_info *dbg_infox;
-
- /* At this point, all we have to do is copy the fixed address
- * debug_info data structure to our version defined above. */
-
- dbg_infox = (struct ehci_debug_info *)
- ((CONFIG_RAMTOP) - sizeof(struct ehci_debug_info));
-
- memcpy(&dbg_info, dbg_infox, sizeof(struct ehci_debug_info));
+ usbdebug_init(CONFIG_EHCI_BAR, CONFIG_EHCI_DEBUG_OFFSET, &dbg_info);
}
static void dbgp_tx_byte(unsigned char data)