[commit] r4950 - in trunk/targets/tyan: s2912 s2912_fam10

Author: myles
Date: 2009-11-19 15:25:31 +0100 (Thu, 19 Nov 2009)
New Revision: 4950

Modified:
   trunk/targets/tyan/s2912/Config.lb
   trunk/targets/tyan/s2912_fam10/Config.lb
Log:
Trivial fix for tyan/s2912 to build.  Remove overspecified options in Config.lb.

Signed-off-by: Myles Watson 
Acked-by: Myles Watson

Modified: trunk/targets/tyan/s2912/Config.lb
===================================================================
--- trunk/targets/tyan/s2912/Config.lb	2009-11-18 17:10:36 UTC (rev 4949)
+++ trunk/targets/tyan/s2912/Config.lb	2009-11-19 14:25:31 UTC (rev 4950)
@@ -24,74 +24,19 @@
 target s2912
 mainboard tyan/s2912

-# serengeti_leopard
 romimage "normal"
-#       48K for SCSI FW
-#        option CONFIG_ROM_SIZE = 475136
-#       48K for SCSI FW and 48K for ATI ROM
-#       option CONFIG_ROM_SIZE = 425984 
-#       64K for Etherboot
-#        option CONFIG_ROM_SIZE = 458752 
-#       44k for atixx.rom
-#        option CONFIG_ROM_SIZE = 479232
-        option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FAILOVER_IMAGE=0
    option CONFIG_USE_FALLBACK_IMAGE=0
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x18800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
-	option CONFIG_XIP_ROM_SIZE=0x40000
    option COREBOOT_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.zelf
-#	payload ../../../payloads/tg3.zelf
-#	payload ../../../../payloads/tg3_vga.zelf
-#	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
-#	payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
-#	payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf
-	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.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_5.3.zelf
-#	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
+	payload ../payload.elf
 end

romimage "fallback" 
         option CONFIG_USE_FAILOVER_IMAGE=0
    option CONFIG_USE_FALLBACK_IMAGE=1
-#	option CONFIG_ROM_IMAGE_SIZE=0x13800
-#	option CONFIG_ROM_IMAGE_SIZE=0x19800
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-#	option CONFIG_ROM_IMAGE_SIZE=0x15800
-	option CONFIG_XIP_ROM_SIZE=0x40000
    option COREBOOT_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.zelf
-#	payload ../../../payloads/tg3.zelf
-#	payload ../../../../payloads/tg3_vga.zelf
-#	payload ../../../../payloads/memtest
-#	payload ../../../../payloads/e1000_vga.zelf
-#	payload ../../../../payloads/tg3--filo_hda2_vga.zelf
-#	payload ../../../../payloads/filo_hda.zelf
-#	payload ../../../../payloads/adlo.elf
-#	payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
-#	payload ../../../../payloads/forcedeth_mcp55_filo_hda2.zelf
-	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
-#	payload ../../../../payloads/forcedeth--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_5.3.zelf
-#	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
+#	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
+	payload ../payload.elf
 end

romimage "failover"
@@ -102,5 +47,4 @@
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end

-#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
 buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"

Modified: trunk/targets/tyan/s2912_fam10/Config.lb
===================================================================
--- trunk/targets/tyan/s2912_fam10/Config.lb	2009-11-18 17:10:36 UTC (rev 4949)
+++ trunk/targets/tyan/s2912_fam10/Config.lb	2009-11-19 14:25:31 UTC (rev 4950)
@@ -30,18 +30,13 @@
 romimage "normal"
    option CONFIG_USE_FAILOVER_IMAGE=0
    option CONFIG_USE_FALLBACK_IMAGE=0
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-	option CONFIG_XIP_ROM_SIZE=0x40000
    option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
-#	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
    payload ../payload.elf
 end

romimage "fallback" 
         option CONFIG_USE_FAILOVER_IMAGE=0
    option CONFIG_USE_FALLBACK_IMAGE=1
-	option CONFIG_ROM_IMAGE_SIZE=0x20000
-	option CONFIG_XIP_ROM_SIZE=0x40000
    option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #	payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
    payload ../payload.elf