updates from YhLu, plus fixes for PPC/K8 issues.

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1059 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

3 files changed, 20 insertions, 17 deletions

diff --git a/src/mainboard/tyan/s2880/Config.lb b/src/mainboard/tyan/s2880/Config.lb
index a83389f0c1..1b0552bf50 100644
--- a/src/mainboard/tyan/s2880/Config.lb
+++ b/src/mainboard/tyan/s2880/Config.lb
@@ -16,9 +16,11 @@ uses ARCH
 ### Build the objects we have code for in this directory.
 ###
 ##object mainboard.o
-config chip.h
-register "fixup_scsi" = "1"
+#config chip.h
+#register "fixup_scsi" = "1"
+
 driver mainboard.o
+driver lsi_scsi.o
 object static_devices.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
@@ -128,8 +130,9 @@ makerule ./auto.E
 	action	"$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/auto.c > ./auto.E"
 end
 makerule ./auto.inc 
-	depends "./romcc ./auto.E" 
-	action	"./romcc -mcpu=k8  -O ./auto.E > auto.inc"
+	depends "./romcc ./auto.E"
+	action "./romcc -O -mcpu=k8 -o auto.inc --label-prefix=auto ./auto.E" 
+#	action	"./romcc -mcpu=k8  -O ./auto.E > auto.inc"
 end
 mainboardinit cpu/k8/enable_mmx_sse.inc
 mainboardinit ./auto.inc
@@ -152,10 +155,10 @@ end
 southbridge amd/amd8131
 end
 #mainboardinit archi386/smp/secondary.inc
-superio NSC/pc87360
-	register "com1" = "{1}"
-	register "lpt" = "{1}"
-end
+#superio NSC/pc87360
+#	register "com1" = "{1}"
+#	register "lpt" = "{1}"
+#end
 dir /pc80
 ##dir /src/superio/winbond/w83627hf
 cpu p5 end
diff --git a/src/mainboard/tyan/s2880/auto.c b/src/mainboard/tyan/s2880/auto.c
index e09662223c..076bfffb2c 100644
--- a/src/mainboard/tyan/s2880/auto.c
+++ b/src/mainboard/tyan/s2880/auto.c
@@ -183,21 +183,21 @@ static void main(void)
 	dump_pci_devices();
 #endif
 #if 0
-	dump_pci_device(PCI_DEV(0, 0x18, 2));
+	dump_pci_device(PCI_DEV(0, 0x18, 1));
 #endif
 
 	/* Check all of memory */
 #if 0
 	msr_t msr;
-	msr = rdmsr(TOP_MEM);
-	print_debug("TOP_MEM: ");
+	msr = rdmsr(TOP_MEM2);
+	print_debug("TOP_MEM2: ");
 	print_debug_hex32(msr.hi);
 	print_debug_hex32(msr.lo);
 	print_debug("\r\n");
 #endif
 /*
-#if 1
-	ram_check(0x00000000, msr.lo);
+#if  0
+	ram_check(0x00000000, msr.lo+(msr.hi<<32));
 #else
 #if TOTAL_CPUS < 2
 	// Check 16MB of memory @ 0
diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c
index 7e037c5cd4..4c86db85ce 100644
--- a/src/mainboard/tyan/s2880/mainboard.c
+++ b/src/mainboard/tyan/s2880/mainboard.c
@@ -1,10 +1,10 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/chip.h>
+//#include <device/chip.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include "chip.h"
+//#include "chip.h"
 //#include <part/mainboard.h>
 //#include "lsi_scsi.c"
 unsigned long initial_apicid[MAX_CPUS] =
@@ -105,7 +105,7 @@ static void onboard_scsi_fixup(void)
 */
 }
  
-
+/*
 static void
 enable(struct chip *chip, enum chip_pass pass)
 {
@@ -135,4 +135,4 @@ struct chip_control mainboard_tyan_s2880_control = {
 	        enable: enable,
 	        name:   "Tyan s2880 mainboard "
 };
-
+*/