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

It's basically done with the following script and some manual fixup:

VARS=`grep ^define src/config/Options.lb | cut -f2 -d\ | grep -v ^CONFIG | grep -v ^COREBOOT |grep -v ^CC`
for VAR in $VARS; do
	find . -name .svn -prune -o -type f -exec perl -pi -e "s/(^|[^0-9a-zA-Z_]+)$VAR($|[^0-9a-zA-Z_]+)/\1CONFIG_$VAR\2/g" {} \;
done

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



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

28 files changed, 384 insertions, 384 deletions

diff --git a/targets/tyan/s1846/Config.lb b/targets/tyan/s1846/Config.lb
index dcc48ef1bf..4ebccfc52d 100644
--- a/targets/tyan/s1846/Config.lb
+++ b/targets/tyan/s1846/Config.lb
@@ -21,31 +21,31 @@
 target s1846
 mainboard tyan/s1846
 
-option ROM_SIZE = 256 * 1024
+option CONFIG_ROM_SIZE = 256 * 1024
 
-option MAINBOARD_VENDOR = "Tyan"
-option MAINBOARD_PART_NUMBER = "S1846"
+option CONFIG_MAINBOARD_VENDOR = "Tyan"
+option CONFIG_MAINBOARD_PART_NUMBER = "S1846"
 
 # TODO: Add/fix PIRQ table.
-option HAVE_PIRQ_TABLE = 0
-option IRQ_SLOT_COUNT = 0	# FIXME
+option CONFIG_HAVE_PIRQ_TABLE = 0
+option CONFIG_IRQ_SLOT_COUNT = 0	# FIXME
 
-option DEFAULT_CONSOLE_LOGLEVEL = 9
-option MAXIMUM_CONSOLE_LOGLEVEL = 9
+option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
+option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
 
 option CONFIG_CONSOLE_VGA = 1
 option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
-	option USE_FALLBACK_IMAGE = 0
+	option CONFIG_USE_FALLBACK_IMAGE = 0
 	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
-	option USE_FALLBACK_IMAGE = 1
+	option CONFIG_USE_FALLBACK_IMAGE = 1
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2735/Config.lb b/targets/tyan/s2735/Config.lb
index cd2f774cee..a67f24f69e 100644
--- a/targets/tyan/s2735/Config.lb
+++ b/targets/tyan/s2735/Config.lb
@@ -8,14 +8,14 @@ mainboard tyan/s2735
 # Tyan s2735
 romimage "normal"
 #       48K for SCSI FW
-#        option ROM_SIZE = 512*1024-48*1024
+#        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 48K for ATI ROM
-#       option ROM_SIZE = 512*1024-48*1024-48*1024
+#       option CONFIG_ROM_SIZE = 512*1024-48*1024-48*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-        option ROM_IMAGE_SIZE=0x11800
-        option XIP_ROM_SIZE=0x20000
+#        option CONFIG_ROM_SIZE = 512*1024-64*1024
+	option CONFIG_USE_FALLBACK_IMAGE=0
+        option CONFIG_ROM_IMAGE_SIZE=0x11800
+        option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -28,9 +28,9 @@ romimage "normal"
 end
 
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-        option ROM_IMAGE_SIZE=0x11800
-        option XIP_ROM_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+        option CONFIG_ROM_IMAGE_SIZE=0x11800
+        option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -42,4 +42,4 @@ romimage "fallback"
         payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2850/Config.lb b/targets/tyan/s2850/Config.lb
index 66b873c5e8..f6e6f3cf8c 100644
--- a/targets/tyan/s2850/Config.lb
+++ b/targets/tyan/s2850/Config.lb
@@ -8,18 +8,18 @@ mainboard tyan/s2850
 # Tyan s2850
 romimage "normal"
 #       48K for SCSI FW or ATI ROM
-        option ROM_SIZE = 512*1024-48*1024
+        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 48K for ATI ROM
-#       option ROM_SIZE = 512*1024-48*1024-48*1024
+#       option CONFIG_ROM_SIZE = 512*1024-48*1024-48*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x11800
-#	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 CONFIG_ROM_SIZE = 512*1024-64*1024
+	option CONFIG_USE_FALLBACK_IMAGE=0
+#	option CONFIG_ROM_IMAGE_SIZE=0x11800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16000
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+#	option CONFIG_ROM_IMAGE_SIZE=0x13c00
+	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
@@ -36,13 +36,13 @@ romimage "normal"
 end
 
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-#	option ROM_IMAGE_SIZE=0x11800
-#	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 CONFIG_USE_FALLBACK_IMAGE=1
+#	option CONFIG_ROM_IMAGE_SIZE=0x11800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16000
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+#	option CONFIG_ROM_IMAGE_SIZE=0x13c00
+	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
@@ -58,4 +58,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2875/Config.lb b/targets/tyan/s2875/Config.lb
index b4388d1a1a..50346f776f 100644
--- a/targets/tyan/s2875/Config.lb
+++ b/targets/tyan/s2875/Config.lb
@@ -8,18 +8,18 @@ mainboard tyan/s2875
 # Tyan s2875
 romimage "normal"
 #       48K for SCSI FW or ATI ROM
-        option ROM_SIZE = 512*1024-48*1024
+        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 48K for ATI ROM
-#       option ROM_SIZE = 512*1024-48*1024-48*1024
+#       option CONFIG_ROM_SIZE = 512*1024-48*1024-48*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x11800
-#	option ROM_IMAGE_SIZE=0x13800
-#	option ROM_IMAGE_SIZE=0x16000
-#	option ROM_IMAGE_SIZE=0x17800
-	option ROM_IMAGE_SIZE=0x20000
-	option XIP_ROM_SIZE=0x20000
+#        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=0x13800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16000
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+	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
@@ -35,13 +35,13 @@ romimage "normal"
 end
 
 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=0x17800
-	option ROM_IMAGE_SIZE=0x20000
-	option XIP_ROM_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+#	option CONFIG_ROM_IMAGE_SIZE=0x11800
+#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16000
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+	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
@@ -56,4 +56,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2880/Config.lb b/targets/tyan/s2880/Config.lb
index f1e2960ccd..fc40941f46 100644
--- a/targets/tyan/s2880/Config.lb
+++ b/targets/tyan/s2880/Config.lb
@@ -8,18 +8,18 @@ mainboard tyan/s2880
 # Tyan s2880
 romimage "normal"
 #       48K for SCSI FW or ATI ROM
-        option ROM_SIZE = 512*1024-48*1024
+        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 48K for ATI ROM
-#        option ROM_SIZE = 512*1024-48*1024-48*1024
+#        option CONFIG_ROM_SIZE = 512*1024-48*1024-48*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x11800
-#	option ROM_IMAGE_SIZE=0x13800
-#	option ROM_IMAGE_SIZE=0x16000
-	option ROM_IMAGE_SIZE=0x20000
-#	option ROM_IMAGE_SIZE=0x17800
-	option XIP_ROM_SIZE=0x20000
+#        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=0x13800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16000
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -35,13 +35,13 @@ romimage "normal"
 end
 
 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=0x20000
-#	option ROM_IMAGE_SIZE=0x17800
-	option XIP_ROM_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+#	option CONFIG_ROM_IMAGE_SIZE=0x11800
+#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16000
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -56,4 +56,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2881/Config-lab.lb b/targets/tyan/s2881/Config-lab.lb
index bc7ecf1188..ad42a5d388 100644
--- a/targets/tyan/s2881/Config-lab.lb
+++ b/targets/tyan/s2881/Config-lab.lb
@@ -5,19 +5,19 @@
 target s2881
 mainboard tyan/s2881
 
-option ROM_SIZE=0x100000
+option CONFIG_ROM_SIZE=0x100000
 # 36K for ATI ROM in 1M
-option FALLBACK_SIZE=(ROM_SIZE-0x9000)
+option CONFIG_FALLBACK_SIZE=(CONFIG_ROM_SIZE-0x9000)
 
 # Tyan s2881
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
+	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option ROM_IMAGE_SIZE=0x17000
-	option XIP_ROM_SIZE=0x40000
+	option CONFIG_ROM_IMAGE_SIZE=0x17000
+	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
 end
 
-buildrom ./coreboot.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/tyan/s2881/Config.lb b/targets/tyan/s2881/Config.lb
index 112236d347..010e704613 100644
--- a/targets/tyan/s2881/Config.lb
+++ b/targets/tyan/s2881/Config.lb
@@ -8,19 +8,19 @@ mainboard tyan/s2881
 # Tyan s2881
 romimage "normal"
 #       36K for ATI ROM
-        option ROM_SIZE = 512*1024-36*1024
+        option CONFIG_ROM_SIZE = 512*1024-36*1024
 #       48K for SCSI FW
-#        option ROM_SIZE = 512*1024-48*1024
+#        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 36K for ATI ROM
-#        option ROM_SIZE = 512*1024-48*1024-36*1024
+#        option CONFIG_ROM_SIZE = 512*1024-48*1024-36*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-#        option ROM_IMAGE_SIZE=0x11800
-#	option ROM_IMAGE_SIZE=0x13000
-#	option ROM_IMAGE_SIZE=0x16000
-	option ROM_IMAGE_SIZE=0x20000
-        option XIP_ROM_SIZE=0x20000
+#        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
@@ -37,12 +37,12 @@ romimage "normal"
 end
 
 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=0x20000
-        option XIP_ROM_SIZE=0x20000
+	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
@@ -58,4 +58,4 @@ romimage "fallback"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2882/Config-lab.lb b/targets/tyan/s2882/Config-lab.lb
index b54dcd8d43..f72ee2da59 100644
--- a/targets/tyan/s2882/Config-lab.lb
+++ b/targets/tyan/s2882/Config-lab.lb
@@ -5,19 +5,19 @@
 target s2882
 mainboard tyan/s2882
 
-option ROM_SIZE=0x100000
+option CONFIG_ROM_SIZE=0x100000
 # 36K for ATI ROM in 1M
-option FALLBACK_SIZE=(ROM_SIZE-0x9000)
+option CONFIG_FALLBACK_SIZE=(CONFIG_ROM_SIZE-0x9000)
 
 # Tyan s2882
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
+	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option ROM_IMAGE_SIZE=0x17000
-	option XIP_ROM_SIZE=0x40000
+	option CONFIG_ROM_IMAGE_SIZE=0x17000
+	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
 end
 
-buildrom ./coreboot.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/tyan/s2882/Config.lb b/targets/tyan/s2882/Config.lb
index 404d9d95a8..a6d37479c4 100644
--- a/targets/tyan/s2882/Config.lb
+++ b/targets/tyan/s2882/Config.lb
@@ -8,16 +8,16 @@ mainboard tyan/s2882
 # Tyan s2882
 romimage "normal"
 #       36K for ATI ROM
-        option ROM_SIZE = 512*1024-36*1024
+        option CONFIG_ROM_SIZE = 512*1024-36*1024
 #       48K for SCSI FW and 36K for ATI ROM
-#        option ROM_SIZE = 512*1024-48*1024-36*1024
+#        option CONFIG_ROM_SIZE = 512*1024-48*1024-36*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-#        option ROM_IMAGE_SIZE=0x11800
-#	option ROM_IMAGE_SIZE=0x16000
-	option ROM_IMAGE_SIZE=0x20000
-        option XIP_ROM_SIZE=0x20000
+#        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=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
@@ -32,11 +32,11 @@ romimage "normal"
 end
 
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-#        option ROM_IMAGE_SIZE=0x11800
-#	option ROM_IMAGE_SIZE=0x16000
-	option ROM_IMAGE_SIZE=0x20000
-        option XIP_ROM_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+#        option CONFIG_ROM_IMAGE_SIZE=0x11800
+#	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
@@ -50,4 +50,4 @@ romimage "fallback"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2885/Config.lb b/targets/tyan/s2885/Config.lb
index 8f29db17ac..72877d2dff 100644
--- a/targets/tyan/s2885/Config.lb
+++ b/targets/tyan/s2885/Config.lb
@@ -8,17 +8,17 @@ mainboard tyan/s2885
 # Tyan s2895
 romimage "normal"
 #       48K for SCSI FW
-#        option ROM_SIZE = 512*1024-48*1024
+#        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 48K for ATI ROM
-#       option ROM_SIZE = 512*1024-48*1024-48*1024
+#       option CONFIG_ROM_SIZE = 512*1024-48*1024-48*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x13800
-#	option ROM_IMAGE_SIZE=0x17800
-#	option ROM_IMAGE_SIZE=0x16200
-	option ROM_IMAGE_SIZE=0x20000
-	option XIP_ROM_SIZE=0x20000
+#        option CONFIG_ROM_SIZE = 512*1024-64*1024
+	option CONFIG_USE_FALLBACK_IMAGE=0
+#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16200
+	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
@@ -37,12 +37,12 @@ romimage "normal"
 end
 
 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=0x20000
-	option XIP_ROM_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16200
+	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
@@ -60,4 +60,4 @@ romimage "fallback"
 #	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2891/Config-abuild.lb b/targets/tyan/s2891/Config-abuild.lb
index 95f4366ab1..bc651b964d 100644
--- a/targets/tyan/s2891/Config-abuild.lb
+++ b/targets/tyan/s2891/Config-abuild.lb
@@ -4,24 +4,24 @@ target VENDOR_MAINBOARD
 mainboard VENDOR/MAINBOARD
 
 option CC="CROSSCC"
-option CROSS_COMPILE="CROSS_PREFIX"
-option HOSTCC="CROSS_HOSTCC"
+option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
+option CONFIG_HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
 __LOGLEVEL__
 
 romimage "normal"
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=0
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback"
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2891/Config-lab.lb b/targets/tyan/s2891/Config-lab.lb
index 24b5d066b6..8253b038c9 100644
--- a/targets/tyan/s2891/Config-lab.lb
+++ b/targets/tyan/s2891/Config-lab.lb
@@ -5,19 +5,19 @@
 target s2891
 mainboard tyan/s2891
 
-option ROM_SIZE=0x100000
+option CONFIG_ROM_SIZE=0x100000
 # 36K for ATI ROM in 1M
-option FALLBACK_SIZE=(ROM_SIZE-0x9000)
+option CONFIG_FALLBACK_SIZE=(CONFIG_ROM_SIZE-0x9000)
 
 # Tyan s2891
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
+	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option ROM_IMAGE_SIZE=0x17000
-	option XIP_ROM_SIZE=0x40000
+	option CONFIG_ROM_IMAGE_SIZE=0x17000
+	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
 end
 
-buildrom ./coreboot.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/tyan/s2891/Config.lb b/targets/tyan/s2891/Config.lb
index fe91c36f7f..cab355e1b2 100644
--- a/targets/tyan/s2891/Config.lb
+++ b/targets/tyan/s2891/Config.lb
@@ -8,19 +8,19 @@ mainboard tyan/s2891
 # Tyan s2891
 romimage "normal"
 #       36K for ATI ROM in 1M
-	option ROM_SIZE = 1024*1024-36*1024
+	option CONFIG_ROM_SIZE = 1024*1024-36*1024
 #       48K for SCSI FW
-#        option ROM_SIZE = 512*1024-48*1024
+#        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 36K for ATI ROM
-#       option ROM_SIZE = 512*1024-48*1024-36*1024
+#       option CONFIG_ROM_SIZE = 512*1024-48*1024-36*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-#        option ROM_IMAGE_SIZE=0x11800
-#	option ROM_IMAGE_SIZE=0x13000
-#	option ROM_IMAGE_SIZE=0x16000
-	option ROM_IMAGE_SIZE=0x20000
-        option XIP_ROM_SIZE=0x20000
+#        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
@@ -38,12 +38,12 @@ romimage "normal"
 end
 
 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=0x20000
-        option XIP_ROM_SIZE=0x20000
+	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
@@ -60,4 +60,4 @@ romimage "fallback"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2891/Config.lb.com2 b/targets/tyan/s2891/Config.lb.com2
index eee6b0af56..24251e19cf 100644
--- a/targets/tyan/s2891/Config.lb.com2
+++ b/targets/tyan/s2891/Config.lb.com2
@@ -8,16 +8,16 @@ mainboard tyan/s2891
 # Tyan s2891
 romimage "normal"
 #       48K for SCSI FW or ATI ROM
-        option ROM_SIZE = 512*1024-48*1024
+        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 48K for ATI ROM
-#       option ROM_SIZE = 512*1024-48*1024-48*1024
+#       option CONFIG_ROM_SIZE = 512*1024-48*1024-48*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	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 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=0x15800
+        option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -34,11 +34,11 @@ romimage "normal"
 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 CONFIG_USE_FALLBACK_IMAGE=1
+#        option CONFIG_ROM_IMAGE_SIZE=0x11800
+#	option CONFIG_ROM_IMAGE_SIZE=0x13000
+	option CONFIG_ROM_IMAGE_SIZE=0x15800
+        option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -54,4 +54,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2892/Config-abuild.lb b/targets/tyan/s2892/Config-abuild.lb
index 95f4366ab1..bc651b964d 100644
--- a/targets/tyan/s2892/Config-abuild.lb
+++ b/targets/tyan/s2892/Config-abuild.lb
@@ -4,24 +4,24 @@ target VENDOR_MAINBOARD
 mainboard VENDOR/MAINBOARD
 
 option CC="CROSSCC"
-option CROSS_COMPILE="CROSS_PREFIX"
-option HOSTCC="CROSS_HOSTCC"
+option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
+option CONFIG_HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
 __LOGLEVEL__
 
 romimage "normal"
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=0
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback"
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2892/Config-lab.lb b/targets/tyan/s2892/Config-lab.lb
index 169023f783..c9d8584085 100644
--- a/targets/tyan/s2892/Config-lab.lb
+++ b/targets/tyan/s2892/Config-lab.lb
@@ -6,21 +6,21 @@ target s2892
 mainboard tyan/s2892
 
 # Leave Space for VGA BIOS
-option ROM_SIZE = 1024*1024-36*1024
-#option ROM_SIZE = 1024*1024
+option CONFIG_ROM_SIZE = 1024*1024-36*1024
+#option CONFIG_ROM_SIZE = 1024*1024
 option CONFIG_CONSOLE_SERIAL8250 = 1
 option CONFIG_CONSOLE_VGA = 1
-option XIP_ROM_SIZE = 0x20000
-option ROM_IMAGE_SIZE = 0x18000
-option FALLBACK_SIZE = ROM_SIZE
+option CONFIG_XIP_ROM_SIZE = 0x20000
+option CONFIG_ROM_IMAGE_SIZE = 0x18000
+option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 
 # Tyan s2892
 romimage "fallback" 
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-	option USE_FALLBACK_IMAGE=1
+	option CONFIG_USE_FALLBACK_IMAGE=1
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
 end
 
-buildrom ./coreboot.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/tyan/s2892/Config.lb b/targets/tyan/s2892/Config.lb
index 8dc2225561..82e4ca4f47 100644
--- a/targets/tyan/s2892/Config.lb
+++ b/targets/tyan/s2892/Config.lb
@@ -8,20 +8,20 @@ mainboard tyan/s2892
 # Tyan s2892
 romimage "normal"
 #       36K for ATI ROM in 1M
-	option ROM_SIZE = 1024*1024-36*1024
+	option CONFIG_ROM_SIZE = 1024*1024-36*1024
 #       48K for SCSI FW or ATI ROM
-#        option ROM_SIZE = 512*1024-48*1024
+#        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 48K for ATI ROM
-#       option ROM_SIZE = 512*1024-48*1024-48*1024
+#       option CONFIG_ROM_SIZE = 512*1024-48*1024-48*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x11800
-#	option ROM_IMAGE_SIZE=0x13800
-#	option ROM_IMAGE_SIZE=0x16380
-	option ROM_IMAGE_SIZE=0x20000
-#	option ROM_IMAGE_SIZE=0x17800
-	option XIP_ROM_SIZE=0x20000
+#        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=0x13800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16380
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -38,13 +38,13 @@ romimage "normal"
 end
 
 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=0x20000
-#	option ROM_IMAGE_SIZE=0x17800
-	option XIP_ROM_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+#	option CONFIG_ROM_IMAGE_SIZE=0x11800
+#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16380
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -60,4 +60,4 @@ romimage "fallback"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2895/Config-abuild.lb b/targets/tyan/s2895/Config-abuild.lb
index 88dd1684e3..b1c927705b 100644
--- a/targets/tyan/s2895/Config-abuild.lb
+++ b/targets/tyan/s2895/Config-abuild.lb
@@ -4,33 +4,33 @@ target VENDOR_MAINBOARD
 mainboard VENDOR/MAINBOARD
 
 option CC="CROSSCC"
-option CROSS_COMPILE="CROSS_PREFIX"
-option HOSTCC="CROSS_HOSTCC"
+option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
+option CONFIG_HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
 __LOGLEVEL__
 
 romimage "normal"
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x20000
+	option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=0
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback"
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x20000
+	option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
 
 romimage "failover"
-	option USE_FAILOVER_IMAGE=1
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=FAILOVER_SIZE
-	option XIP_ROM_SIZE=FAILOVER_SIZE
+	option CONFIG_USE_FAILOVER_IMAGE=1
+	option CONFIG_USE_FALLBACK_IMAGE=0
+	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/tyan/s2895/Config-lab.lb b/targets/tyan/s2895/Config-lab.lb
index fa4bbf0cc8..e5368925d9 100644
--- a/targets/tyan/s2895/Config-lab.lb
+++ b/targets/tyan/s2895/Config-lab.lb
@@ -7,19 +7,19 @@ mainboard tyan/s2895
 
 option CONFIG_CONSOLE_SERIAL8250 = 1
 option CONFIG_CONSOLE_VGA = 1
-option XIP_ROM_SIZE = 0x20000
-option ROM_IMAGE_SIZE = 0x18000
-option HAVE_FAILOVER_BOOT = 0
-option FAILOVER_SIZE = 0
-option FALLBACK_SIZE = ROM_SIZE
+option CONFIG_XIP_ROM_SIZE = 0x20000
+option CONFIG_ROM_IMAGE_SIZE = 0x18000
+option CONFIG_HAVE_FAILOVER_BOOT = 0
+option CONFIG_FAILOVER_SIZE = 0
+option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 option CONFIG_COMPRESSED_PAYLOAD_LZMA = 1
 option CONFIG_PRECOMPRESSED_PAYLOAD = 1
 
 # Tyan s2895
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
+	option CONFIG_USE_FALLBACK_IMAGE=1
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf.lzma
 end
 
-buildrom ./coreboot.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/tyan/s2895/Config.lb b/targets/tyan/s2895/Config.lb
index 0b5d73a300..69a83f1fe7 100644
--- a/targets/tyan/s2895/Config.lb
+++ b/targets/tyan/s2895/Config.lb
@@ -8,21 +8,21 @@ mainboard tyan/s2895
 # Tyan s2895
 romimage "normal"
 #       48K for SCSI FW
-#        option ROM_SIZE = 475136
+#        option CONFIG_ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
-#       option ROM_SIZE = 425984 
+#       option CONFIG_ROM_SIZE = 425984 
 #       64K for Etherboot
-#        option ROM_SIZE = 458752 
+#        option CONFIG_ROM_SIZE = 458752 
 #	64K for NIC option 48K for Raid option rom
-#	option ROM_SIZE = 409600
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x11800
-#	option ROM_IMAGE_SIZE=0x13800
-#	option ROM_IMAGE_SIZE=0x15000
-	option ROM_IMAGE_SIZE=0x20000
-#	option ROM_IMAGE_SIZE=0x17800
-	option XIP_ROM_SIZE=0x20000
+#	option CONFIG_ROM_SIZE = 409600
+	option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=0
+#	option CONFIG_ROM_IMAGE_SIZE=0x11800
+#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_ROM_IMAGE_SIZE=0x15000
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -46,14 +46,14 @@ romimage "normal"
 end
 
 romimage "fallback" 
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=1
-#	option ROM_IMAGE_SIZE=0x11800
-#	option ROM_IMAGE_SIZE=0x13800
-#	option ROM_IMAGE_SIZE=0x15000
-	option ROM_IMAGE_SIZE=0x20000
-#	option ROM_IMAGE_SIZE=0x17800
-	option XIP_ROM_SIZE=0x20000
+	option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=1
+#	option CONFIG_ROM_IMAGE_SIZE=0x11800
+#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+#	option CONFIG_ROM_IMAGE_SIZE=0x15000
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
+#	option CONFIG_ROM_IMAGE_SIZE=0x17800
+	option CONFIG_XIP_ROM_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -74,13 +74,13 @@ romimage "fallback"
 end
 
 romimage "failover"
-	option USE_FAILOVER_IMAGE=1
-        option USE_FALLBACK_IMAGE=0
-        option ROM_IMAGE_SIZE=FAILOVER_SIZE
-        option XIP_ROM_SIZE=FAILOVER_SIZE
+	option CONFIG_USE_FAILOVER_IMAGE=1
+        option CONFIG_USE_FALLBACK_IMAGE=0
+        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
-#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" 
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
+#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" 
diff --git a/targets/tyan/s2912/Config-abuild.lb b/targets/tyan/s2912/Config-abuild.lb
index 88dd1684e3..b1c927705b 100644
--- a/targets/tyan/s2912/Config-abuild.lb
+++ b/targets/tyan/s2912/Config-abuild.lb
@@ -4,33 +4,33 @@ target VENDOR_MAINBOARD
 mainboard VENDOR/MAINBOARD
 
 option CC="CROSSCC"
-option CROSS_COMPILE="CROSS_PREFIX"
-option HOSTCC="CROSS_HOSTCC"
+option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
+option CONFIG_HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
 __LOGLEVEL__
 
 romimage "normal"
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x20000
+	option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=0
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback"
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x20000
+	option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
 
 romimage "failover"
-	option USE_FAILOVER_IMAGE=1
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=FAILOVER_SIZE
-	option XIP_ROM_SIZE=FAILOVER_SIZE
+	option CONFIG_USE_FAILOVER_IMAGE=1
+	option CONFIG_USE_FALLBACK_IMAGE=0
+	option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+	option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/tyan/s2912/Config.lb b/targets/tyan/s2912/Config.lb
index 28deabcf6c..d31438869a 100644
--- a/targets/tyan/s2912/Config.lb
+++ b/targets/tyan/s2912/Config.lb
@@ -27,20 +27,20 @@ mainboard tyan/s2912
 # serengeti_leopard
 romimage "normal"
 #       48K for SCSI FW
-#        option ROM_SIZE = 475136
+#        option CONFIG_ROM_SIZE = 475136
 #       48K for SCSI FW and 48K for ATI ROM
-#       option ROM_SIZE = 425984 
+#       option CONFIG_ROM_SIZE = 425984 
 #       64K for Etherboot
-#        option ROM_SIZE = 458752 
+#        option CONFIG_ROM_SIZE = 458752 
 #       44k for atixx.rom
-#        option ROM_SIZE = 479232
-        option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x13800
-#	option ROM_IMAGE_SIZE=0x18800
-	option ROM_IMAGE_SIZE=0x20000
-#	option ROM_IMAGE_SIZE=0x15800
-	option XIP_ROM_SIZE=0x40000
+#        option CONFIG_ROM_SIZE = 479232
+        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
@@ -62,13 +62,13 @@ romimage "normal"
 end
 
 romimage "fallback" 
-        option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=1
-#	option ROM_IMAGE_SIZE=0x13800
-#	option ROM_IMAGE_SIZE=0x19800
-	option ROM_IMAGE_SIZE=0x20000
-#	option ROM_IMAGE_SIZE=0x15800
-	option XIP_ROM_SIZE=0x40000
+        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
@@ -95,12 +95,12 @@ romimage "fallback"
 end
 
 romimage "failover"
-        option USE_FAILOVER_IMAGE=1
-        option USE_FALLBACK_IMAGE=0
-        option ROM_IMAGE_SIZE=FAILOVER_SIZE
-        option XIP_ROM_SIZE=FAILOVER_SIZE
+        option CONFIG_USE_FAILOVER_IMAGE=1
+        option CONFIG_USE_FALLBACK_IMAGE=0
+        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
-#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/tyan/s2912/Config.lb.kernel b/targets/tyan/s2912/Config.lb.kernel
index 3ca4f324d7..e09a5580c0 100644
--- a/targets/tyan/s2912/Config.lb.kernel
+++ b/targets/tyan/s2912/Config.lb.kernel
@@ -24,19 +24,19 @@
 target s2912
 mainboard tyan/s2912
 
-option ROM_SIZE=0x200000
-option FALLBACK_SIZE=(ROM_SIZE-0x1000)
+option CONFIG_ROM_SIZE=0x200000
+option CONFIG_FALLBACK_SIZE=(CONFIG_ROM_SIZE-0x1000)
 
 romimage "fallback" 
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=1
+	option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-#	option ROM_IMAGE_SIZE=0x19800
-	option ROM_IMAGE_SIZE=0x17000
-#	option ROM_IMAGE_SIZE=0x15800
-#	option ROM_IMAGE_SIZE=0x13800
-	option XIP_ROM_SIZE=0x40000
+#	option CONFIG_ROM_IMAGE_SIZE=0x19800
+	option CONFIG_ROM_IMAGE_SIZE=0x17000
+#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -65,13 +65,13 @@ romimage "fallback"
 end
 
 romimage "failover"
-	option USE_FAILOVER_IMAGE=1
-        option USE_FALLBACK_IMAGE=0
-        option ROM_IMAGE_SIZE=FAILOVER_SIZE
-        option XIP_ROM_SIZE=FAILOVER_SIZE
+	option CONFIG_USE_FAILOVER_IMAGE=1
+        option CONFIG_USE_FALLBACK_IMAGE=0
+        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
 
-buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
-#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" 
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback" "failover"
+#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" 
diff --git a/targets/tyan/s2912_fam10/Config-abuild.lb b/targets/tyan/s2912_fam10/Config-abuild.lb
index 7431783fb4..6c075c3d11 100644
--- a/targets/tyan/s2912_fam10/Config-abuild.lb
+++ b/targets/tyan/s2912_fam10/Config-abuild.lb
@@ -22,36 +22,36 @@ target tyan_s2912_fam10
 mainboard tyan/s2912_fam10
 
 option CC="CROSSCC"
-option CROSS_COMPILE="CROSS_PREFIX"
-option HOSTCC="CROSS_HOSTCC"
+option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
+option CONFIG_HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
 __LOGLEVEL__
 
 romimage "normal"
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x34000
-	option XIP_ROM_SIZE=0x40000
+	option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=0
+	option CONFIG_ROM_IMAGE_SIZE=0x34000
+	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x34000
-	option XIP_ROM_SIZE=0x40000
+	option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=0x34000
+	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload __PAYLOAD__
 end
 
 romimage "failover"
-	option USE_FAILOVER_IMAGE=1
-        option USE_FALLBACK_IMAGE=0
-        option ROM_IMAGE_SIZE=FAILOVER_SIZE
-        option XIP_ROM_SIZE=FAILOVER_SIZE
+	option CONFIG_USE_FAILOVER_IMAGE=1
+        option CONFIG_USE_FALLBACK_IMAGE=0
+        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION=".0-Failover"
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/tyan/s2912_fam10/Config.lb b/targets/tyan/s2912_fam10/Config.lb
index 5c9dfcd1e5..e08f657081 100644
--- a/targets/tyan/s2912_fam10/Config.lb
+++ b/targets/tyan/s2912_fam10/Config.lb
@@ -25,34 +25,34 @@ target s2912_fam10
 mainboard tyan/s2912_fam10
 
 # Make room for ATI ES1000 VGA ROM
-option ROM_SIZE=ROM_SIZE-44*1024
+option CONFIG_ROM_SIZE=ROM_SIZE-44*1024
 
 romimage "normal"
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x20000
-	option XIP_ROM_SIZE=0x40000
+	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 USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x20000
-	option XIP_ROM_SIZE=0x40000
+        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
 end
 
 romimage "failover"
-        option USE_FAILOVER_IMAGE=1
-        option USE_FALLBACK_IMAGE=0
-        option ROM_IMAGE_SIZE=FAILOVER_SIZE
-        option XIP_ROM_SIZE=FAILOVER_SIZE
+        option CONFIG_USE_FAILOVER_IMAGE=1
+        option CONFIG_USE_FALLBACK_IMAGE=0
+        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/tyan/s2912_fam10/Config.lb.kernel b/targets/tyan/s2912_fam10/Config.lb.kernel
index 3ca4f324d7..e09a5580c0 100644
--- a/targets/tyan/s2912_fam10/Config.lb.kernel
+++ b/targets/tyan/s2912_fam10/Config.lb.kernel
@@ -24,19 +24,19 @@
 target s2912
 mainboard tyan/s2912
 
-option ROM_SIZE=0x200000
-option FALLBACK_SIZE=(ROM_SIZE-0x1000)
+option CONFIG_ROM_SIZE=0x200000
+option CONFIG_FALLBACK_SIZE=(CONFIG_ROM_SIZE-0x1000)
 
 romimage "fallback" 
-	option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=1
+	option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=1
 	option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 	option CONFIG_PRECOMPRESSED_PAYLOAD=1
-#	option ROM_IMAGE_SIZE=0x19800
-	option ROM_IMAGE_SIZE=0x17000
-#	option ROM_IMAGE_SIZE=0x15800
-#	option ROM_IMAGE_SIZE=0x13800
-	option XIP_ROM_SIZE=0x40000
+#	option CONFIG_ROM_IMAGE_SIZE=0x19800
+	option CONFIG_ROM_IMAGE_SIZE=0x17000
+#	option CONFIG_ROM_IMAGE_SIZE=0x15800
+#	option CONFIG_ROM_IMAGE_SIZE=0x13800
+	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
@@ -65,13 +65,13 @@ romimage "fallback"
 end
 
 romimage "failover"
-	option USE_FAILOVER_IMAGE=1
-        option USE_FALLBACK_IMAGE=0
-        option ROM_IMAGE_SIZE=FAILOVER_SIZE
-        option XIP_ROM_SIZE=FAILOVER_SIZE
+	option CONFIG_USE_FAILOVER_IMAGE=1
+        option CONFIG_USE_FALLBACK_IMAGE=0
+        option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
+        option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
 
-buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
-#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" 
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback" "failover"
+#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" 
diff --git a/targets/tyan/s4880/Config.lb b/targets/tyan/s4880/Config.lb
index abb9912713..6b98702f49 100644
--- a/targets/tyan/s4880/Config.lb
+++ b/targets/tyan/s4880/Config.lb
@@ -8,16 +8,16 @@ mainboard tyan/s4880
 # Tyan s4880
 romimage "normal"
 #       48K for SCSI FW or ATI ROM
-        option ROM_SIZE = 512*1024-48*1024
+        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 48K for ATI ROM
-#       option ROM_SIZE = 512*1024-48*1024-48*1024
+#       option CONFIG_ROM_SIZE = 512*1024-48*1024-48*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x19000
-#	option ROM_IMAGE_SIZE=0x19c00
-	option ROM_IMAGE_SIZE=0x20000
-	option XIP_ROM_SIZE=0x20000
+#        option CONFIG_ROM_SIZE = 512*1024-64*1024
+	option CONFIG_USE_FALLBACK_IMAGE=0
+#	option CONFIG_ROM_IMAGE_SIZE=0x19000
+#	option CONFIG_ROM_IMAGE_SIZE=0x19c00
+	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
@@ -32,11 +32,11 @@ romimage "normal"
 end
 
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-#	option ROM_IMAGE_SIZE=0x19000
-#	option ROM_IMAGE_SIZE=0x19c00
-	option ROM_IMAGE_SIZE=0x20000
-	option XIP_ROM_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+#	option CONFIG_ROM_IMAGE_SIZE=0x19000
+#	option CONFIG_ROM_IMAGE_SIZE=0x19c00
+	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
@@ -50,4 +50,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s4882/Config.lb b/targets/tyan/s4882/Config.lb
index bcf903db9b..cc44c1b32c 100644
--- a/targets/tyan/s4882/Config.lb
+++ b/targets/tyan/s4882/Config.lb
@@ -8,18 +8,18 @@ mainboard tyan/s4882
 # Tyan s4882
 romimage "normal"
 #       48K for SCSI FW or ATI ROM
-        option ROM_SIZE = 512*1024-48*1024
+        option CONFIG_ROM_SIZE = 512*1024-48*1024
 #       48K for SCSI FW and 48K for ATI ROM
-#       option ROM_SIZE = 512*1024-48*1024-48*1024
+#       option CONFIG_ROM_SIZE = 512*1024-48*1024-48*1024
 #       64K for Etherboot
-#        option ROM_SIZE = 512*1024-64*1024
-	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x19000
-#	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 CONFIG_ROM_SIZE = 512*1024-64*1024
+	option CONFIG_USE_FALLBACK_IMAGE=0
+#	option CONFIG_ROM_IMAGE_SIZE=0x19000
+#	option CONFIG_ROM_IMAGE_SIZE=0x19c00
+#	option CONFIG_ROM_IMAGE_SIZE=0x18800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16200
+	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
@@ -36,13 +36,13 @@ romimage "normal"
 end
 
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-#	option ROM_IMAGE_SIZE=0x19000
-#	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 CONFIG_USE_FALLBACK_IMAGE=1
+#	option CONFIG_ROM_IMAGE_SIZE=0x19000
+#	option CONFIG_ROM_IMAGE_SIZE=0x19c00
+#	option CONFIG_ROM_IMAGE_SIZE=0x18800
+#	option CONFIG_ROM_IMAGE_SIZE=0x16200
+	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
@@ -58,4 +58,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"