aboutsummaryrefslogtreecommitdiff
path: root/src/lib/usbdebug.c
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2013-09-10 00:07:21 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2013-09-21 06:34:55 +0200
commitcbf5bdfe67e90f780b9f5b2f8cb9cd6e0d46682d (patch)
tree158bc3b636a9024843c2e88d5f487792d17736ff /src/lib/usbdebug.c
parentde1fe7f655c549e8dce5b34218221890fa5ccc34 (diff)
CBMEM: Always select CAR_MIGRATION
If romstage does not make cbmem_initialize() call, linker should optimize the code for CAR migration away. This simplifies design of CBMEM console by a considerable amount. As console buffer is now migrated within cbmem_initialize() call there is no longer need for cbmemc_reinit() call made at end of romstage. Change-Id: I8675ecaafb641fa02675e9ba3f374caa8e240f1d Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/3916 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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c
index 27097c7c9b..39cd138ba0 100644
--- a/src/lib/usbdebug.c
+++ b/src/lib/usbdebug.c
@@ -974,7 +974,6 @@ void pci_ehci_read_resources(struct device *dev)
}
#endif
-#if CONFIG_CAR_MIGRATION
#if !defined(__PRE_RAM__) && !defined(__SMM__)
static int get_usbdebug_from_cbmem(struct ehci_debug_info *info)
{
@@ -1004,7 +1003,6 @@ static void migrate_ehci_debug(void)
}
CAR_MIGRATE(migrate_ehci_debug);
#endif
-#endif /* CONFIG_CAR_MIGRATION */
unsigned long pci_ehci_base_regs(pci_devfn_t sdev)
{
@@ -1036,7 +1034,7 @@ int usbdebug_init(void)
{
struct ehci_debug_info *dbg_info = dbgp_ehci_info();
-#if CONFIG_CAR_MIGRATION && !defined(__PRE_RAM__) && !defined(__SMM__)
+#if !defined(__PRE_RAM__) && !defined(__SMM__)
if (!get_usbdebug_from_cbmem(dbg_info))
return 0;
#endif