1201_ht_bus0_dev0_fidvid_mb.diff - part 3

issue 41 - fix up motherboard compilation

target configuration files. Who wants to do some major cleanup here some
time? The fixed/relative paths in payloads are nasty.



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

12 files changed, 134 insertions, 55 deletions

diff --git a/targets/tyan/s2850/Config.lb b/targets/tyan/s2850/Config.lb
index a2258c8a92..24bb2bd344 100644
--- a/targets/tyan/s2850/Config.lb
+++ b/targets/tyan/s2850/Config.lb
@@ -15,9 +15,10 @@ romimage "normal"
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x11800
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
 #	option ROM_IMAGE_SIZE=0x17800
 #	option ROM_IMAGE_SIZE=0x13c00
+	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -26,7 +27,7 @@ romimage "normal"
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
 #	payload ../../../payloads/tg3_vga.zelf
-	payload ../../../payloads/tg3--filo_hda2_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
@@ -37,9 +38,10 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 #	option ROM_IMAGE_SIZE=0x11800
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
 #	option ROM_IMAGE_SIZE=0x17800
 #	option ROM_IMAGE_SIZE=0x13c00
+	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -48,7 +50,7 @@ romimage "fallback"
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
 #	payload ../../../payloads/tg3_vga.zelf
-	payload ../../../payloads/tg3--filo_hda2_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
diff --git a/targets/tyan/s2875/Config.lb b/targets/tyan/s2875/Config.lb
index 611fbfcb92..56702d55b1 100644
--- a/targets/tyan/s2875/Config.lb
+++ b/targets/tyan/s2875/Config.lb
@@ -16,8 +16,9 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13800
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
 #	option ROM_IMAGE_SIZE=0x17800
+	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -26,7 +27,7 @@ romimage "normal"
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
 #	payload ../../../payloads/tg3_vga.zelf
-	payload ../../../payloads/tg3--filo_hda2_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
@@ -37,8 +38,9 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 #	option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13800
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
 #	option ROM_IMAGE_SIZE=0x17800
+	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -47,7 +49,7 @@ romimage "fallback"
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
 #	payload ../../../payloads/tg3_vga.zelf
-	payload ../../../payloads/tg3--filo_hda2_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
diff --git a/targets/tyan/s2880/Config.lb b/targets/tyan/s2880/Config.lb
index 72b7152e8f..bbbf3854f8 100644
--- a/targets/tyan/s2880/Config.lb
+++ b/targets/tyan/s2880/Config.lb
@@ -8,15 +8,16 @@ mainboard tyan/s2880
 # Tyan s2880
 romimage "normal"
 #       48K for SCSI FW or ATI ROM
-#        option ROM_SIZE = 475136
+        option ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
-       option ROM_SIZE = 425984 
+#       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=0x13800
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
+	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
@@ -25,8 +26,8 @@ romimage "normal"
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
-#	payload ../../../payloads/tg3_vga.zelf
-	payload ../../../payloads/tg3--filo_hda2_vga.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
@@ -37,7 +38,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 #	option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13800
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
+	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
@@ -47,7 +49,7 @@ romimage "fallback"
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
 #	payload ../../../payloads/tg3_vga.zelf
-	payload ../../../payloads/tg3--filo_hda2_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
diff --git a/targets/tyan/s2881/Config.lb b/targets/tyan/s2881/Config.lb
index 332fc24d3b..6946696e55 100644
--- a/targets/tyan/s2881/Config.lb
+++ b/targets/tyan/s2881/Config.lb
@@ -16,7 +16,8 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 #        option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13000
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
+	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -24,8 +25,8 @@ romimage "normal"
 #        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_hda1_vga_md1.zelf
+	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
+#	 payload ../../../payloads/tg3--filo_hda1_vga_md1.zelf
 #	payload ../../../payloads/tg3--filo_btext_hda2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
@@ -36,7 +37,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 #        option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13000
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
+	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -44,8 +46,8 @@ romimage "fallback"
 #        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_hda1_vga_md1.zelf
+	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
+#	payload ../../../payloads/tg3--filo_hda1_vga_md1.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #	payload ../../../payloads/tg3--filo_btext_hda2.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
diff --git a/targets/tyan/s2882/Config.lb b/targets/tyan/s2882/Config.lb
index 2913109e00..54d6ae13b7 100644
--- a/targets/tyan/s2882/Config.lb
+++ b/targets/tyan/s2882/Config.lb
@@ -15,7 +15,8 @@ romimage "normal"
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
 #        option ROM_IMAGE_SIZE=0x11800
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
+	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -25,14 +26,15 @@ romimage "normal"
 #        payload ../../../payloads/tg3--filo.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-	payload ../../../payloads/tg3--filo_hda2_vga.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=0x11800
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
+	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -42,7 +44,7 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--filo.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
-	payload ../../../payloads/tg3--filo_hda2_vga.zelf
+	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
diff --git a/targets/tyan/s2885/Config.lb b/targets/tyan/s2885/Config.lb
index 1ec013be7a..004b9d7bb0 100644
--- a/targets/tyan/s2885/Config.lb
+++ b/targets/tyan/s2885/Config.lb
@@ -16,7 +16,8 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x13800
 #	option ROM_IMAGE_SIZE=0x17800
-	option ROM_IMAGE_SIZE=0x16200
+#	option ROM_IMAGE_SIZE=0x16200
+	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -26,7 +27,7 @@ romimage "normal"
 #        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--filo_hda2_vga.zelf
 #	payload ../../../payloads/tg3_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
@@ -39,7 +40,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 #	option ROM_IMAGE_SIZE=0x13800
 #	option ROM_IMAGE_SIZE=0x17800
-	option ROM_IMAGE_SIZE=0x16200
+#	option ROM_IMAGE_SIZE=0x16200
+	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -49,7 +51,7 @@ romimage "fallback"
 #        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--filo_hda2_vga.zelf
 #	payload ../../../payloads/tg3_com2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
diff --git a/targets/tyan/s2891/Config.lb b/targets/tyan/s2891/Config.lb
index 2b80499e6f..8eee626369 100644
--- a/targets/tyan/s2891/Config.lb
+++ b/targets/tyan/s2891/Config.lb
@@ -8,9 +8,9 @@ mainboard tyan/s2891
 # Tyan s2891
 romimage "normal"
 #       48K for ATI ROM in 1M
-#	option ROM_SIZE = 999424
+	option ROM_SIZE = 999424
 #       48K for SCSI FW or ATI ROM
-        option ROM_SIZE = 475136
+#        option ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
 #       option ROM_SIZE = 425984 
 #       64K for Etherboot
@@ -18,7 +18,8 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 #        option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13000
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
+	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -26,7 +27,7 @@ romimage "normal"
 #        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_hda2_vga.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga_com2.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga_5_3.zelf
 #	payload ../../../payloads/tg3--filo_btext_hda2.zelf
@@ -39,7 +40,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 #        option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13000
-	option ROM_IMAGE_SIZE=0x16000
+#	option ROM_IMAGE_SIZE=0x16000
+	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -47,7 +49,7 @@ romimage "fallback"
 #        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_hda2_vga.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga_com2.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga_5_3.zelf
 #       payload ../../../payloads/e1000--filo.zelf
diff --git a/targets/tyan/s2891/Config.lb.com2 b/targets/tyan/s2891/Config.lb.com2
new file mode 100644
index 0000000000..4232fa8a29
--- /dev/null
+++ b/targets/tyan/s2891/Config.lb.com2
@@ -0,0 +1,57 @@
+# Sample config file for 
+# the Tyan s2891 
+# This will make a target directory of ./s2891
+
+target s2891
+mainboard tyan/s2891
+
+# Tyan s2891
+romimage "normal"
+#       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=0x13000
+	option ROM_IMAGE_SIZE=0x15800
+        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_hda2_vga_com2.zelf
+#	payload ../../../payloads/tg3--filo_hda2_vga_5_3.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
+end
+
+romimage "fallback" 
+	option USE_FALLBACK_IMAGE=1
+#        option ROM_IMAGE_SIZE=0x11800
+#	option ROM_IMAGE_SIZE=0x13000
+	option ROM_IMAGE_SIZE=0x15800
+        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/tg3--filo_hda2_vga_com2.zelf
+#	payload ../../../payloads/tg3--filo_hda2_vga_5_3.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
+end
+
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2892/Config.lb b/targets/tyan/s2892/Config.lb
index 20d6c8765e..465ad47d98 100644
--- a/targets/tyan/s2892/Config.lb
+++ b/targets/tyan/s2892/Config.lb
@@ -16,7 +16,8 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13800
-	option ROM_IMAGE_SIZE=0x16380
+#	option ROM_IMAGE_SIZE=0x16380
+	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
@@ -26,7 +27,7 @@ romimage "normal"
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
 #	payload ../../../payloads/tg3_vga.zelf
-	payload ../../../payloads/tg3--filo_hda2_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
@@ -37,7 +38,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 #	option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13800
-	option ROM_IMAGE_SIZE=0x16380
+#	option ROM_IMAGE_SIZE=0x16380
+	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
@@ -47,7 +49,7 @@ romimage "fallback"
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
 #	payload ../../../payloads/tg3_vga.zelf
-	payload ../../../payloads/tg3--filo_hda2_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
diff --git a/targets/tyan/s2895/Config.lb b/targets/tyan/s2895/Config.lb
index 53b17f3f1c..54c5a6cad6 100644
--- a/targets/tyan/s2895/Config.lb
+++ b/targets/tyan/s2895/Config.lb
@@ -18,7 +18,8 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13800
-	option ROM_IMAGE_SIZE=0x15000
+#	option ROM_IMAGE_SIZE=0x15000
+	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
@@ -28,7 +29,7 @@ romimage "normal"
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga.zelf
-	payload ../../../payloads/forcedeth--filo_hda2_vga.zelf
+	payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf
 #	payload ../../../payloads/forcedeth_vga.zelf
 #	payload ../../../payloads/forcedeth--filo_hda2_vga_5_4.zelf
 #	payload ../../../../../../elf/ram0_2.5_2.6.11.tiny.elf
@@ -46,7 +47,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 #	option ROM_IMAGE_SIZE=0x11800
 #	option ROM_IMAGE_SIZE=0x13800
-	option ROM_IMAGE_SIZE=0x15000
+#	option ROM_IMAGE_SIZE=0x15000
+	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
@@ -56,7 +58,7 @@ romimage "fallback"
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga.zelf
-	payload ../../../payloads/forcedeth--filo_hda2_vga.zelf
+	payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf
 #	payload ../../../payloads/forcedeth_vga.zelf
 #	payload ../../../payloads/tg3--filo_hda2_vga_5_4.zelf
 #	payload ../../../payloads/tg3_vga.zelf
diff --git a/targets/tyan/s4880/Config.lb b/targets/tyan/s4880/Config.lb
index c61bb9f836..f0846bff9b 100644
--- a/targets/tyan/s4880/Config.lb
+++ b/targets/tyan/s4880/Config.lb
@@ -8,14 +8,15 @@ mainboard tyan/s4880
 # Tyan s4880
 romimage "normal"
 #       48K for SCSI FW or ATI ROM
-#        option ROM_SIZE = 475136
+        option ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
-       option ROM_SIZE = 425984 
+#       option ROM_SIZE = 425984 
 #       64K for Etherboot
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x19000
-	option ROM_IMAGE_SIZE=0x19c00
+#	option ROM_IMAGE_SIZE=0x19c00
+	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -23,7 +24,7 @@ romimage "normal"
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
-	payload ../../../payloads/tg3_vga.zelf
+	payload ../../../../payloads/tg3_vga.zelf
 #        payload ../../../payloads/tg3--filo_hda2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
@@ -33,7 +34,8 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 #	option ROM_IMAGE_SIZE=0x19000
-	option ROM_IMAGE_SIZE=0x19c00
+#	option ROM_IMAGE_SIZE=0x19c00
+	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -41,7 +43,7 @@ romimage "fallback"
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
-	payload ../../../payloads/tg3_vga.zelf
+	payload ../../../../payloads/tg3_vga.zelf
 #        payload ../../../payloads/tg3--filo_hda2.zelf
 #       payload ../../../payloads/e1000--filo.zelf
 #        payload ../../../payloads/tg3--e1000--filo.zelf
diff --git a/targets/tyan/s4882/Config.lb b/targets/tyan/s4882/Config.lb
index e8a1553ada..ad5cc11e5d 100644
--- a/targets/tyan/s4882/Config.lb
+++ b/targets/tyan/s4882/Config.lb
@@ -15,9 +15,10 @@ romimage "normal"
 #        option ROM_SIZE = 458752 
 	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x19000
-	option ROM_IMAGE_SIZE=0x19c00
+#	option ROM_IMAGE_SIZE=0x19c00
 #	option ROM_IMAGE_SIZE=0x18800
 #	option ROM_IMAGE_SIZE=0x16200
+	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -25,9 +26,9 @@ romimage "normal"
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
-	payload ../../../payloads/tg3_vga.zelf
+#	payload ../../../payloads/tg3_vga.zelf
 #	payload ../../../payloads/filo_vga_memtest.zelf
-#	payload ../../../payloads/tg3--filo_hda2_vga.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
@@ -37,9 +38,10 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 #	option ROM_IMAGE_SIZE=0x19000
-	option ROM_IMAGE_SIZE=0x19c00
+#	option ROM_IMAGE_SIZE=0x19c00
 #	option ROM_IMAGE_SIZE=0x18800
 #	option ROM_IMAGE_SIZE=0x16200
+	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
@@ -47,9 +49,9 @@ romimage "fallback"
 #        payload ../../../payloads/filo_mem.elf
 #       payload ../../../payloads/filo.zelf
 #	payload ../../../payloads/tg3.zelf
-	payload ../../../payloads/tg3_vga.zelf
+#	payload ../../../payloads/tg3_vga.zelf
 #	payload ../../../payloads/filo_vga_kernel.zelf
-#	payload ../../../payloads/tg3--filo_hda2_vga.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