This patch unifies the use of config options in v2 to all start with CONFIG_

[coreboot.git] / targets / tyan / s2881 / Config.lb

diff --git a/targets/tyan/s2881/Config.lb b/targets/tyan/s2881/Config.lb
index 332fc24d3b478de6d883435677f007d1ad60f334..010e7046137b2ad469682320c673085779a2c62c 100644 (file)
--- a/targets/tyan/s2881/Config.lb
+++ b/targets/tyan/s2881/Config.lb
@@ -7,49 +7,55 @@ mainboard tyan/s2881
 
 # Tyan s2881
 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 
+#       36K for ATI ROM
+        option CONFIG_ROM_SIZE = 512*1024-36*1024
+#       48K for SCSI FW
+#        option CONFIG_ROM_SIZE = 512*1024-48*1024
+#       48K for SCSI FW and 36K for ATI ROM
+#        option CONFIG_ROM_SIZE = 512*1024-48*1024-36*1024
 #       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=0x16000
-        option XIP_ROM_SIZE=0x20000
-       option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+#        option CONFIG_ROM_SIZE = 512*1024-64*1024
+       option CONFIG_USE_FALLBACK_IMAGE=0
+#        option CONFIG_ROM_IMAGE_SIZE=0x11800
+#      option CONFIG_ROM_IMAGE_SIZE=0x13000
+#      option CONFIG_ROM_IMAGE_SIZE=0x16000
+       option CONFIG_ROM_IMAGE_SIZE=0x20000
+        option CONFIG_XIP_ROM_SIZE=0x20000
+       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.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
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+       payload ../payload.elf
 end
 
 romimage "fallback" 
-       option USE_FALLBACK_IMAGE=1
-#        option ROM_IMAGE_SIZE=0x11800
-#      option ROM_IMAGE_SIZE=0x13000
-       option ROM_IMAGE_SIZE=0x16000
-        option XIP_ROM_SIZE=0x20000
-       option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+       option CONFIG_USE_FALLBACK_IMAGE=1
+#        option CONFIG_ROM_IMAGE_SIZE=0x11800
+#      option CONFIG_ROM_IMAGE_SIZE=0x13000
+#      option CONFIG_ROM_IMAGE_SIZE=0x16000
+       option CONFIG_ROM_IMAGE_SIZE=0x20000
+        option CONFIG_XIP_ROM_SIZE=0x20000
+       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.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
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+       payload ../payload.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"