diff --git a/src/mainboard/asus/a7m/mainboard.c b/src/mainboard/asus/a7m/mainboard.c
index ea68a9a649..15f44d7dba 100644
--- a/src/mainboard/asus/a7m/mainboard.c
+++ b/src/mainboard/asus/a7m/mainboard.c
@@ -148,10 +148,13 @@ void pci_dump(void)
 	{
 		for(cntb=0;cntb<256;cntb++)
 		{
+			unsigned int bus, devfn;
 			if((cntb%16)==0)
 				printk_info("\n");
 			addr=pci_table[cnta]+cntb;
-			chr=intel_conf_readb(addr);
+			devfn = (addr >> 8) & 0xff;
+			bus = (addr >> 8) & 0xff;
+			pcibios_read_config_byte(0, 0, addr & 0xff, &chr);
 			printk_info("%2.2x ",chr);
 		}
 		printk_info("\n\n");
diff --git a/src/mainboard/compaq/ds10/mainboard.c b/src/mainboard/compaq/ds10/mainboard.c
index 3c35ed14b6..d53ea2e271 100644
--- a/src/mainboard/compaq/ds10/mainboard.c
+++ b/src/mainboard/compaq/ds10/mainboard.c
@@ -2,6 +2,6 @@
 
 void early_mainboard_init(void)
 {
-    void enable_serial(void);
+	extern void enable_serial(void);
 	enable_serial();
 }
diff --git a/src/mainboard/digitallogic/smartcore-p3/Config b/src/mainboard/digitallogic/smartcore-p3/Config
index a29bef0021..91ee8d6597 100644
--- a/src/mainboard/digitallogic/smartcore-p3/Config
+++ b/src/mainboard/digitallogic/smartcore-p3/Config
@@ -29,7 +29,7 @@ option ZKERNEL_START=0xfffc0000
 option ZKERNEL_MASK=0x7f 
 option L440BX=1
 option SMC_BASE=0x3F0
-option CONFIG_UDELAY_TSC
+option CONFIG_UDELAY_TSC=1
 
 object mainboard.o
 object irq_tables.o
diff --git a/src/mainboard/digitallogic/smartcore-p5/Config b/src/mainboard/digitallogic/smartcore-p5/Config
index d3a2cde89b..f1dbc549d0 100644
--- a/src/mainboard/digitallogic/smartcore-p5/Config
+++ b/src/mainboard/digitallogic/smartcore-p5/Config
@@ -24,12 +24,12 @@ superio SMC/fdc37c67x
 
 #option ENABLE_FIXED_AND_VARIABLE_MTRRS
 option PIIX4_DEVFN=0x38
-option NO_KEYBOARD
+option NO_KEYBOARD=1
 option ZKERNEL_START=0xfffc0000
 option ZKERNEL_MASK=0x7f 
-option L430TX
+option L430TX=1
 option SMC_BASE=0x3F0
-option CONFIG_UDELAY_TSC
+option CONFIG_UDELAY_TSC=1
 
 
 object mainboard.o
@@ -38,5 +38,5 @@ object irq_tables.o
 #cpu p6
 cpu p5
 
-#option RAM_TEST
+#option RAM_TEST=1
 
diff --git a/src/mainboard/intel/Clearwater/cmos.layout b/src/mainboard/intel/Clearwater/cmos.layout
new file mode 100644
index 0000000000..84df07a36a
--- /dev/null
+++ b/src/mainboard/intel/Clearwater/cmos.layout
@@ -0,0 +1,84 @@
+entries
+
+#start-bit length  config config-ID    name
+#0            8       r       0        seconds
+#8            8       r       0        alarm_seconds
+#16           8       r       0        minutes
+#24           8       r       0        alarm_minutes
+#32           8       r       0        hours
+#40           8       r       0        alarm_hours
+#48           8       r       0        day_of_week
+#56           8       r       0        day_of_month
+#64           8       r       0        month
+#72           8       r       0        year
+#80           4       r       0        rate_select
+#84           3       r       0        REF_Clock
+#87           1       r       0        UIP
+#88           1       r       0        auto_switch_DST
+#89           1       r       0        24_hour_mode
+#90           1       r       0        binary_values_enable
+#91           1       r       0        square-wave_out_enable
+#92           1       r       0        update_finished_enable
+#93           1       r       0        alarm_interrupt_enable
+#94           1       r       0        periodic_interrupt_enable
+#95           1       r       0        disable_clock_updates
+#96         288       r       0        temporary_filler
+0          384       r       0        reserved_memory
+384          1       e       4        boot_option
+385          1       e       4        last_boot
+392          3       e       5        baud_rate
+395          1       e       2        logical_cpus
+396          1       e       1        thermal_monitoring
+400          1       e       1        power_on_after_fail
+401          1       e       1        ECC_memory
+#402          1       e       2        hda_disk
+#403          1       e       2        hdb_disk
+#404          1       e       2        hdc_disk
+#405          1       e       2        hdd_disk
+#406          2       e       7        boot_device
+408          4       e       9        CPU_clock_speed
+412          4       e       6        debug_level
+1008          16      h       0        check_sum
+
+enumerations
+
+#ID value   text
+1     0     Disable
+1     1     Enable
+2     0     Enable
+2     1     Disable
+4     0     Fall Back
+4     1     Normal
+5     0     115200
+5     1     57600
+5     2     38400
+5     3     19200
+5     4     9600
+5     5     4800
+5     6     2400
+5     7     1200
+6     6     Notice
+6     7     Info
+6     8     Debug
+6     9     Spew
+#7     0     Network
+#7     1     HDD
+#7     2     Floppy
+#7     3     ROM
+9     15    800 MHZ
+9     11    900 MHZ
+9     13    1 GHZ
+9      9    1.1 GHZ
+9     14    1.2 GHZ
+9     10    1.3 GHZ
+9     12    1.4 GHZ
+9      8    1.5 GHZ
+9      7    1.6 GHZ
+9      3    1.7 GHZ
+9      5    1.8 GHZ
+9      1    1.9 GHZ
+9      6    2.0 GHZ
+9      2    2.1 GHZ
+9      4    2.2 GHZ
+9      0    2.3 GHZ
+
diff --git a/src/mainboard/pcchips/m830lr/Config b/src/mainboard/pcchips/m830lr/Config
index 02abde883a..52265bb0bd 100644
--- a/src/mainboard/pcchips/m830lr/Config
+++ b/src/mainboard/pcchips/m830lr/Config
@@ -12,8 +12,8 @@ mainboardinit cpu/k7/earlymtrr.inc
 northsouthbridge sis/735
 nsuperio sis/950 com1={1} floppy=1  lpt=1
 
-option ENABLE_FIXED_AND_VARIABLE_MTRRS
-option FINAL_MAINBOARD_FIXUP
+option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
+option FINAL_MAINBOARD_FIXUP=1
 option HAVE_PIRQ_TABLE=1
 object mainboard.o
 object irq_tables.o
diff --git a/src/northbridge/acer/m1631/northbridge.c b/src/northbridge/acer/m1631/northbridge.c
index 786ca62a43..01ca5ad4f5 100644
--- a/src/northbridge/acer/m1631/northbridge.c
+++ b/src/northbridge/acer/m1631/northbridge.c
@@ -192,7 +192,7 @@ struct mem_range *sizeram(void)
 		mem[1].sizek = 64*1024;
 	}
 	mem[1].sizek -= mem[1].basek;
-	return &mem;
+	return mem;
 }
 
 #ifdef HAVE_FRAMEBUFFER