diff --git a/src/mainboard/tyan/guiness/Config b/src/mainboard/tyan/guiness/Config index 1858aca259..daaddf0b1b 100644 --- a/src/mainboard/tyan/guiness/Config +++ b/src/mainboard/tyan/guiness/Config @@ -36,7 +36,8 @@ ldscript arch/i386/lib/id.lds #mainboardinit arch/i386/lib/noop_failover.inc USE_NORMAL_IMAGE #mainboardinit southbridge/amd/amd766/cmos_reset_failover.inc USE_FALLBACK_IMAGE -ldscript arch/i386/lib/failover.lds USE_FALLBACK_IMAGE +#ldscript arch/i386/lib/failover.lds USE_FALLBACK_IMAGE +ldscript arch/i386/lib/failover-noz.lds USE_FALLBACK_IMAGE ## ## We aren't a reset so shutdown the second cpu if present. @@ -91,7 +92,7 @@ mainboardinit mainboard/tyan/guiness/mainboard_raminit.inc ## northbridge amd/amd76x southbridge amd/amd766 -mainboardinit arch/i386/smp/secondary.inc +#mainboardinit arch/i386/smp/secondary.inc nsuperio winbond/w83627hf com1={1} com2={0} floppy=1 lpt=1 keyboard=1 dir ../../../pc80 dir /src/superio/winbond/w83627hf @@ -219,7 +220,7 @@ expr USE_NORMAL_IMAGE=!USE_FALLBACK_IMAGE option ROM_SIZE=524288 ## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy. -option ROM_IMAGE_SIZE=49152 +option ROM_IMAGE_SIZE=65535 ## ## Use a small 8K stack @@ -247,13 +248,17 @@ expr ROM_SECTION_OFFSET=(USE_FALLBACK_IMAGE*(ROM_SIZE-65536))+(USE_NORMAL_IMAGE* ## Compute the start location and size size of ## The linuxBIOS bootloader. ## -expr ZKERNEL_START =(0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1) +#expr ZKERNEL_START =(0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1) + +ldscript arch/i386/lib/failover.lds USE_FALLBACK_IMAGE +expr ZKERNEL_START = 0xfff80000 expr PAYLOAD_SIZE =ROM_SECTION_SIZE - ROM_IMAGE_SIZE ## ## Compute where this copy of linuxBIOS will start in the boot rom ## -expr _ROMBASE =ZKERNEL_START + PAYLOAD_SIZE +#expr _ROMBASE =ZKERNEL_START + PAYLOAD_SIZE +expr _ROMBASE = 0xffff0000 ## ## Compute a range of ROM that can cached to speed up linuxBIOS, diff --git a/src/mainboard/tyan/guiness/STATUS b/src/mainboard/tyan/guiness/STATUS index 72e4518f71..5357d43527 100644 --- a/src/mainboard/tyan/guiness/STATUS +++ b/src/mainboard/tyan/guiness/STATUS @@ -4,22 +4,22 @@ # continuation, if needed, will be via the \ at the end of a line # comments are indicated by a '#' as the first character. # the keywords are case-INSENSITIVE -owner: Ron Minnich -email: rminnich@lanl.gov +owner: Steven James +email: pyro@linuxlabs.com #status: One of unsupported, unstable, stable status: unstable -explanation: +explanation: still testing for stability flash-types: -payload-types: +payload-types: ELF, etherboot, bootselect # e.g. linux, plan 9, wince, etc. -OS-types: +OS-types: linux # e.g. "Plan 9 interrupts don't work on this chipset" OS-issues: -console-types: +console-types: serial # vga is unsupported, unstable, or stable -vga: +vga: unsupported # Last-known-good follows the internationl date standard: day/month/year -last-known-good: 0/0/0000 +last-known-good: 19/12/2002 Comments: Links: Mainboard-revision: diff --git a/src/mainboard/tyan/guiness/mainboard.c b/src/mainboard/tyan/guiness/mainboard.c index 1eaeab3398..db5d2ff2a3 100644 --- a/src/mainboard/tyan/guiness/mainboard.c +++ b/src/mainboard/tyan/guiness/mainboard.c @@ -93,7 +93,8 @@ static void fixup_adaptec_7899P(struct pci_dev *pdev) /* Set the device id */ pci_write_config_word(pdev, PCI_DEVICE_ID, PCI_DEVICE_ID_ADAPTEC2_7899P); /* Set the subsytem vendor id */ - pci_write_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, PCI_VENDOR_ID_TYAN); +// pci_write_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, PCI_VENDOR_ID_TYAN); + pci_write_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, 0x10f1); /* Set the subsytem id */ pci_write_config_word(pdev, PCI_SUBSYSTEM_ID, 0x2462); /* Disable writes to the device id */ @@ -130,11 +131,11 @@ static void set_power_on_after_power_fail(int setting) case MAINBOARD_POWER_ON: default: amd766_power_after_power_fail(1); - w832627hf_power_after_power_fail(POWER_ON); + w83627hf_power_after_power_fail(POWER_ON); break; case MAINBOARD_POWER_OFF: amd766_power_after_power_fail(0); - w832627hf_power_after_power_fail(POWER_OFF); + w83627hf_power_after_power_fail(POWER_OFF); break; }