X60: fix docking

[coreboot.git] / src / mainboard / lenovo / x60 / romstage.c

diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 85b2241df6a795175c355bd5e165eb114a7224af..ee080ea70a8f3438ba13498413a89d7dd91af992 100644 (file)
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -32,7 +32,6 @@
 #include <lib.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
-#include <usbdebug.h>
 #include <cpu/x86/bist.h>
 #include "northbridge/intel/i945/i945.h"
 #include "northbridge/intel/i945/raminit.h"
@@ -230,23 +229,17 @@ 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 */
-               uart_init();
        }
 
-#if CONFIG_USBDEBUG
-       i82801gx_enable_usbdebug(1);
-       early_usbdebug_init();
-#endif
-
        console_init();
 
        /* Halt if there was a built in self test failure */
@@ -341,9 +334,7 @@ void main(unsigned long bist)
                        memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE, HIGH_MEMORY_SAVE);
 
                /* Magic for S3 resume */
-               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, 0xcafed00d);
+               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_ACPI_S3_MAGIC);
        }
 #endif
-       /* Set legacy Brightness control to full brightness */
-       pci_write_config8(PCI_DEV(0, 2, 1), 0xf4, 0xff);
 }