aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/lenovo/x60/romstage.c
diff options
context:
space:
mode:
authorSven Schnelle <svens@stackframe.org>2012-01-10 14:44:12 +0100
committerSven Schnelle <svens@stackframe.org>2012-01-31 17:53:29 +0100
commit483ec41e6f3947b8e11ed67f7efcfdc3ef035612 (patch)
treef59b1124459493c222ed764de5d0cbad34c4164e /src/mainboard/lenovo/x60/romstage.c
parentfc4e7333e02b24ab7b4f5ae0e39d3115f41f6ab6 (diff)
X60: fix docking
Fix ordering of power/reset/undock procedure to prevent crashes seen with the old code. Also call dlpc_init() only once. Change-Id: I27d1f42e845fcccde40e6ca5af4a7762edab5d36 Signed-off-by: Sven Schnelle <svens@stackframe.org> Reviewed-on: http://review.coreboot.org/597 Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard/lenovo/x60/romstage.c')
-rw-r--r--src/mainboard/lenovo/x60/romstage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 44cde72bbc..ee080ea70a 100644
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -229,12 +229,12 @@ void main(unsigned long bist)
ich7_enable_lpc();
-
+ dlpc_init();
/* dock_init initializes the DLPC switch on
* thinpad side, so this is required even
* if we're undocked.
*/
- if (!dlpc_init() && dock_present()) {
+ if (dock_present()) {
dock_connect();
early_superio_config();
/* Set up the console */