From 01f887d9f8546be08b51a2752af0473ab51e4214 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 25 Mar 2004 09:31:10 +0000 Subject: Merging patches from Yinghai Lu (fb2_s4882_changes.diff.bz2): - new motherboard: Tyan s4882 - minor changes to 2880, s2881, s2885, s4880 git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1474 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/tyan/s2880/Config.lb | 3 ++- src/mainboard/tyan/s2880/mainboard.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/mainboard/tyan/s2880') diff --git a/src/mainboard/tyan/s2880/Config.lb b/src/mainboard/tyan/s2880/Config.lb index 275170ac9f..892429686d 100644 --- a/src/mainboard/tyan/s2880/Config.lb +++ b/src/mainboard/tyan/s2880/Config.lb @@ -32,7 +32,7 @@ default LB_CKS_LOC=123 driver mainboard.o -#driver lsi_scsi.o +driver lsi_scsi.o #driver adaptec_scsi.o #driver promise_sata.o #driver intel_nic.o @@ -179,6 +179,7 @@ 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 diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c index c8521963d8..17ceb5d916 100644 --- a/src/mainboard/tyan/s2880/mainboard.c +++ b/src/mainboard/tyan/s2880/mainboard.c @@ -120,7 +120,7 @@ static void onboard_scsi_fixup(void) // print_mem(); // amd8111_enable_rom(); } -#if 1 +#if 0 static void vga_fixup(void) { // we do this right here because: // - all the hardware is working, and some VGA bioses seem to need @@ -154,8 +154,8 @@ enable(struct chip *chip, enum chip_pass pass) case CONF_PASS_PRE_BOOT: if (conf->fixup_scsi) onboard_scsi_fixup(); - if (conf->fixup_vga) - vga_fixup(); +// if (conf->fixup_vga) +// vga_fixup(); printk_debug("mainboard fixup pass %d done\r\n", pass); break; -- cgit v1.2.3