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

diff --git a/targets/digitallogic/adl855pc/Config.lb b/targets/digitallogic/adl855pc/Config.lb
index 18372414a2..91021374ca 100644
--- a/targets/digitallogic/adl855pc/Config.lb
+++ b/targets/digitallogic/adl855pc/Config.lb
@@ -4,20 +4,20 @@
 target adl855pc
 mainboard digitallogic/adl855pc
 
-option DEFAULT_CONSOLE_LOGLEVEL=9
-option MAXIMUM_CONSOLE_LOGLEVEL=9
+option CONFIG_DEFAULT_CONSOLE_LOGLEVEL=9
+option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=9
 romimage "normal"
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x10000
+	option CONFIG_USE_FALLBACK_IMAGE=0
+	option CONFIG_ROM_IMAGE_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Normal"
 	payload /etc/hosts
 end
 
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x10000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /etc/hosts
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/digitallogic/msm586seg/Config-abuild.lb b/targets/digitallogic/msm586seg/Config-abuild.lb
index 7efa9040ec..9b5b027c16 100644
--- a/targets/digitallogic/msm586seg/Config-abuild.lb
+++ b/targets/digitallogic/msm586seg/Config-abuild.lb
@@ -2,18 +2,18 @@ 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 "fallback" 
-	option FALLBACK_SIZE = 256 * 1024
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE= 128 * 1024
+	option CONFIG_FALLBACK_SIZE = 256 * 1024
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE= 128 * 1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload __PAYLOAD__
 end
 
-buildrom ./coreboot.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE  "fallback"
diff --git a/targets/digitallogic/msm586seg/Config.lb b/targets/digitallogic/msm586seg/Config.lb
index 565434c238..a2ad579644 100644
--- a/targets/digitallogic/msm586seg/Config.lb
+++ b/targets/digitallogic/msm586seg/Config.lb
@@ -3,30 +3,30 @@ mainboard digitallogic/msm586seg
 
 
 
-option DEFAULT_CONSOLE_LOGLEVEL=3
-option MAXIMUM_CONSOLE_LOGLEVEL=3
+option CONFIG_DEFAULT_CONSOLE_LOGLEVEL=3
+option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=3
 option CONFIG_COMPRESS=0
 
 option CONFIG_CONSOLE_VGA=0
 
 #romimage "normal"
-#	option USE_FALLBACK_IMAGE=0
-#	option ROM_IMAGE_SIZE=0x10000
+#	option CONFIG_USE_FALLBACK_IMAGE=0
+#	option CONFIG_ROM_IMAGE_SIZE=0x10000
 #	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /etc/hosts
 #end
 
 romimage "fallback" 
-	option FALLBACK_SIZE = 256 * 1024
-#	option ROM_SIZE=512*1024
-#	option ROM_SECTION_SIZE=512*1024
-	option USE_FALLBACK_IMAGE=1
-#	option ROM_IMAGE_SIZE=32 * 1024 # 0x8000
-	option ROM_IMAGE_SIZE=128 * 1024 # 0x10000
-#	option ROM_IMAGE_SIZE=512 * 1024 # 0x10000
+	option CONFIG_FALLBACK_SIZE = 256 * 1024
+#	option CONFIG_ROM_SIZE=512*1024
+#	option CONFIG_ROM_SECTION_SIZE=512*1024
+	option CONFIG_USE_FALLBACK_IMAGE=1
+#	option CONFIG_ROM_IMAGE_SIZE=32 * 1024 # 0x8000
+	option CONFIG_ROM_IMAGE_SIZE=128 * 1024 # 0x10000
+#	option CONFIG_ROM_IMAGE_SIZE=512 * 1024 # 0x10000
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../../filo.elf
 #	payload ../../eepro100--ide_disk.zelf
 end
 
-buildrom ./coreboot.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE  "fallback"
diff --git a/targets/digitallogic/msm800sev/Config.lb b/targets/digitallogic/msm800sev/Config.lb
index 83ca2f60b9..473556bea7 100644
--- a/targets/digitallogic/msm800sev/Config.lb
+++ b/targets/digitallogic/msm800sev/Config.lb
@@ -5,24 +5,24 @@ mainboard digitallogic/msm800sev
 
 option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 
-## ROM_SIZE is the total number of bytes allocated for coreboot use
+## CONFIG_ROM_SIZE is the total number of bytes allocated for coreboot use
 ## (normal AND fallback images and payloads).
 ## leave 36k for vsa 
 ##
-option ROM_SIZE = 1024*1024 - 36 * 1024
+option CONFIG_ROM_SIZE = 1024*1024 - 36 * 1024
 
-## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
+## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
-option ROM_IMAGE_SIZE=64*1024
+option CONFIG_ROM_IMAGE_SIZE=64*1024
 
-option FALLBACK_SIZE = ROM_SIZE
+option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 
-option DEFAULT_CONSOLE_LOGLEVEL = 9
-option MAXIMUM_CONSOLE_LOGLEVEL = 9
+option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
+option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
+	option CONFIG_USE_FALLBACK_IMAGE=1
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../payload.elf 
 end
 
-buildrom ./coreboot.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE  "fallback"