Tyan update for ROM_IMAGE_SIZE > 64K

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

4 files changed, 41 insertions, 22 deletions

diff --git a/src/mainboard/tyan/s2881/Config.lb b/src/mainboard/tyan/s2881/Config.lb
index 3bdbfa4fe7..fa563fb497 100644
--- a/src/mainboard/tyan/s2881/Config.lb
+++ b/src/mainboard/tyan/s2881/Config.lb
@@ -43,26 +43,27 @@ if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
 #object reset.o
 
+
 ##
 ## Romcc output
 ##
 makerule ./failover.E
-	depends "$(MAINBOARD)/failover.c" 
-	action "$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/failover.c > ./failover.E"
+        depends "$(MAINBOARD)/failover.c ./romcc"
+        action "./romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
 end
 
 makerule ./failover.inc
-	depends "./failover.E ./romcc"
-	action "./romcc -O -o failover.inc --label-prefix=failover ./failover.E"
+        depends "$(MAINBOARD)/failover.c ./romcc"
+        action "./romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
 end
 
-makerule ./auto.E 
-	depends	"$(MAINBOARD)/auto.c option_table.h " 
-	action	"$(CPP) -I$(TOP)/src -I. $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/auto.c > ./auto.E"
+makerule ./auto.E
+        depends "$(MAINBOARD)/auto.c option_table.h ./romcc"
+        action  "./romcc -E -mcpu=k8 -O2 -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@"
 end
-makerule ./auto.inc 
-	depends "./auto.E ./romcc"
-	action	"./romcc -mcpu=k8 -O2 ./auto.E > auto.inc"
+makerule ./auto.inc
+        depends "$(MAINBOARD)/auto.c option_table.h ./romcc"
+        action  "./romcc    -mcpu=k8 -O2 -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@"
 end
 
 ##
@@ -171,14 +172,21 @@ chip northbridge/amd/amdk8
                                 			irq 0x70 = 1
 							irq 0x72 = 12
 						end
-                        			device pnp 2e.6 off end #  CIR
-                        			device pnp 2e.7 off end #  GAME_MIDI_GIPO1
-                        			device pnp 2e.8 off end #  GPIO2
-                        			device pnp 2e.9 off end #  GPIO3
-                        			device pnp 2e.a off end #  ACPI
-                        			device pnp 2e.b on #  HW Monitor
- 				 			io 0x60 = 0x290
-                				end
+                                                device pnp 2e.6 off #  CIR
+                                                        io 0x60 = 0x100
+                                                end
+                                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
+                                                        io 0x60 = 0x201
+                                                        io 0x62 = 0x330
+                                                        irq 0x70 = 9
+                                                end  
+                                                device pnp 2e.8 off end #  GPIO2
+                                                device pnp 2e.9 off end #  GPIO3
+                                                device pnp 2e.a off end #  ACPI
+                                                device pnp 2e.b on #  HW Monitor
+                                                        io 0x60 = 0x290
+                                                        irq 0x70 = 5
+                                                end
 					end
 				end
 				device pci 1.1 on end
diff --git a/src/mainboard/tyan/s2881/Options.lb b/src/mainboard/tyan/s2881/Options.lb
index 35908cab8f..e65f53c9b1 100644
--- a/src/mainboard/tyan/s2881/Options.lb
+++ b/src/mainboard/tyan/s2881/Options.lb
@@ -32,6 +32,8 @@ uses LB_CKS_LOC
 uses MAINBOARD_PART_NUMBER
 uses MAINBOARD_VENDOR
 uses MAINBOARD
+uses MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+uses MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 uses LINUXBIOS_EXTRA_VERSION
 uses _RAMBASE
 uses CC
@@ -43,6 +45,8 @@ uses DEFAULT_CONSOLE_LOGLEVEL
 uses MAXIMUM_CONSOLE_LOGLEVEL
 uses MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_SERIAL8250
+uses HAVE_INIT_TIMER
+uses CONFIG_GDB_STUB
 
 
 ###
@@ -117,6 +121,8 @@ default CONFIG_IOAPIC=1
 ##
 default MAINBOARD_PART_NUMBER="Tyan"
 default MAINBOARD_VENDOR="s2881"
+default MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x10f1
+default MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2881
 
 ###
 ### LinuxBIOS layout values
@@ -161,6 +167,11 @@ default CC="gcc"
 default HOSTCC="gcc"
 
 ##
+## Disable the gdb stub by default
+## 
+default CONFIG_GDB_STUB=0
+
+##
 ## The Serial Console
 ##
 
diff --git a/src/mainboard/tyan/s2881/auto.c b/src/mainboard/tyan/s2881/auto.c
index f9d352cc86..9774d86586 100644
--- a/src/mainboard/tyan/s2881/auto.c
+++ b/src/mainboard/tyan/s2881/auto.c
@@ -123,12 +123,13 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 	return smbus_read_byte(device, address);
 }
 
-//#include "northbridge/amd/amdk8/setup_resource_map.c"
+#include "northbridge/amd/amdk8/setup_resource_map.c"
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/coherent_ht.c"
 #include "sdram/generic_sdram.c"
 
-#include "resourcemap.c" /* tyan does not want the default */
+ /* tyan does not want the default */
+#include "resourcemap.c"
 
 #define FIRST_CPU  1
 #define SECOND_CPU 1
@@ -167,7 +168,7 @@ static void main(unsigned long bist)
                 init_timer();
 
                 if (cpu_init_detected()) {
-#if 0
+#if 1
                         asm volatile ("jmp __cpu_reset");
 #else                   
                 /* cpu reset also reset the memtroller ????
diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c
index 2709be8cf9..e058fe6a6d 100644
--- a/src/mainboard/tyan/s2881/mainboard.c
+++ b/src/mainboard/tyan/s2881/mainboard.c
@@ -269,6 +269,5 @@ static void enable_dev(struct device *dev)
 	dev_root.ops = &mainboard_operations;
 }
 struct chip_operations mainboard_tyan_s2881_ops = {
-	.name      = "Tyan s2881 mainboard ",
 	.enable_dev = enable_dev, 
 };