commit Yinghai's patches to targets/ (from: fb2_tyan_0420.change.diff)

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

9 files changed, 336 insertions, 55 deletions

diff --git a/targets/tyan/s2850/Config.lb b/targets/tyan/s2850/Config.lb
index b9e994b3ac..02e17e21c7 100644
--- a/targets/tyan/s2850/Config.lb
+++ b/targets/tyan/s2850/Config.lb
@@ -65,7 +65,7 @@ uses HAVE_HARD_RESET
 #
 #uses CONFIG_LSI_SCSI_FW_FIXUP
 
-option HAVE_HARD_RESET=0
+option HAVE_HARD_RESET=1
 
 option HAVE_OPTION_TABLE=1
 option HAVE_MP_TABLE=1
@@ -136,7 +136,8 @@ option MAINBOARD_VENDOR="Tyan"
 ### (linuxBIOS plus bootloader) will live in the boot rom chip.
 ###
 #option FALLBACK_SIZE=524288
-option FALLBACK_SIZE=98304
+#option FALLBACK_SIZE=98304
+option FALLBACK_SIZE=131072
 
 ## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
 option ROM_IMAGE_SIZE=65536
@@ -170,7 +171,7 @@ option TTYS0_BAUD=115200
 ## Request this level of debugging output
 option DEFAULT_CONSOLE_LOGLEVEL=8
 ## At a maximum only compile in this level of debugging
-option MAXIMUM_CONSOLE_LOGLEVEL=9
+option MAXIMUM_CONSOLE_LOGLEVEL=8
 
 option DEBUG=1
 
@@ -216,7 +217,8 @@ romimage "normal"
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2850
-	payload ../../tg3--ide_disk.zelf 
+#	payload ../../tg3--ide_disk_dev.zelf 
+	payload ../../eepro100--ide_diskx.zelf
 end
 
 romimage "fallback" 
@@ -233,7 +235,8 @@ romimage "fallback"
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2850
-	payload ../../tg3--ide_disk.zelf
+#        payload ../../tg3--ide_disk_dev.zelf 
+        payload ../../eepro100--ide_diskx.zelf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2875/Config.lb b/targets/tyan/s2875/Config.lb
new file mode 100644
index 0000000000..5d7bee9f19
--- /dev/null
+++ b/targets/tyan/s2875/Config.lb
@@ -0,0 +1,241 @@
+# Sample config file for 
+# the Tyan s2875 
+# This will make a target directory of ./s2875
+
+loadoptions
+
+target s2875
+
+uses ARCH
+uses CONFIG_COMPRESS
+uses CONFIG_IOAPIC
+uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_STREAM_START
+uses CONFIG_SMP
+uses CONFIG_UDELAY_TSC
+uses CPU_FIXUP
+uses FALLBACK_SIZE
+uses HAVE_FALLBACK_BOOT
+uses HAVE_MP_TABLE
+uses HAVE_PIRQ_TABLE
+uses i586
+uses i686
+uses INTEL_PPRO_MTRR
+uses HEAP_SIZE
+uses IRQ_SLOT_COUNT
+uses k7
+uses k8
+uses MAINBOARD
+uses MAINBOARD_PART_NUMBER
+uses MAINBOARD_VENDOR
+#uses MEMORY_HOLE
+uses PAYLOAD_SIZE
+uses _RAMBASE
+uses _ROMBASE
+uses ROM_IMAGE_SIZE
+uses ROM_SECTION_OFFSET
+uses ROM_SECTION_SIZE
+uses ROM_SIZE
+uses STACK_SIZE
+uses USE_FALLBACK_IMAGE
+uses USE_OPTION_TABLE
+uses HAVE_OPTION_TABLE
+uses CONFIG_CHIP_CONFIGURE
+ 
+uses CONFIG_CONSOLE_SERIAL8250
+uses TTYS0_BAUD
+uses DEFAULT_CONSOLE_LOGLEVEL
+uses MAXIMUM_CONSOLE_LOGLEVEL
+uses DEBUG
+uses CONFIG_MAX_CPUS
+uses CONFIG_LOGICAL_CPUS
+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 SCSIFW_START
+
+#
+#uses CONFIG_LSI_SCSI_FW_FIXUP
+
+option HAVE_OPTION_TABLE=1
+option HAVE_MP_TABLE=1
+option CPU_FIXUP=1
+option CONFIG_UDELAY_TSC=0
+option i686=1
+option i586=1
+option INTEL_PPRO_MTRR=1
+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=1
+#option SCSIFW_START=0xfff80000
+
+
+option HAVE_FALLBACK_BOOT=1
+  
+# use the new chip configure code.
+
+option CONFIG_CHIP_CONFIGURE=1
+#option CONFIG_LSI_SCSI_FW_FIXUP=1
+
+
+option HAVE_HARD_RESET=1
+
+###
+### Build code to export a programmable irq routing table
+###
+option HAVE_PIRQ_TABLE=1
+option IRQ_SLOT_COUNT=13
+#
+###
+### Build code for SMP support
+### Only worry about 2 micro processors
+###
+option CONFIG_SMP=1
+option CONFIG_MAX_CPUS=2
+option CONFIG_LOGICAL_CPUS=0
+option CONFIG_MAX_PHYSICAL_CPUS=2
+#
+###
+### Build code to setup a generic IOAPIC
+###
+option CONFIG_IOAPIC=1
+#
+###
+### MEMORY_HOLE instructs earlymtrr.inc to
+### enable caching from 0-640KB and to disable 
+### caching from 640KB-1MB using fixed MTRRs 
+###
+### Enabling this option breaks SMP because secondary
+### CPU identification depends on only variable MTRRs
+### being enabled.
+###
+#option MEMORY_HOLE=0
+#
+###
+### Clean up the motherboard id strings
+###
+option MAINBOARD_PART_NUMBER="S2875"
+option MAINBOARD_VENDOR="Tyan"
+#
+###
+### Compute the location and size of where this firmware image
+### (linuxBIOS plus bootloader) will live in the boot rom chip.
+###
+#option FALLBACK_SIZE=524288
+#option FALLBACK_SIZE=98304
+option FALLBACK_SIZE=131072
+
+## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
+option ROM_IMAGE_SIZE=65536
+ 
+
+###
+### Compute where this copy of linuxBIOS will start in the boot rom
+###
+#
+###
+
+## We do use compressed image
+option CONFIG_COMPRESS=1
+
+option CONFIG_CONSOLE_SERIAL8250=1
+option TTYS0_BAUD=115200
+
+##
+### Select the linuxBIOS loglevel
+##
+## EMERG      1   system is unusable
+## ALERT      2   action must be taken immediately
+## CRIT       3   critical conditions
+## ERR        4   error conditions
+## WARNING    5   warning conditions
+## NOTICE     6   normal but significant condition
+## INFO       7   informational
+## DEBUG      8   debug-level messages
+## SPEW       9   Way too many details
+
+## Request this level of debugging output
+option DEFAULT_CONSOLE_LOGLEVEL=8
+## At a maximum only compile in this level of debugging
+option MAXIMUM_CONSOLE_LOGLEVEL=8
+
+option DEBUG=1
+
+#
+
+## LinuxBIOS C code runs at this location in RAM
+option _RAMBASE=0x004000
+
+##
+## Use a 32K stack
+##
+option STACK_SIZE=0x8000
+
+##
+## Use a 56K heap
+##
+option HEAP_SIZE=0xe000
+
+#
+###
+### Compute the start location and size size of
+### The linuxBIOS bootloader.
+###
+option CONFIG_ROM_STREAM     = 1
+
+#
+# 
+romimage "normal"
+#	48K for SCSI FW
+#        option ROM_SIZE = 475136
+#	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
+
+	option PAYLOAD_SIZE            = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
+	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
+
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
+	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
+
+	mainboard tyan/s2875
+	payload ../../e1000--ide_disk.zelf 
+end
+
+romimage "fallback" 
+	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option USE_FALLBACK_IMAGE=1
+	option ROM_SECTION_SIZE  = FALLBACK_SIZE
+	option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
+
+	option PAYLOAD_SIZE            = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
+	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
+	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
+
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
+	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
+
+	mainboard tyan/s2875
+	payload ../../e1000--ide_disk.zelf
+#	payload ../../filo.elf.d
+end
+
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2875/ns2875 b/targets/tyan/s2875/ns2875
new file mode 100644
index 0000000000..3d694ba314
--- /dev/null
+++ b/targets/tyan/s2875/ns2875
@@ -0,0 +1,6 @@
+#!/bin/bash
+TYANMB=s2875
+cd "$TYANMB"
+make
+cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
+cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
diff --git a/targets/tyan/s2880/Config.lb b/targets/tyan/s2880/Config.lb
index 3525475368..b0de50850a 100644
--- a/targets/tyan/s2880/Config.lb
+++ b/targets/tyan/s2880/Config.lb
@@ -137,7 +137,8 @@ option MAINBOARD_VENDOR="Tyan"
 ### (linuxBIOS plus bootloader) will live in the boot rom chip.
 ###
 #option FALLBACK_SIZE=524288
-option FALLBACK_SIZE=98304
+#option FALLBACK_SIZE=98304
+option FALLBACK_SIZE=131072
 
 ## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
 option ROM_IMAGE_SIZE=65536
@@ -181,14 +182,14 @@ option DEBUG=1
 option _RAMBASE=0x004000
 
 ##
-## Use a 128K stack
+## Use a 32K stack
 ##
-option STACK_SIZE=0x4000 
+option STACK_SIZE=0x8000 
 
 ##
-## Use a 256K heap + 128 
+## Use a 56K heap
 ##
-option HEAP_SIZE=0xa000
+option HEAP_SIZE=0xe000
 
 #
 ###
@@ -213,7 +214,9 @@ romimage "normal"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
+
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2880
@@ -230,7 +233,8 @@ romimage "fallback"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+	option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2880
diff --git a/targets/tyan/s2881/Config.lb b/targets/tyan/s2881/Config.lb
index be6e6d85d0..4b2c8af8a8 100644
--- a/targets/tyan/s2881/Config.lb
+++ b/targets/tyan/s2881/Config.lb
@@ -136,7 +136,8 @@ option MAINBOARD_VENDOR="Tyan"
 ### (linuxBIOS plus bootloader) will live in the boot rom chip.
 ###
 #option FALLBACK_SIZE=524288
-option FALLBACK_SIZE=98304
+#option FALLBACK_SIZE=98304
+option FALLBACK_SIZE=131072
 
 ## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
 option ROM_IMAGE_SIZE=65536
@@ -180,14 +181,14 @@ option DEBUG=1
 option _RAMBASE=0x004000
 
 ##
-## Use a 128K stack 
+## Use a 32K stack 
 ##
-option STACK_SIZE=0x4000
+option STACK_SIZE=0x8000
 
 ##
-## Use a 256K heap + 64
+## Use a 56K heap 
 ##
-option HEAP_SIZE=0xa000
+option HEAP_SIZE=0xe000
 
 #
 ###
@@ -202,7 +203,9 @@ romimage "normal"
 #	48K for SCSI FW
 #        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 LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_SECTION_SIZE  = (ROM_SIZE - FALLBACK_SIZE)
@@ -212,11 +215,13 @@ romimage "normal"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2881
-	payload ../../tg3--ide_disk.zelf 
+#	payload ../../../payloads/tg3--ide_disk.zelf 
+	payload ../../../payloads/filo.elf
 end
 
 romimage "fallback" 
@@ -229,11 +234,13 @@ romimage "fallback"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2881
-	payload ../../tg3--ide_disk.zelf
+#	payload ../../../payloads/tg3--ide_disk.zelf
+	payload ../../../payloads/filo_mem.elf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2882/Config.lb b/targets/tyan/s2882/Config.lb
index 258e7f1158..69da1350e1 100644
--- a/targets/tyan/s2882/Config.lb
+++ b/targets/tyan/s2882/Config.lb
@@ -41,7 +41,8 @@ uses USE_FALLBACK_IMAGE
 uses USE_OPTION_TABLE
 uses HAVE_OPTION_TABLE
 uses CONFIG_CHIP_CONFIGURE
- 
+
+uses CONFIG_CONSOLE_BTEXT 
 uses CONFIG_CONSOLE_SERIAL8250
 uses TTYS0_BAUD
 #SMDC Support
@@ -81,6 +82,7 @@ option ROM_SIZE=524288
 
 option HAVE_HARD_RESET=1
 
+option CONFIG_CONSOLE_BTEXT=1
 #option CONFIG_VGABIOS=1
 #option CONFIG_REALMODE_IDT=1
 #option CONFIG_PCIBIOS=1
@@ -137,7 +139,8 @@ option MAINBOARD_VENDOR="Tyan"
 ### (linuxBIOS plus bootloader) will live in the boot rom chip.
 ###
 #option FALLBACK_SIZE=524288
-option FALLBACK_SIZE=98304
+#option FALLBACK_SIZE=98304
+option FALLBACK_SIZE=131072
 
 ## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
 option ROM_IMAGE_SIZE=65536
@@ -174,9 +177,9 @@ option TTYS0_BAUD=115200
 ## SPEW       9   Way too many details
 
 ## Request this level of debugging output
-option DEFAULT_CONSOLE_LOGLEVEL=8
+option DEFAULT_CONSOLE_LOGLEVEL=7
 ## At a maximum only compile in this level of debugging
-option MAXIMUM_CONSOLE_LOGLEVEL=8
+option MAXIMUM_CONSOLE_LOGLEVEL=7
 
 option DEBUG=1
 
@@ -186,14 +189,14 @@ option DEBUG=1
 option _RAMBASE=0x004000
 
 ##
-## Use a 128K stack  
+## Use a 32K stack  
 ##
-option STACK_SIZE=0x4000
+option STACK_SIZE=0x8000
 
 ##
-## Use a 256K heap + 128
+## Use a 56K heap 
 ##
-option HEAP_SIZE=0xa000
+option HEAP_SIZE=0xe000
 
 #
 ###
@@ -209,6 +212,8 @@ romimage "normal"
 #        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 LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
         option USE_FALLBACK_IMAGE=0
 	option ROM_SECTION_SIZE  = (ROM_SIZE - FALLBACK_SIZE)
@@ -218,11 +223,14 @@ romimage "normal"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+	option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2882
-	payload ../../tg3--ide_disk.zelf
+#	payload ../../../payloads/tg3--ide_disk.zelf
+#        payload ../../../payloads/filo.elf
+	payload ../../../payloads/filo_mem_btext.elf
 #	SMDC support
 #	payload ../../tg3--ide_disk_com1_2.zelf 
 end
@@ -237,11 +245,14 @@ romimage "fallback"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2882
-	payload ../../tg3--ide_disk.zelf
+#	payload ../../../payloads/tg3--ide_disk.zelf
+#        payload ../../../payloads/filo_mem.elf
+	payload ../../../payloads/filo_mem_btext.elf
 #SMDC support
 #	payload ../../tg3--ide_disk_com1_2.zelf
 end
diff --git a/targets/tyan/s2885/Config.lb b/targets/tyan/s2885/Config.lb
index 6f313264a2..e5ba9c8fb1 100644
--- a/targets/tyan/s2885/Config.lb
+++ b/targets/tyan/s2885/Config.lb
@@ -179,12 +179,12 @@ option DEBUG=1
 option _RAMBASE=0x004000
 
 ##
-## Use a 128K stack + 128
+## Use a 32K stack
 ##
 option STACK_SIZE=0x8000
 
 ##
-## Use a 256K heap + 128 + 64
+## Use a 56K heap
 ##
 option HEAP_SIZE=0xe000
 
@@ -201,7 +201,9 @@ romimage "normal"
 #	48K for SCSI FW
 #        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 LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
         option USE_FALLBACK_IMAGE=0
 	option ROM_SECTION_SIZE  = (ROM_SIZE - FALLBACK_SIZE)
@@ -211,11 +213,13 @@ romimage "normal"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2885
-	payload ../../tg3--ide_disk.zelf 
+#       payload ../../../payloads/tg3--ide_disk.zelf 
+        payload ../../../payloads/filo_mem.elf
 end
 
 romimage "fallback" 
@@ -228,12 +232,13 @@ romimage "fallback"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s2885
-	payload ../../tg3--ide_disk.zelf
-#	payload ../../filo.elf.d
+#       payload ../../../payloads/tg3--ide_disk.zelf 
+        payload ../../../payloads/filo_mem.elf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s4880/Config.lb b/targets/tyan/s4880/Config.lb
index 6cca9e6fa6..114cfcaab3 100644
--- a/targets/tyan/s4880/Config.lb
+++ b/targets/tyan/s4880/Config.lb
@@ -169,9 +169,9 @@ option TTYS0_BAUD=115200
 ## SPEW       9   Way too many details
 
 ## Request this level of debugging output
-option DEFAULT_CONSOLE_LOGLEVEL=8
+option DEFAULT_CONSOLE_LOGLEVEL=7
 ## At a maximum only compile in this level of debugging
-option MAXIMUM_CONSOLE_LOGLEVEL=8
+option MAXIMUM_CONSOLE_LOGLEVEL=7
 
 option DEBUG=1
 
@@ -181,14 +181,14 @@ option DEBUG=1
 option _RAMBASE=0x004000
 
 ##
-## Use a 256K stack
+## Use a 32K stack
 ##
 option STACK_SIZE=0x8000
 
 ##
-## Use a 384K heap
+## Use a 56K heap
 ##
-option HEAP_SIZE=0xc000
+option HEAP_SIZE=0xe000
 
 #
 ###
@@ -213,7 +213,8 @@ romimage "normal"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s4880
@@ -230,7 +231,8 @@ romimage "fallback"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s4880
diff --git a/targets/tyan/s4882/Config.lb b/targets/tyan/s4882/Config.lb
index 34f3080c95..65a09cfa98 100644
--- a/targets/tyan/s4882/Config.lb
+++ b/targets/tyan/s4882/Config.lb
@@ -181,14 +181,14 @@ option DEBUG=1
 option _RAMBASE=0x004000
 
 ##
-## Use a 256K stack
+## Use a 32K stack
 ##
-option STACK_SIZE=0x4000
+option STACK_SIZE=0x8000
 
 ##
-## Use a 384K heap
+## Use a 56K heap
 ##
-option HEAP_SIZE=0xa000
+option HEAP_SIZE=0xe000
 
 #
 ###
@@ -213,7 +213,8 @@ romimage "normal"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s4882
@@ -230,7 +231,8 @@ romimage "fallback"
 	option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 	option _ROMBASE      = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
 
-	option XIP_ROM_SIZE = FALLBACK_SIZE
+#	option XIP_ROM_SIZE = FALLBACK_SIZE
+        option XIP_ROM_SIZE = 65536
 	option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 
 	mainboard tyan/s4882