Changes for btext and etherboot and filo merge support

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

9 files changed, 84 insertions, 72 deletions

diff --git a/src/mainboard/tyan/s2850/Config.lb b/src/mainboard/tyan/s2850/Config.lb
index 4b1375f4c4..7784192c4f 100644
--- a/src/mainboard/tyan/s2850/Config.lb
+++ b/src/mainboard/tyan/s2850/Config.lb
@@ -33,10 +33,12 @@ default LB_CKS_RANGE_END=122
 default LB_CKS_LOC=123
 
 driver mainboard.o
-#driver adaptec_scsi.o
-#driver si_sata.o
-#driver intel_nic_ipmi.o
-#driver broadcom_nic_ipmi.o
+#dir /drivers/lsi/53c1030
+#dir /drivers/adaptec/7902
+#dir /drivers/si/3114
+#dir /drivers/intel/82551
+#dir /drivers/broadcom/tg3_ipmi
+dir /drivers/ati/ragexl
 #object reset.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
diff --git a/src/mainboard/tyan/s2875/Config.lb b/src/mainboard/tyan/s2875/Config.lb
index 650fc4f22f..595685287e 100644
--- a/src/mainboard/tyan/s2875/Config.lb
+++ b/src/mainboard/tyan/s2875/Config.lb
@@ -35,8 +35,9 @@ default LB_CKS_RANGE_END=122
 default LB_CKS_LOC=123
 
 driver mainboard.o
-#driver si_sata.o
-#driver intel_nic.o
+#dir /drivers/adaptec/7902
+#dir /drivers/si/3114
+#dir /driver/intel/82551
 #object reset.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
diff --git a/src/mainboard/tyan/s2880/Config.lb b/src/mainboard/tyan/s2880/Config.lb
index 0c757dc2df..ef948091b7 100644
--- a/src/mainboard/tyan/s2880/Config.lb
+++ b/src/mainboard/tyan/s2880/Config.lb
@@ -32,10 +32,11 @@ default LB_CKS_LOC=123
 
 
 driver mainboard.o
-#dir ../common/lsi_scsi
-#driver adaptec_scsi.o
-#driver promise_sata.o
-#driver intel_nic.o
+#dir /drivers/lsi/53c1030
+#dir /drivers/adaptec/7902
+#dir /drivers/si/3114
+#dir /drivers/intel/82551
+dir /drivers/ati/ragexl
 #object reset.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
@@ -184,7 +185,8 @@ northbridge amd/amdk8 "mc0"
                         pnp 2e.8 off #  GPIO2
                         pnp 2e.9 off #  GPIO3
                         pnp 2e.a off #  ACPI
-                        pnp 2e.b off #  HW Monitor
+                        pnp 2e.b on  #  HW Monitor
+                                 io 0x60 = 0x290
                 end
         end
 end
diff --git a/src/mainboard/tyan/s2881/Config.lb b/src/mainboard/tyan/s2881/Config.lb
index a82d0b0fe6..733e897470 100644
--- a/src/mainboard/tyan/s2881/Config.lb
+++ b/src/mainboard/tyan/s2881/Config.lb
@@ -34,11 +34,11 @@ default LB_CKS_LOC=123
 
 
 driver mainboard.o
-#driver adaptec_scsi.o
-#driver si_sata.o
-#driver intel_nic.o
-#dir ../drivers/broadcom_nic_ipmi
-dir ../drivers/ati_graph
+#dir /drivers/adaptec/7902
+#dir /drivers/si/3114
+#dir /drivers/intel/82551
+#dir /drivers/broadcom/tg3_ipmi
+dir /drivers/ati/ragexl
 #object reset.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
@@ -171,33 +171,33 @@ northbridge amd/amdk8 "mc0"
                 pci 1:0.1 on
                 pci 1:0.2 on
                 pci 1:1.0 off
-#                superio winbond/w83627hf link 1
-#                        pnp 2e.0 on #  Floppy
-#                                 io 0x60 = 0x3f0
-#                                irq 0x70 = 6
-#                                drq 0x74 = 2
-#                        pnp 2e.1 off #  Parallel Port
-#                                 io 0x60 = 0x378
-#                                irq 0x70 = 7
-#                        pnp 2e.2 on #  Com1
-#                                 io 0x60 = 0x3f8
-#                                irq 0x70 = 4
-#                        pnp 2e.3 off #  Com2
-#                                 io 0x60 = 0x2f8
-#                                irq 0x70 = 3
-#                        pnp 2e.5 on #  Keyboard
-#                                 io 0x60 = 0x60
-#                                 io 0x62 = 0x64
-#                                irq 0x70 = 1
-#				irq 0x72 = 12
-#                        pnp 2e.6 off #  CIR
-#                        pnp 2e.7 off #  GAME_MIDI_GIPO1
-#                        pnp 2e.8 off #  GPIO2
-#                        pnp 2e.9 off #  GPIO3
-#                        pnp 2e.a off #  ACPI
-#                        pnp 2e.b on #  HW Monitor
-#				 io 0x60 = 0x290
-#                end
+                superio winbond/w83627hf link 1
+                        pnp 2e.0 on #  Floppy
+                                 io 0x60 = 0x3f0
+                                irq 0x70 = 6
+                                drq 0x74 = 2
+                        pnp 2e.1 off #  Parallel Port
+                                 io 0x60 = 0x378
+                                irq 0x70 = 7
+                        pnp 2e.2 on #  Com1
+                                 io 0x60 = 0x3f8
+                                irq 0x70 = 4
+                        pnp 2e.3 off #  Com2
+                                 io 0x60 = 0x2f8
+                                irq 0x70 = 3
+                        pnp 2e.5 on #  Keyboard
+                                 io 0x60 = 0x60
+                                 io 0x62 = 0x64
+                                irq 0x70 = 1
+				irq 0x72 = 12
+                        pnp 2e.6 off #  CIR
+                        pnp 2e.7 off #  GAME_MIDI_GIPO1
+                        pnp 2e.8 off #  GPIO2
+                        pnp 2e.9 off #  GPIO3
+                        pnp 2e.a off #  ACPI
+                        pnp 2e.b on #  HW Monitor
+				 io 0x60 = 0x290
+                end
         end
 end
 
diff --git a/src/mainboard/tyan/s2882/Config.lb b/src/mainboard/tyan/s2882/Config.lb
index 7d84e15563..6fa3653083 100644
--- a/src/mainboard/tyan/s2882/Config.lb
+++ b/src/mainboard/tyan/s2882/Config.lb
@@ -33,10 +33,10 @@ default LB_CKS_RANGE_END=122
 default LB_CKS_LOC=123
 
 driver mainboard.o
-#driver adaptec_scsi.o
-#driver si_sata.o
-#driver intel_nic.o
-#driver broadcom_nic.o
+#dir /drvers/adaptec/7902
+#dir /drivers/si/3114
+#dir /drivers/intel/82551_ipmi
+dir /drivers/ati/ragexl
 #object reset.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
@@ -132,7 +132,7 @@ end
 
 makerule ./failover.inc
 	depends "./romcc ./failover.E"
-	action "./romcc -O -o failover.inc --label-prefix=failover ./failover.E"
+	action "./romcc -O2 -o failover.inc --label-prefix=failover ./failover.E"
 end
 
 makerule ./auto.E 
diff --git a/src/mainboard/tyan/s2885/Config.lb b/src/mainboard/tyan/s2885/Config.lb
index 29e0846fd2..33fffe6b48 100644
--- a/src/mainboard/tyan/s2885/Config.lb
+++ b/src/mainboard/tyan/s2885/Config.lb
@@ -35,11 +35,10 @@ default LB_CKS_RANGE_END=122
 default LB_CKS_LOC=123
 
 driver mainboard.o
-#driver broadcom_nic.o
+#dir /drvers/adaptec/7902
+#dir /drivers/si/3114
+#dir /drivers/intel/82551
 driver ti_firewire.o
-#driver adaptec_scsi.o
-driver si_sata.o
-#driver intel_nic.o
 #object reset.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
@@ -158,7 +157,7 @@ northbridge amd/amdk8 "mc0"
         pci 0:18.2
         pci 0:18.3
         southbridge amd/amd8131 "amd8131" link 2
-                pci 0:0.0 
+                pci 0:0.0
                 pci 0:0.1
                 pci 0:1.0
                 pci 0:1.1
@@ -192,7 +191,7 @@ northbridge amd/amdk8 "mc0"
                         pnp 2e.5 on #  Keyboard
                                  io 0x60 = 0x60
                                  io 0x62 = 0x64
-                                irq 0x70 = 1
+                               irq 0x70 = 1
 				irq 0x72 = 12
                         pnp 2e.6 off #  CIR
                         pnp 2e.7 off #  GAME_MIDI_GIPO1
@@ -200,7 +199,7 @@ northbridge amd/amdk8 "mc0"
                         pnp 2e.9 off #  GPIO3
                         pnp 2e.a off #  ACPI
                         pnp 2e.b on #  HW Monitor
-				 io 0x60 = 0x290
+ 				 io 0x60 = 0x290
                 end
 	end
         southbridge amd/amd8151 "amd8151" link 0
@@ -221,8 +220,8 @@ end
 #dir /bioscall
 
 cpu k8 "cpu0"
-	register "up"   = "{.chip = &amd8151, .ht_width=16, .ht_speed=600}"
-	register "down" = "{.chip = &amd8131, .ht_width=16, .ht_speed=600}"
+  register "up" = "{.chip = &amd8151, .ht_width=16, .ht_speed=600}"
+  register "down" = "{.chip = &amd8131, .ht_width=16, .ht_speed=600}"
 end
 
 cpu k8 "cpu1"
diff --git a/src/mainboard/tyan/s2885/mptable.c b/src/mainboard/tyan/s2885/mptable.c
index dd7cefcc85..d9477e2966 100644
--- a/src/mainboard/tyan/s2885/mptable.c
+++ b/src/mainboard/tyan/s2885/mptable.c
@@ -15,6 +15,7 @@ void *smp_write_config_table(void *v, unsigned long * processor_map)
         unsigned char bus_isa;
         unsigned char bus_8131_1;
         unsigned char bus_8131_2;
+	unsigned char bus_8111_0;
         unsigned char bus_8111_1;
 	unsigned char bus_8151_1;
 
@@ -44,6 +45,7 @@ void *smp_write_config_table(void *v, unsigned long * processor_map)
                 /* 8111 */
                 dev = dev_find_slot(3, PCI_DEVFN(0x03,0));
                 if (dev) {
+			bus_8111_0 = pci_read_config8(dev, PCI_PRIMARY_BUS);
                         bus_8111_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
                         bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
                         bus_isa++;
@@ -136,9 +138,9 @@ void *smp_write_config_table(void *v, unsigned long * processor_map)
 	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0xe, 0x2, 0xe);
 	smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,  bus_isa, 0xf, 0x2, 0xf);
 //??? What
-        smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x3, (4<<2)|3, 0x2, 0x13);
-//Onboard AMD AC97 Audio ???
-        smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x3, (4<<2)|1, 0x2, 0x11);
+        smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, bus_8111_0, (4<<2)|3, 0x2, 0x13);
+//Onboard AMD AC97 Audio 
+        smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, bus_8111_0, (4<<2)|1, 0x2, 0x11);
 // Onboard AMD USB
         smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, bus_8111_1, (0<<2)|3, 0x2, 0x13);
 
diff --git a/src/mainboard/tyan/s4880/Config.lb b/src/mainboard/tyan/s4880/Config.lb
index 95714c354c..8de50f59b2 100644
--- a/src/mainboard/tyan/s4880/Config.lb
+++ b/src/mainboard/tyan/s4880/Config.lb
@@ -33,10 +33,11 @@ default LB_CKS_RANGE_END=122
 default LB_CKS_LOC=123
 
 driver mainboard.o
-dir ../common/lsi_scsi
-#driver adaptec_scsi.o
-#driver si_sata.o
-#driver intel_nic.o
+#dir /drivers/lsi/53c1030
+#dir /drivers/adaptec/7902
+#dir /drivers/si/3114
+#dir /drivers/intel/82551
+#dir /drivers/ati/ragexl
 #object reset.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
@@ -184,12 +185,14 @@ northbridge amd/amdk8 "mc0"
                                  io 0x60 = 0x60
                                  io 0x62 = 0x64
                                 irq 0x70 = 1
+				irq 0x72 = 12
                         pnp 2e.6 off #  CIR
                         pnp 2e.7 off #  GAME_MIDI_GIPO1
                         pnp 2e.8 off #  GPIO2
                         pnp 2e.9 off #  GPIO3
                         pnp 2e.a off #  ACPI
-                        pnp 2e.b off #  HW Monitor
+                        pnp 2e.b on  #  HW Monitor
+                                 io 0x60 = 0x290
                 end
         end
 end
@@ -227,7 +230,7 @@ dir /pc80
 #dir /bioscall
 
 cpu k8 "cpu0"
-  register "up" = "{.chip = &amd8131, .ht_width=16, .ht_speed=600}"
+  register "down" = "{.chip = &amd8131, .ht_width=16, .ht_speed=600}"
 end
 
 cpu k8 "cpu1"
diff --git a/src/mainboard/tyan/s4882/Config.lb b/src/mainboard/tyan/s4882/Config.lb
index 9972696a4e..7f6190751d 100644
--- a/src/mainboard/tyan/s4882/Config.lb
+++ b/src/mainboard/tyan/s4882/Config.lb
@@ -34,10 +34,11 @@ default LB_CKS_RANGE_END=122
 default LB_CKS_LOC=123
 
 driver mainboard.o
-dir ../common/lsi_scsi
-#driver adaptec_scsi.o
-#driver si_sata.o
-#driver intel_nic.o
+#dir /drivers/lsi/53c1030
+#dir /drivers/adaptec/7902
+#dir /drivers/si/3114
+#dir /drivers/intel/82551
+#dir /drivers/ati/ragexl
 #object reset.o
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
@@ -188,12 +189,14 @@ northbridge amd/amdk8 "mc0"
                                  io 0x60 = 0x60
                                  io 0x62 = 0x64
                                 irq 0x70 = 1
+				irq 0x72 = 12
                         pnp 2e.6 off #  CIR
                         pnp 2e.7 off #  GAME_MIDI_GIPO1
                         pnp 2e.8 off #  GPIO2
                         pnp 2e.9 off #  GPIO3
                         pnp 2e.a off #  ACPI
-                        pnp 2e.b off #  HW Monitor
+                        pnp 2e.b on  #  HW Monitor
+                                 io 0x60 = 0x290
                 end
         end
 end
@@ -231,7 +234,7 @@ dir /pc80
 #dir /bioscall
 
 cpu k8 "cpu0"
-  register "up" = "{.chip = &amd8131, .ht_width=16, .ht_speed=600}"
+  register "across" = "{.chip = &amd8131, .ht_width=16, .ht_speed=600}"
 end
 
 cpu k8 "cpu1"