From 6b9ddebef398d13a6e81bc4cb6d94f5e461d66ef Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <rminnich@gmail.com>
Date: Wed, 30 Apr 2003 18:09:06 +0000
Subject: [PATCH] bug fixes, etc.

---
 src/arch/i386/lib/Config                |  2 +-
 src/lib/subr.c                          | 13 +++++++++++--
 src/mainboard/supermicro/p4dpeg2/Config |  5 +++--
 src/mainboard/supertek/st3wt/STATUS     |  4 ++--
 src/pc80/Config                         |  1 +
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/arch/i386/lib/Config b/src/arch/i386/lib/Config
index d639bc6e99..780b6e6d46 100644
--- a/src/arch/i386/lib/Config
+++ b/src/arch/i386/lib/Config
@@ -4,7 +4,7 @@ object hardwaremain.o
 object pirq_routing.o HAVE_PIRQ_TABLE
 object vgabios.o CONFIG_VGABIOS
 object idt.o  CONFIG_REALMODE_IDT
-object pci-irq.c CONFIG_PCIBIOS_IRQ
+#object pci-irq.c CONFIG_PCIBIOS_IRQ
 object assignirq.c CONFIG_ASSIGNIRQ
 option CONFIG_LOGICAL_CPUS=1
 option CONFIG_PCIBIOS_IRQ=0
diff --git a/src/lib/subr.c b/src/lib/subr.c
index 529ee95ba8..4e135072fc 100644
--- a/src/lib/subr.c
+++ b/src/lib/subr.c
@@ -15,6 +15,7 @@ static char rcsid[] = "$Id$";
 #include <subr.h>
 #include <string.h>
 #include <pc80/mc146818rtc.h>
+#include <cpu/p6/msr.h>
 
 #ifdef SERIAL_CONSOLE
 #include <serial_subr.h>
@@ -89,9 +90,17 @@ void error(char errmsg[])
  */
 void post_code(uint8_t value)
 {
-#ifdef SERIAL_POST
+#if (SERIAL_POST_TSC==1)
+	unsigned int tsc_high, tsc_low;
+	rdtsc(tsc_low, tsc_high);
+	printk_info("0x%x%xPOST: 0x%02x\n", tsc_high, tsc_low, value);
+#endif
+
+#if (SERIAL_POST==1)
 	printk_info("POST: 0x%02x\n", value);
-#elsif !define(NO_POST)
+#endif
+
+#if !defined(NO_POST)
 	outb(value, 0x80);
 #endif
 }
diff --git a/src/mainboard/supermicro/p4dpeg2/Config b/src/mainboard/supermicro/p4dpeg2/Config
index 6f94acd0cb..fc2819669b 100644
--- a/src/mainboard/supermicro/p4dpeg2/Config
+++ b/src/mainboard/supermicro/p4dpeg2/Config
@@ -241,8 +241,9 @@ expr USE_OPTION_TABLE=!USE_FALLBACK_IMAGE
 ## Compute the location and size of where this firmware image
 ## (linuxBIOS plus bootloader) will live in the boot rom chip.
 ##
-expr ROM_SECTION_SIZE  =(USE_FALLBACK_IMAGE*65536)+(USE_NORMAL_IMAGE*(ROM_SIZE - 65536))
-expr ROM_SECTION_OFFSET=(USE_FALLBACK_IMAGE*(ROM_SIZE-65536))+(USE_NORMAL_IMAGE*0)
+option FALLBACK_IMAGE_SIZE=65536
+expr ROM_SECTION_SIZE  =(USE_FALLBACK_IMAGE*FALLBACK_IMAGE_SIZE)+(USE_NORMAL_IMAGE*(ROM_SIZE - FALLBACK_IMAGE_SIZE))
+expr ROM_SECTION_OFFSET=(USE_FALLBACK_IMAGE*(ROM_SIZE-FALLBACK_IMAGE_SIZE))+(USE_NORMAL_IMAGE*0)
 
 
 ##
diff --git a/src/mainboard/supertek/st3wt/STATUS b/src/mainboard/supertek/st3wt/STATUS
index 72e4518f71..021943d0e9 100644
--- a/src/mainboard/supertek/st3wt/STATUS
+++ b/src/mainboard/supertek/st3wt/STATUS
@@ -4,8 +4,8 @@
 # continuation, if needed, will be via the \ at the end of a line
 # comments are indicated by a '#' as the first character. 
 # the keywords are case-INSENSITIVE
-owner:	Ron Minnich
-email:	rminnich@lanl.gov
+owner:	 Felix Kloeckner 
+email:	root@hamburg.de
 #status: One of unsupported, unstable, stable
 status: unstable
 explanation: 
diff --git a/src/pc80/Config b/src/pc80/Config
index 2c6b0ad8ee..39086d214a 100644
--- a/src/pc80/Config
+++ b/src/pc80/Config
@@ -1,5 +1,6 @@
 object keyboard.o
 object mc146818rtc.o CONFIG_MC146818RTC
+option CONFIG_MC146818RTC=1
 object isa-dma.o
 object i8259.o CONFIG_I8259
 object udelay_timer2.o CONFIG_UDELAY_TIMER2