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

5 files changed, 36 insertions, 36 deletions

diff --git a/targets/olpc/btest/Config.lb b/targets/olpc/btest/Config.lb
index 3789519f91..df9d0fec91 100644
--- a/targets/olpc/btest/Config.lb
+++ b/targets/olpc/btest/Config.lb
@@ -9,16 +9,16 @@ mainboard olpc/btest
 #option CONFIG_PRECOMPRESSED_PAYLOAD=0
 
 # leave 64k for vsa and 64k for EC code
-option ROM_SIZE=(1024*1024)-(64*1024)-(64*1024)
-option FALLBACK_SIZE=ROM_SIZE
+option CONFIG_ROM_SIZE=(1024*1024)-(64*1024)-(64*1024)
+option CONFIG_FALLBACK_SIZE=CONFIG_ROM_SIZE
 
-option DEFAULT_CONSOLE_LOGLEVEL = 3
-option MAXIMUM_CONSOLE_LOGLEVEL = 3
+option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 3
+option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 3
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=32*1024
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=32*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE  "fallback"
diff --git a/targets/olpc/rev_a/Config.1M.lb b/targets/olpc/rev_a/Config.1M.lb
index cacc9a030f..bd7d4bb1ef 100644
--- a/targets/olpc/rev_a/Config.1M.lb
+++ b/targets/olpc/rev_a/Config.1M.lb
@@ -8,16 +8,16 @@ mainboard olpc/rev_a
 #option CONFIG_PRECOMPRESSED_PAYLOAD=1
 
 # leave 64k for vsa
-option ROM_SIZE=(1024*1024)-(64*1024)
-option FALLBACK_SIZE=ROM_SIZE
+option CONFIG_ROM_SIZE=(1024*1024)-(64*1024)
+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 ROM_IMAGE_SIZE=32*1024
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=32*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE  "fallback"
diff --git a/targets/olpc/rev_a/Config.SPI.lb b/targets/olpc/rev_a/Config.SPI.lb
index fa3593a8e6..70e45223cd 100644
--- a/targets/olpc/rev_a/Config.SPI.lb
+++ b/targets/olpc/rev_a/Config.SPI.lb
@@ -9,16 +9,16 @@ mainboard olpc/rev_a
 #option CONFIG_PRECOMPRESSED_PAYLOAD=0
 
 # leave 64k for vsa and 64k for EC code
-option ROM_SIZE=(1024*1024)-(64*1024)-(64*1024)
-option FALLBACK_SIZE=ROM_SIZE
+option CONFIG_ROM_SIZE=(1024*1024)-(64*1024)-(64*1024)
+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 ROM_IMAGE_SIZE=32*1024
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=32*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE  "fallback"
diff --git a/targets/olpc/rev_a/Config.kernel.lb b/targets/olpc/rev_a/Config.kernel.lb
index ed612f7e90..15b5a6f32c 100644
--- a/targets/olpc/rev_a/Config.kernel.lb
+++ b/targets/olpc/rev_a/Config.kernel.lb
@@ -3,12 +3,12 @@
 target rev_a
 mainboard olpc/rev_a
 
-option ROM_SIZE=7*128*1024
-option FALLBACK_SIZE=ROM_SIZE
+option CONFIG_ROM_SIZE=7*128*1024
+option CONFIG_FALLBACK_SIZE=CONFIG_ROM_SIZE
 
 #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 /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 ##	payload ../../../../tg3--ide_disk.zelf	
@@ -19,8 +19,8 @@ option FALLBACK_SIZE=ROM_SIZE
 #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 /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
@@ -31,5 +31,5 @@ romimage "fallback"
 	payload /tmp/olpc
 end
 
-buildrom ./coreboot.rom ROM_SIZE  "fallback"
-#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE  "fallback"
+#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/olpc/rev_a/Config.lb b/targets/olpc/rev_a/Config.lb
index b570c66bcc..28258770a1 100644
--- a/targets/olpc/rev_a/Config.lb
+++ b/targets/olpc/rev_a/Config.lb
@@ -5,16 +5,16 @@ mainboard olpc/rev_a
 
 # leave 64k for vsa
 option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
-option ROM_SIZE=512*1024-64*1024
-option FALLBACK_SIZE=ROM_SIZE
+option CONFIG_ROM_SIZE=512*1024-64*1024
+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 ROM_IMAGE_SIZE=32*1024
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=32*1024
 	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE  "fallback"