diff options
| author | Sven Schnelle <svens@stackframe.org> | 2011-10-30 09:57:35 +0100 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2011-10-31 04:06:10 +0100 |
| commit | 20fc631ad2c483fd2bc12e56f3ca8a1572688fb5 (patch) | |
| tree | 627cbfe2eccc644bec4019097481b6f136e55905 /src/include | |
| parent | 28f6a43755246641186f2c436b158d2dab4243a5 (diff) | |
| download | coreboot-20fc631ad2c483fd2bc12e56f3ca8a1572688fb5.tar.xz | |
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/include')
| -rw-r--r-- | src/include/ehci.h | 3 | ||||
| -rw-r--r-- | src/include/usbdebug.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/include/ehci.h b/src/include/ehci.h index 4b8c94cd24..29347f9911 100644 --- a/src/include/ehci.h +++ b/src/include/ehci.h @@ -25,6 +25,7 @@ #define EHCI_BAR_INDEX 0x10 +#ifndef __ROMCC__ /* EHCI register interface, corresponds to EHCI Revision 0.95 specification */ /* Section 2.2 Host Controller Capability Registers */ @@ -199,5 +200,5 @@ struct ehci_dbg_port { u32 address; #define DBGP_EPADDR(dev, ep) (((dev)<<8)|(ep)) } __attribute__ ((packed)); - +#endif #endif diff --git a/src/include/usbdebug.h b/src/include/usbdebug.h index 281ccde826..a7ab21fd27 100644 --- a/src/include/usbdebug.h +++ b/src/include/usbdebug.h @@ -32,6 +32,8 @@ struct ehci_debug_info { u32 endpoint_in; }; +#ifndef __ROMCC__ +void enable_usbdebug(unsigned int port); int dbgp_bulk_write_x(struct ehci_debug_info *dbg_info, const char *bytes, int size); int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size); void set_ehci_base(unsigned ehci_base); @@ -40,5 +42,6 @@ unsigned get_ehci_debug(void); void set_debug_port(unsigned port); int early_usbdebug_init(void); void usbdebug_tx_byte(unsigned char data); - +int usbdebug_init(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info); +#endif #endif |