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

4 files changed, 44 insertions, 44 deletions

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"