new from tyan

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

4 files changed, 50 insertions, 34 deletions

diff --git a/targets/tyan/s2880/Config.lb b/targets/tyan/s2880/Config.lb
index 7fba4fd881..1892b25368 100644
--- a/targets/tyan/s2880/Config.lb
+++ b/targets/tyan/s2880/Config.lb
@@ -54,6 +54,8 @@ uses LINUXBIOS_EXTRA_VERSION
 uses XIP_ROM_SIZE
 uses XIP_ROM_BASE
 
+uses HAVE_HARD_RESET
+
 uses CONFIG_VGABIOS
 uses CONFIG_REALMODE_IDT
 uses CONFIG_PCIBIOS
@@ -63,6 +65,8 @@ uses SCSIFW_START
 #
 #uses CONFIG_LSI_SCSI_FW_FIXUP
 
+option HAVE_HARD_RESET=1
+
 option HAVE_OPTION_TABLE=1
 option HAVE_MP_TABLE=1
 option CPU_FIXUP=1
@@ -74,10 +78,10 @@ option k7=1
 option k8=1
 option ROM_SIZE=524288
 
-#option CONFIG_VGABIOS=1
-#option CONFIG_REALMODE_IDT=1
-#option CONFIG_PCIBIOS=1
-#option VGABIOS_START=0xfff8c000
+option CONFIG_VGABIOS=0
+option CONFIG_REALMODE_IDT=0
+option CONFIG_PCIBIOS=0
+option VGABIOS_START=0xfff8c000
 option SCSIFW_START=0xfff80000
 
 
@@ -176,14 +180,14 @@ option DEBUG=1
 option _RAMBASE=0x004000
 
 ##
-## Use a 64K stack
+## Use a 128K stack
 ##
-option STACK_SIZE=0x2000
+option STACK_SIZE=0x4000
 
 ##
-## Use a 64K heap
+## Use a 256K heap
 ##
-option HEAP_SIZE=0x2000
+option HEAP_SIZE=0x8000
 
 #
 ###
@@ -200,6 +204,7 @@ romimage "normal"
 #	48K for SCSI FW and 48K for ATI ROM
 #	option ROM_SIZE = 425984  
         option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option USE_FALLBACK_IMAGE=0
 	option ROM_SECTION_SIZE  = (ROM_SIZE - FALLBACK_SIZE)
 	option ROM_SECTION_OFFSET= 0
 
@@ -231,4 +236,4 @@ romimage "fallback"
 	payload ../../tg3.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2880/ns2880 b/targets/tyan/s2880/ns2880
index 913d194139..01e7fc4dc5 100644
--- a/targets/tyan/s2880/ns2880
+++ b/targets/tyan/s2880/ns2880
@@ -2,5 +2,7 @@
 TYANMB=s2880
 cd "$TYANMB"
 make
+#cat ../fwx.rom ../atix.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
 cat ../fwx.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
+#cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
 cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
diff --git a/targets/tyan/s2882/Config.lb b/targets/tyan/s2882/Config.lb
index f7ba4a402e..5d4287d914 100644
--- a/targets/tyan/s2882/Config.lb
+++ b/targets/tyan/s2882/Config.lb
@@ -54,11 +54,13 @@ uses LINUXBIOS_EXTRA_VERSION
 uses XIP_ROM_SIZE
 uses XIP_ROM_BASE
 
-uses CONFIG_VGABIOS
-uses CONFIG_REALMODE_IDT
-uses CONFIG_PCIBIOS
-uses VGABIOS_START
-uses SCSIFW_START
+uses HAVE_HARD_RESET
+
+#uses CONFIG_VGABIOS
+#uses CONFIG_REALMODE_IDT
+#uses CONFIG_PCIBIOS
+#uses VGABIOS_START
+#uses SCSIFW_START
 
 #
 #uses CONFIG_LSI_SCSI_FW_FIXUP
@@ -74,11 +76,13 @@ option k7=1
 option k8=1
 option ROM_SIZE=524288
 
+option HAVE_HARD_RESET=1
+
 #option CONFIG_VGABIOS=1
 #option CONFIG_REALMODE_IDT=1
 #option CONFIG_PCIBIOS=1
 #option VGABIOS_START=0xfff8c000
-option SCSIFW_START=0xfff80000
+#option SCSIFW_START=0xfff80000
 
 
 option HAVE_FALLBACK_BOOT=1
@@ -175,14 +179,14 @@ option DEBUG=1
 option _RAMBASE=0x004000
 
 ##
-## Use a 64K stack
+## Use a 128K stack
 ##
-option STACK_SIZE=0x2000
+option STACK_SIZE=0x4000
 
 ##
-## Use a 64K heap
+## Use a 256K heap
 ##
-option HEAP_SIZE=0x2000
+option HEAP_SIZE=0x8000
 
 #
 ###
@@ -199,6 +203,7 @@ romimage "normal"
 #	48K for SCSI FW and 48K for ATI ROM
 #	option ROM_SIZE = 425984  
         option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+        option USE_FALLBACK_IMAGE=0
 	option ROM_SECTION_SIZE  = (ROM_SIZE - FALLBACK_SIZE)
 	option ROM_SECTION_OFFSET= 0
 
@@ -230,4 +235,4 @@ romimage "fallback"
 	payload ../../tg3.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2885/Config.lb b/targets/tyan/s2885/Config.lb
index 5fa810c9e9..c1345e0426 100644
--- a/targets/tyan/s2885/Config.lb
+++ b/targets/tyan/s2885/Config.lb
@@ -53,11 +53,12 @@ uses CONFIG_MAX_PHYSICAL_CPUS
 uses LINUXBIOS_EXTRA_VERSION
 uses XIP_ROM_SIZE
 uses XIP_ROM_BASE
+uses HAVE_HARD_RESET
 
-#uses CONFIG_VGABIOS
-#uses CONFIG_REALMODE_IDT
-#uses CONFIG_PCIBIOS
-#uses VGABIOS_START
+uses CONFIG_VGABIOS
+uses CONFIG_REALMODE_IDT
+uses CONFIG_PCIBIOS
+uses VGABIOS_START
 #uses SCSIFW_START
 
 #
@@ -74,10 +75,10 @@ option k7=1
 option k8=1
 option ROM_SIZE=524288
 
-#option CONFIG_VGABIOS=1
-#option CONFIG_REALMODE_IDT=1
-#option CONFIG_PCIBIOS=1
-#option VGABIOS_START=0xfff8c000
+option CONFIG_VGABIOS=1
+option CONFIG_REALMODE_IDT=1
+option CONFIG_PCIBIOS=1
+option VGABIOS_START=1
 #option SCSIFW_START=0xfff80000
 
 
@@ -89,6 +90,8 @@ option CONFIG_CHIP_CONFIGURE=1
 #option CONFIG_LSI_SCSI_FW_FIXUP=1
 
 
+option HAVE_HARD_RESET=0
+
 ###
 ### Build code to export a programmable irq routing table
 ###
@@ -175,14 +178,14 @@ option DEBUG=1
 option _RAMBASE=0x004000
 
 ##
-## Use a 64K stack
+## Use a 128K stack
 ##
-option STACK_SIZE=0x2000
+option STACK_SIZE=0x4000
 
 ##
-## Use a 64K heap
+## Use a 256K heap
 ##
-option HEAP_SIZE=0x2000
+option HEAP_SIZE=0x8000
 
 #
 ###
@@ -199,6 +202,7 @@ romimage "normal"
 #	48K for SCSI FW and 48K for ATI ROM
 #	option ROM_SIZE = 425984  
         option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+        option USE_FALLBACK_IMAGE=0
 	option ROM_SECTION_SIZE  = (ROM_SIZE - FALLBACK_SIZE)
 	option ROM_SECTION_OFFSET= 0
 
@@ -227,7 +231,7 @@ romimage "fallback"
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2885
-	payload ../../tg3.zelf
+	payload ../../tg3--ide_disk.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ROM_SIZE "normal" "fallback"