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-15 13:15:18 +0200 |
commit | 2644793ef486881f3af36bec69d5f9abf82123ac (patch) | |
tree | fd930a1bc030dac277f127e564612f576a0fcf44 /src/lib/usbdebug.c | |
parent | 082c19ea89a24216aafd4ef728f9983b93f6b486 (diff) | |
download | coreboot-2644793ef486881f3af36bec69d5f9abf82123ac.tar.xz |
Have option of timestamps, CBMEM console and usbdebug for most boards
As boards without EARLY_CBMEM_INIT do not initialize CBMEM in romstage,
and have no CAR migration, these features are available for ramstage only.
Change-Id: Ic3f77ccdedd4e71ba693619c02c9b98b328a0882
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3970
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/lib/usbdebug.c')
-rw-r--r-- | src/lib/usbdebug.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c index 3faec10f63..e5f7902ae3 100644 --- a/src/lib/usbdebug.c +++ b/src/lib/usbdebug.c @@ -579,13 +579,13 @@ err: } #endif /* CONFIG_USBDEBUG_OPTIONAL_HUB_PORT */ -#if defined(__PRE_RAM__) || !CONFIG_EARLY_CONSOLE static void enable_usbdebug(void) { +#if defined(__PRE_RAM__) || !(CONFIG_EARLY_CONSOLE && CONFIG_EARLY_CBMEM_INIT) pci_devfn_t dbg_dev = pci_ehci_dbg_dev(CONFIG_USBDEBUG_HCD_INDEX); pci_ehci_dbg_enable(dbg_dev, CONFIG_EHCI_BAR); -} #endif +} static void set_debug_port(unsigned int port) { @@ -1038,8 +1038,6 @@ int usbdebug_init(void) if (!get_usbdebug_from_cbmem(dbg_info)) return 0; #endif -#if defined(__PRE_RAM__) || !CONFIG_EARLY_CONSOLE enable_usbdebug(); -#endif return usbdebug_init_(CONFIG_EHCI_BAR, CONFIG_EHCI_DEBUG_OFFSET, dbg_info); } |