diff --git a/mainboard/kontron/986lcd-m/cmos.layout b/mainboard/kontron/986lcd-m/cmos.layout
index ba42513c9c..bf4ba64a94 100644
--- a/mainboard/kontron/986lcd-m/cmos.layout
+++ b/mainboard/kontron/986lcd-m/cmos.layout
@@ -129,6 +129,6 @@ enumerations
 # -----------------------------------------------------------------
 checksums
 
-checksum 392 983 984
+#checksum 392 983 984
 
 
diff --git a/mainboard/kontron/986lcd-m/initram.c b/mainboard/kontron/986lcd-m/initram.c
index a1623e5663..f47898d1fe 100644
--- a/mainboard/kontron/986lcd-m/initram.c
+++ b/mainboard/kontron/986lcd-m/initram.c
@@ -212,4 +212,5 @@ int main(void)
 	}
 #endif
 	MCHBAR16(SSKPD) = 0xCAFE;
+	return 0;
 }
diff --git a/mainboard/kontron/986lcd-m/mainboard.h b/mainboard/kontron/986lcd-m/mainboard.h
index e6b347a308..a13da94b7d 100644
--- a/mainboard/kontron/986lcd-m/mainboard.h
+++ b/mainboard/kontron/986lcd-m/mainboard.h
@@ -20,3 +20,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
+
+#define CHANNEL_XOR_RANDOMIZATION 0
+#define ENABLE_ACPI_MODE_IN_COREBOOT 1
+
+/* never defined in v2 */
+#define MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID 0
+#define MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID 0
+
+/* nowhere else to go yet */
+#define TEST_SMM_FLASH_LOCKDOWN 0
+#define MAINBOARD_POWER_ON_AFTER_POWER_FAIL 1
\ No newline at end of file
diff --git a/southbridge/intel/i82801gx/lpc.c b/southbridge/intel/i82801gx/lpc.c
index 246b485248..54ec795a0d 100644
--- a/southbridge/intel/i82801gx/lpc.c
+++ b/southbridge/intel/i82801gx/lpc.c
@@ -28,6 +28,8 @@
 #include <io.h>
 #include <statictree.h>
 #include <config.h>
+#include <mainboard.h>
+#include <mc146818rtc.h>
 #include "i82801gx.h"
 
 #include "../../../northbridge/intel/i945/ich7.h"
@@ -159,10 +161,10 @@ static void i82801gx_power_options(struct device * dev)
 	nmi_option = NMI_OFF;
 	get_option(&nmi_option, "nmi");
 	if (nmi_option) {
-		printk_info ("NMI sources enabled.\n");
+		printk(BIOS_INFO, "NMI sources enabled.\n");
 		reg8 &= ~(1 << 7);	/* Set NMI. */
 	} else {
-		printk_info ("NMI sources disabled.\n");
+		printk(BIOS_INFO, "NMI sources disabled.\n");
 		reg8 |= ( 1 << 7);	/* Can't mask NMI from PCI-E and NMI_NOW */
 	}
 	outb(reg8, 0x70);
@@ -181,7 +183,6 @@ static void i82801gx_power_options(struct device * dev)
 void i82801gx_rtc_init(struct device *dev)
 {
 	u8 reg8;
-	u32 reg32;
 	int rtc_failed;
 
 	reg8 = pci_read_config8(dev, GEN_PMCON_3);
@@ -218,8 +219,9 @@ static void enable_hpet(struct device *dev)
 static void i82801gx_lock_smm(struct device *dev)
 {
 	void smm_lock(void);
+#if TEST_SMM_FLASH_LOCKDOWN
 	u8 reg8;
-
+#endif
 #if ENABLE_ACPI_MODE_IN_COREBOOT
 	printk(BIOS_DEBUG, "Enabling ACPI via APMC:\n");
 	outb(0xe1, 0xb2); // Enable ACPI mode
diff --git a/southbridge/intel/i82801gx/pci.c b/southbridge/intel/i82801gx/pci.c
index 7c27f16d75..b0f9f7e36c 100644
--- a/southbridge/intel/i82801gx/pci.c
+++ b/southbridge/intel/i82801gx/pci.c
@@ -27,6 +27,7 @@
 #include <device/pci_ids.h>
 #include <statictree.h>
 #include <config.h>
+#include <mainboard.h>
 
 static void pci_init(struct device *dev)
 {