summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-03-31 00:09:23 +0300
committerPatrick Georgi <patrick@georgi-clan.de>2014-04-03 10:04:19 +0200
commitcb3ba5fdbc5cc9bd02b4aacf569cb455c34b81bc (patch)
tree069fc8b4692843cace84bf265f173798c82f2b31 /src/mainboard
parentc814be415839920b11277db1f2c2754d8ed27887 (diff)
downloadcoreboot-cb3ba5fdbc5cc9bd02b4aacf569cb455c34b81bc.tar.xz
lenovo/x60: Remove duplicate console_init()
For romstage, console_init() was called twice. The one in dock_connect() should have done only UART programming and not touch CBMEM console and/or USBDEBUG when those are enabled. Second case where dock_connect() is called is in SMI handler. If DEBUG_SMI is not enabled, console_init() does nothing in SMM. If DEBUG_SMI is enabled, console_init() is already called every time when enterining SMM. Change-Id: Ib3a842442cb7a5be9d6b71682cd6f368930af886 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5433 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/lenovo/x60/dock.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mainboard/lenovo/x60/dock.c b/src/mainboard/lenovo/x60/dock.c
index 1b15a6c57d..1f852816e6 100644
--- a/src/mainboard/lenovo/x60/dock.c
+++ b/src/mainboard/lenovo/x60/dock.c
@@ -237,7 +237,6 @@ int dock_connect(void)
dock_write_register(0x07, 0x03);
dock_write_register(0x30, 0x01);
- console_init();
return 0;
}