diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-10-11 21:14:59 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-10-22 21:35:05 +0200 |
| commit | ac164057993e9edbfe78537efbbc9ef5f75cd67c (patch) | |
| tree | 9a0de6d32cd779b6fc36a4a21c75e8e18b7b5bde /src/lib | |
| parent | 569ad760cc4d7e3595bd9d4f569d08b021a64663 (diff) | |
usbdebug: Fix boards without EARLY_CBMEM_INIT
The main usbdebug file lib/usbdebug.c was removed from romstage
build with commit f8bf5a10 but the chipset-specific parts were not,
leading to unresolved symbol errors for AMD platforms.
Add a silent Kconfig variable USBDEBUG_IN_ROMSTAGE for convenient
use of this feature.
Change-Id: I0cd3fccf2612cf08497aa5c3750c89bf43ff69be
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3983
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/lib/usbdebug.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 6110b88124..b0d9366113 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -49,11 +49,11 @@ romstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c romstage-$(CONFIG_SPKMODEM) += spkmodem.c +romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += usbdebug.c ifeq ($(CONFIG_EARLY_CBMEM_INIT),y) romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c -romstage-$(CONFIG_USBDEBUG) += usbdebug.c endif romstage-y += compute_ip_checksum.c diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c index e5f7902ae3..885599b1a6 100644 --- a/src/lib/usbdebug.c +++ b/src/lib/usbdebug.c @@ -581,7 +581,7 @@ err: static void enable_usbdebug(void) { -#if defined(__PRE_RAM__) || !(CONFIG_EARLY_CONSOLE && CONFIG_EARLY_CBMEM_INIT) +#if defined(__PRE_RAM__) || !CONFIG_USBDEBUG_IN_ROMSTAGE pci_devfn_t dbg_dev = pci_ehci_dbg_dev(CONFIG_USBDEBUG_HCD_INDEX); pci_ehci_dbg_enable(dbg_dev, CONFIG_EHCI_BAR); #endif |