diff options
| author | Yinghai Lu <yinghailu@gmail.com> | 2004-04-28 05:37:36 +0000 |
|---|---|---|
| committer | Yinghai Lu <yinghailu@gmail.com> | 2004-04-28 05:37:36 +0000 |
| commit | 97c4947ec9af1664e81ee797834a32d3ca2f74fe (patch) | |
| tree | 33f41aaaf4c61c0b41ae4751081d2c369ee371b0 /src/mainboard/tyan/s2885 | |
| parent | 48d11d557f725ecf89678a1b9df440417b8da225 (diff) | |
Changes for btext and etherboot and filo merge support
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1540 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/tyan/s2885')
| -rw-r--r-- | src/mainboard/tyan/s2885/Config.lb | 17 | ||||
| -rw-r--r-- | src/mainboard/tyan/s2885/mptable.c | 8 |
2 files changed, 13 insertions, 12 deletions
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); |