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, 30 insertions, 30 deletions

diff --git a/targets/iei/juki-511p/Config-abuild.lb b/targets/iei/juki-511p/Config-abuild.lb
index 3c203bdd9b..f26e780cf3 100644
--- a/targets/iei/juki-511p/Config-abuild.lb
+++ b/targets/iei/juki-511p/Config-abuild.lb
@@ -2,31 +2,31 @@ 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__
 
-option ROM_SIZE=256*1024
+option CONFIG_ROM_SIZE=256*1024
 ###
 ### Compute the location and size of where this firmware image
 ### (coreboot plus bootloader) will live in the boot rom chip.
 ###
-option FALLBACK_SIZE=128*1024
+option CONFIG_FALLBACK_SIZE=128*1024
 
 romimage "normal"
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=64*1024
+	option CONFIG_USE_FALLBACK_IMAGE=0
+	option CONFIG_ROM_IMAGE_SIZE=64*1024
 	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=64*1024
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=64*1024
 	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/iei/juki-511p/Config.lb b/targets/iei/juki-511p/Config.lb
index 5015562285..83fa1ffa67 100644
--- a/targets/iei/juki-511p/Config.lb
+++ b/targets/iei/juki-511p/Config.lb
@@ -21,17 +21,17 @@
 target juki-511p
 mainboard iei/juki-511p
 
-option ROM_SIZE=256*1024
+option CONFIG_ROM_SIZE=256*1024
 
-option HAVE_PIRQ_TABLE=1
+option CONFIG_HAVE_PIRQ_TABLE=1
 
 option CONFIG_COMPRESS=0
 option CONFIG_PRECOMPRESSED_PAYLOAD=0
 
 romimage "image"
-	option ROM_IMAGE_SIZE=64*1024
+	option CONFIG_ROM_IMAGE_SIZE=64*1024
 	option COREBOOT_EXTRA_VERSION="-filo"
 	payload ../../filo.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
diff --git a/targets/iei/nova4899r/Config.lb b/targets/iei/nova4899r/Config.lb
index ec2e76f588..7a7e108fb2 100644
--- a/targets/iei/nova4899r/Config.lb
+++ b/targets/iei/nova4899r/Config.lb
@@ -24,24 +24,24 @@
 target nova4899r
 mainboard iei/nova4899r
 
-#option ROM_SIZE=256*1024
+#option CONFIG_ROM_SIZE=256*1024
 
 #from OLPC definitions
 option CONFIG_COMPRESSED_PAYLOAD_NRV2B=1
 #option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 #option CONFIG_PRECOMPRESSED_PAYLOAD=0
 # leave 128k for vsa and 32k for VGA code
-option ROM_SIZE=(256*1024)-(128*1024)-(32*1024)
-option FALLBACK_SIZE=ROM_SIZE
+option CONFIG_ROM_SIZE=(256*1024)-(128*1024)-(32*1024)
+option CONFIG_FALLBACK_SIZE=CONFIG_ROM_SIZE
 
-option DEFAULT_CONSOLE_LOGLEVEL = 8
-option MAXIMUM_CONSOLE_LOGLEVEL = 8
+option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 8
+option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 8
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=64*1024
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=64*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /opt/coreboot-SVN/filo.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
 #"normal" 
diff --git a/targets/iei/pcisa-lx-800-r10/Config.lb b/targets/iei/pcisa-lx-800-r10/Config.lb
index 7993fa6aaa..8b848065b3 100644
--- a/targets/iei/pcisa-lx-800-r10/Config.lb
+++ b/targets/iei/pcisa-lx-800-r10/Config.lb
@@ -27,20 +27,20 @@ option CONFIG_COMPRESSED_PAYLOAD_NRV2B = 0
 option CONFIG_COMPRESSED_PAYLOAD_LZMA = 0
 
 # Leave 36k for VSA.
-option ROM_SIZE = (512 * 1024) - (36 * 1024)
-# option ROM_SIZE = (2048 * 1024) - (36 * 1024)
+option CONFIG_ROM_SIZE = (512 * 1024) - (36 * 1024)
+# option CONFIG_ROM_SIZE = (2048 * 1024) - (36 * 1024)
 # Leave 36k for VSA, 1152k for bzImage and 750k for initrd.
-# option ROM_SIZE = (2048 * 1024) - (36 * 1024) - (1152 * 1024) - (750 * 1024)
-option FALLBACK_SIZE = ROM_SIZE
+# option CONFIG_ROM_SIZE = (2048 * 1024) - (36 * 1024) - (1152 * 1024) - (750 * 1024)
+option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 
-option DEFAULT_CONSOLE_LOGLEVEL = 0
-option MAXIMUM_CONSOLE_LOGLEVEL = 0
+option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 0
+option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 0
 
 romimage "fallback"
-	option USE_FALLBACK_IMAGE = 1
-	option ROM_IMAGE_SIZE = 80 * 1024
+	option CONFIG_USE_FALLBACK_IMAGE = 1
+	option CONFIG_ROM_IMAGE_SIZE = 80 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"