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

3 files changed, 25 insertions, 25 deletions

diff --git a/targets/intel/mtarvon/Config.lb b/targets/intel/mtarvon/Config.lb
index 432bf6a1c2..87dc4f9d45 100644
--- a/targets/intel/mtarvon/Config.lb
+++ b/targets/intel/mtarvon/Config.lb
@@ -20,21 +20,21 @@
 target mtarvon
 mainboard intel/mtarvon
 
-## 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).
-option ROM_SIZE = 2 * 1024 * 1024
+option CONFIG_ROM_SIZE = 2 * 1024 * 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 = 128 * 1024
+option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
 
-## FALLBACK_SIZE is the amount of the ROM the complete fallback image
+## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image
 ## (including payload) will use
-option FALLBACK_SIZE = ROM_SIZE
+option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 
 romimage "fallback"
-	option USE_FALLBACK_IMAGE=1
+	option CONFIG_USE_FALLBACK_IMAGE=1
 	payload /tmp/filo.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/intel/truxton/Config.lb b/targets/intel/truxton/Config.lb
index 3b1a580fd9..669c1c00cc 100644
--- a/targets/intel/truxton/Config.lb
+++ b/targets/intel/truxton/Config.lb
@@ -20,21 +20,21 @@
 target truxton
 mainboard intel/truxton
 
-## 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).
-option ROM_SIZE = 2 * 1024 * 1024
+option CONFIG_ROM_SIZE = 2 * 1024 * 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 = 128 * 1024
+option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
 
-## FALLBACK_SIZE is the amount of the ROM the complete fallback image
+## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image
 ## (including payload) will use
-option FALLBACK_SIZE = ROM_SIZE
+option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
 
 romimage "fallback"
-	option USE_FALLBACK_IMAGE=1
+	option CONFIG_USE_FALLBACK_IMAGE=1
 	payload /tmp/filo.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/intel/xe7501devkit/Config.lb b/targets/intel/xe7501devkit/Config.lb
index b421f1b005..00f9451984 100644
--- a/targets/intel/xe7501devkit/Config.lb
+++ b/targets/intel/xe7501devkit/Config.lb
@@ -1,22 +1,22 @@
 target xe7501devkit
 mainboard intel/xe7501devkit
 
-## 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).
-option ROM_SIZE = 192*1024
+option CONFIG_ROM_SIZE = 192*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 = 0x1B000
+option CONFIG_ROM_IMAGE_SIZE = 0x1B000
 
-## FALLBACK_SIZE is the amount of the ROM the complete fallback image 
+## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image 
 ## (including payload) will use
-option FALLBACK_SIZE = 0
+option CONFIG_FALLBACK_SIZE = 0
 
 
 
 romimage "normal"
-	option USE_FALLBACK_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=0
 #	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../../../../../memtest86/memtest
 #       payload ../../../../../../../etherboot/src/bin/e1000.zelf
@@ -27,11 +27,11 @@ end
 #NOTE: CMOS currently not supported due to conflicts with factory BIOS
 #      Thus no support for fallback boot.
 #romimage "fallback" 
-#	option USE_FALLBACK_IMAGE=1
+#	option CONFIG_USE_FALLBACK_IMAGE=1
 #	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../../../../../memtest86/memtest
 #       payload ../../../../../../../etherboot/src/bin/e1000.zelf
 #       payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf
 #end
 
-buildrom ./coreboot.rom ROM_SIZE "normal"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal"