VERSION and rom_image_size

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

14 files changed, 163 insertions, 73 deletions

diff --git a/targets/tyan/s2850/Config.lb b/targets/tyan/s2850/Config.lb
index 7c763e75a8..3b52fcc772 100644
--- a/targets/tyan/s2850/Config.lb
+++ b/targets/tyan/s2850/Config.lb
@@ -7,43 +7,53 @@ mainboard tyan/s2850
 
 # Tyan s2850
 romimage "normal"
-#       48K for SCSI FW or ati rom
+#       48K for SCSI FW or ATI ROM
         option ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
 #       option ROM_SIZE = 425984 
 #       64K for Etherboot
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x10000
-	option ROM_IMAGE_SIZE=0x13800
+#	option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x17800
+	option ROM_IMAGE_SIZE=0x13c00
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
-        payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#	payload ../../../payloads/tg3.zelf
+#	payload ../../../payloads/tg3_vga.zelf
+#	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+	payload ../../../payloads/tg3--filo_u_hda2_vga.zelf
+#        payload ../../../payloads/tg3--filo_hda2_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
-#	payload ../../../payloads/tg3--filo_btext_hda2.zelf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-#	option ROM_IMAGE_SIZE=0x10000
-	option ROM_IMAGE_SIZE=0x13800
+#	option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x17800
+	option ROM_IMAGE_SIZE=0x13c00
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
-	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#	payload ../../../payloads/tg3.zelf
+#	payload ../../../payloads/tg3_vga.zelf
+#	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+	payload ../../../payloads/tg3--filo_u_hda2_vga.zelf
+#        payload ../../../payloads/tg3--filo_hda2_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
-#	payload ../../../payloads/tg3--filo_btext_hda2.zelf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2875/Config.lb b/targets/tyan/s2875/Config.lb
index cb4138064e..611fbfcb92 100644
--- a/targets/tyan/s2875/Config.lb
+++ b/targets/tyan/s2875/Config.lb
@@ -1,43 +1,57 @@
 # Sample config file for 
-# the Tyan s2875 
+# the Tyan s2875
 # This will make a target directory of ./s2875
 
 target s2875
 mainboard tyan/s2875
 
-# Tyan s2895
+# Tyan s2875
 romimage "normal"
-#       48K for SCSI FW
-#        option ROM_SIZE = 475136
+#       48K for SCSI FW or ATI ROM
+        option ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
 #       option ROM_SIZE = 425984 
 #       64K for Etherboot
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x10000
+#	option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x13800
+	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x17800
+	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo.zelf
+#	payload ../../../payloads/tg3.zelf
+#	payload ../../../payloads/tg3_vga.zelf
+	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#        payload ../../../payloads/tg3--filo_hda2_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x10000
+#	option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x13800
+	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x17800
+	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo.zelf
+#	payload ../../../payloads/tg3.zelf
+#	payload ../../../payloads/tg3_vga.zelf
+	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#        payload ../../../payloads/tg3--filo_hda2_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2880/Config.lb b/targets/tyan/s2880/Config.lb
index e0a7d26d81..6dbde5768e 100644
--- a/targets/tyan/s2880/Config.lb
+++ b/targets/tyan/s2880/Config.lb
@@ -1,43 +1,57 @@
 # Sample config file for 
-# the Tyan s2880 
+# the Tyan s2880
 # This will make a target directory of ./s2880
 
 target s2880
 mainboard tyan/s2880
 
-# Tyan s2895
+# Tyan s2880
 romimage "normal"
-#       48K for SCSI FW
-#        option ROM_SIZE = 475136
+#       48K for SCSI FW or ATI ROM
+        option ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
 #       option ROM_SIZE = 425984 
 #       64K for Etherboot
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x10000
+#	option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x13800
+	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x17800
+	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo.zelf
+#	payload ../../../payloads/tg3.zelf
+#	payload ../../../payloads/tg3_vga.zelf
+	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#        payload ../../../payloads/tg3--filo_hda2_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x10000
+#	option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x13800
+	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x17800
+	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo.zelf
+#	payload ../../../payloads/tg3.zelf
+#	payload ../../../payloads/tg3_vga.zelf
+	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#        payload ../../../payloads/tg3--filo_hda2_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2880/VERSION b/targets/tyan/s2880/VERSION
index cd5ac039d6..6f304b5eb5 100644
--- a/targets/tyan/s2880/VERSION
+++ b/targets/tyan/s2880/VERSION
@@ -1 +1 @@
-2.0
+_s2880
diff --git a/targets/tyan/s2881/Config.lb b/targets/tyan/s2881/Config.lb
index 0947dadb78..1caa8e524b 100644
--- a/targets/tyan/s2881/Config.lb
+++ b/targets/tyan/s2881/Config.lb
@@ -7,37 +7,47 @@ mainboard tyan/s2881
 
 # Tyan s2881
 romimage "normal"
-#       48K for SCSI FW
-#        option ROM_SIZE = 475136
+#       48K for SCSI FW or ATI ROM
+        option ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
 #       option ROM_SIZE = 425984 
 #       64K for Etherboot
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x10000
+#        option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x13000
+	option ROM_IMAGE_SIZE=0x16200
+        option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
 #        payload ../../../payloads/tg3--filo.zelf
+	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#	payload ../../../payloads/tg3--filo_btext_hda2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x10000
+#        option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x13000
+	option ROM_IMAGE_SIZE=0x16200
+        option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
 #        payload ../../../payloads/tg3--filo.zelf
+	payload ../../../payloads/tg3--filo_hda2_vga.zelf
 #       payload ../../../payloads/e1000--filo.zelf
+#	payload ../../../payloads/tg3--filo_btext_hda2.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2881/VERSION b/targets/tyan/s2881/VERSION
index cd5ac039d6..e1c66a3f5e 100644
--- a/targets/tyan/s2881/VERSION
+++ b/targets/tyan/s2881/VERSION
@@ -1 +1 @@
-2.0
+_s2881
diff --git a/targets/tyan/s2882/Config.lb b/targets/tyan/s2882/Config.lb
index d5b799aebc..7118d47299 100644
--- a/targets/tyan/s2882/Config.lb
+++ b/targets/tyan/s2882/Config.lb
@@ -7,14 +7,16 @@ mainboard tyan/s2882
 
 # Tyan s2882
 romimage "normal"
-#       48K for SCSI FW
-#        option ROM_SIZE = 475136
+#       48K for SCSI FW or ATI ROM
+        option ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
 #       option ROM_SIZE = 425984 
 #       64K for Etherboot
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x10000
+#        option ROM_IMAGE_SIZE=0x11800
+	option ROM_IMAGE_SIZE=0x16300
+        option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -23,12 +25,15 @@ romimage "normal"
 #        payload ../../../payloads/tg3--filo.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x10000
+#        option ROM_IMAGE_SIZE=0x11800
+	option ROM_IMAGE_SIZE=0x16300
+        option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -37,7 +42,8 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--filo.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2882/VERSION b/targets/tyan/s2882/VERSION
index cd5ac039d6..fe289cefde 100644
--- a/targets/tyan/s2882/VERSION
+++ b/targets/tyan/s2882/VERSION
@@ -1 +1 @@
-2.0
+_s2882
diff --git a/targets/tyan/s2885/Config.lb b/targets/tyan/s2885/Config.lb
index 63f2a51ffc..98e00826d5 100644
--- a/targets/tyan/s2885/Config.lb
+++ b/targets/tyan/s2885/Config.lb
@@ -14,32 +14,48 @@ romimage "normal"
 #       64K for Etherboot
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x10400
+#	option ROM_IMAGE_SIZE=0x13800
+	option ROM_IMAGE_SIZE=0x17800
+#	option ROM_IMAGE_SIZE=0x16000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
-#       payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo.zelf
+#        payload ../../../payloads/filo.zelf
+#        payload ../../../payloads/tg3--filo_hda2.zelf
+#	payload ../../../payloads/tg3.zelf
+	payload ../../../payloads/tg3_vga.zelf
+#	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#	payload ../../../payloads/tg3_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
+#	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x10400
+#	option ROM_IMAGE_SIZE=0x13800
+	option ROM_IMAGE_SIZE=0x17800
+#	option ROM_IMAGE_SIZE=0x16000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
-#       payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo.zelf
+#        payload ../../../payloads/filo.zelf
+#        payload ../../../payloads/tg3--filo_hda2.zelf
+#	payload ../../../payloads/tg3.zelf
+	payload ../../../payloads/tg3_vga.zelf
+#	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#	payload ../../../payloads/tg3_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
+#	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2885/VERSION b/targets/tyan/s2885/VERSION
index cd5ac039d6..90544dffce 100644
--- a/targets/tyan/s2885/VERSION
+++ b/targets/tyan/s2885/VERSION
@@ -1 +1 @@
-2.0
+_s2885
diff --git a/targets/tyan/s4880/Config.lb b/targets/tyan/s4880/Config.lb
index bbecebe1e0..84a7f2105a 100644
--- a/targets/tyan/s4880/Config.lb
+++ b/targets/tyan/s4880/Config.lb
@@ -1,5 +1,5 @@
 # Sample config file for 
-# the Tyan s4880 
+# the Tyan s4880
 # This will make a target directory of ./s4880
 
 target s4880
@@ -7,39 +7,45 @@ mainboard tyan/s4880
 
 # Tyan s4880
 romimage "normal"
-#       48K for SCSI FW
-#        option ROM_SIZE = 475136
+#       48K for SCSI FW or ATI ROM
+        option ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
 #       option ROM_SIZE = 425984 
 #       64K for Etherboot
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x19000
+	option ROM_IMAGE_SIZE=0x19c00
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo.zelf
+#	payload ../../../payloads/tg3.zelf
+	payload ../../../payloads/tg3_vga.zelf
+#        payload ../../../payloads/tg3--filo_hda2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x19000
+	option ROM_IMAGE_SIZE=0x19c00
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo.zelf
+#	payload ../../../payloads/tg3.zelf
+	payload ../../../payloads/tg3_vga.zelf
+#        payload ../../../payloads/tg3--filo_hda2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s4880/VERSION b/targets/tyan/s4880/VERSION
index cd5ac039d6..2ce15180e7 100644
--- a/targets/tyan/s4880/VERSION
+++ b/targets/tyan/s4880/VERSION
@@ -1 +1 @@
-2.0
+_s4880
diff --git a/targets/tyan/s4882/Config.lb b/targets/tyan/s4882/Config.lb
index b49abc221c..0e4f336596 100644
--- a/targets/tyan/s4882/Config.lb
+++ b/targets/tyan/s4882/Config.lb
@@ -1,5 +1,5 @@
 # Sample config file for 
-# the Tyan s4882 
+# the Tyan s4882
 # This will make a target directory of ./s4882
 
 target s4882
@@ -7,39 +7,53 @@ mainboard tyan/s4882
 
 # Tyan s4882
 romimage "normal"
-#       48K for SCSI FW
-#        option ROM_SIZE = 475136
+#       48K for SCSI FW or ATI ROM
+        option ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
 #       option ROM_SIZE = 425984 
 #       64K for Etherboot
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x19000
+#	option ROM_IMAGE_SIZE=0x19c00
+#	option ROM_IMAGE_SIZE=0x18800
+	option ROM_IMAGE_SIZE=0x16200
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo.zelf
+#	payload ../../../payloads/tg3.zelf
+#	payload ../../../payloads/tg3_vga.zelf
+#	payload ../../../payloads/filo_vga_memtest.zelf
+	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#        payload ../../../payloads/tg3--filo_hda2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x19000
+#	option ROM_IMAGE_SIZE=0x19c00
+#	option ROM_IMAGE_SIZE=0x18800
+	option ROM_IMAGE_SIZE=0x16200
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
-#        payload ../../../payloads/tg3--filo.zelf
+#	payload ../../../payloads/tg3.zelf
+#	payload ../../../payloads/tg3_vga.zelf
+#	payload ../../../payloads/filo_vga_kernel.zelf
+	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+#        payload ../../../payloads/tg3--filo_hda2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s4882/VERSION b/targets/tyan/s4882/VERSION
index cd5ac039d6..d1a14e021f 100644
--- a/targets/tyan/s4882/VERSION
+++ b/targets/tyan/s4882/VERSION
@@ -1 +1 @@
-2.0
+_s4882