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

2 files changed, 31 insertions, 31 deletions

diff --git a/targets/msi/ms7260/Config-abuild.lb b/targets/msi/ms7260/Config-abuild.lb
index a03aba0f40..f30a9b367e 100644
--- a/targets/msi/ms7260/Config-abuild.lb
+++ b/targets/msi/ms7260/Config-abuild.lb
@@ -22,37 +22,37 @@ 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_FAILOVER_IMAGE = 0
-	option USE_FALLBACK_IMAGE = 0
-	option ROM_IMAGE_SIZE = 128 * 1024
-	option XIP_ROM_SIZE = 256 * 1024
+	option CONFIG_USE_FAILOVER_IMAGE = 0
+	option CONFIG_USE_FALLBACK_IMAGE = 0
+	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_XIP_ROM_SIZE = 256 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback"
-	option USE_FAILOVER_IMAGE = 0
-	option USE_FALLBACK_IMAGE = 1
-	option ROM_IMAGE_SIZE = 128 * 1024
-	option XIP_ROM_SIZE = 256 * 1024
+	option CONFIG_USE_FAILOVER_IMAGE = 0
+	option CONFIG_USE_FALLBACK_IMAGE = 1
+	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_XIP_ROM_SIZE = 256 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload __PAYLOAD__
 end
 
 romimage "failover"
-	option USE_FAILOVER_IMAGE = 1
-	option USE_FALLBACK_IMAGE = 0
-	option ROM_IMAGE_SIZE = FAILOVER_SIZE
-	option XIP_ROM_SIZE = FAILOVER_SIZE
+	option CONFIG_USE_FAILOVER_IMAGE = 1
+	option CONFIG_USE_FALLBACK_IMAGE = 0
+	option CONFIG_ROM_IMAGE_SIZE = CONFIG_FAILOVER_SIZE
+	option CONFIG_XIP_ROM_SIZE = CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION = ".0Failover"
 end
 
-# buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+# buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/msi/ms7260/Config.lb b/targets/msi/ms7260/Config.lb
index 1ef5be266b..04a33ff68b 100644
--- a/targets/msi/ms7260/Config.lb
+++ b/targets/msi/ms7260/Config.lb
@@ -21,38 +21,38 @@
 target ms7260
 mainboard msi/ms7260
 
-option ROM_SIZE = 512 * 1024
+option CONFIG_ROM_SIZE = 512 * 1024
 
 option CONFIG_COMPRESSED_PAYLOAD_NRV2B = 1   # NRV2B compression
 # option CONFIG_COMPRESSED_PAYLOAD_LZMA = 1    # LZMA compression
 
 romimage "normal"
-	option USE_FAILOVER_IMAGE = 0
-	option USE_FALLBACK_IMAGE = 0
-	option ROM_IMAGE_SIZE = 128 * 1024
-	option XIP_ROM_SIZE = 256 * 1024
+	option CONFIG_USE_FAILOVER_IMAGE = 0
+	option CONFIG_USE_FALLBACK_IMAGE = 0
+	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_XIP_ROM_SIZE = 256 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Normal"
 #	payload /tmp/filo.elf
 	payload ../payload.elf
 end
 
 romimage "fallback"
-	option USE_FAILOVER_IMAGE = 0
-	option USE_FALLBACK_IMAGE = 1
-	option ROM_IMAGE_SIZE = 128 * 1024
-	option XIP_ROM_SIZE = 256 * 1024
+	option CONFIG_USE_FAILOVER_IMAGE = 0
+	option CONFIG_USE_FALLBACK_IMAGE = 1
+	option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
+	option CONFIG_XIP_ROM_SIZE = 256 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 #	payload /tmp/filo.elf
 	payload ../payload.elf
 end
 
 romimage "failover"
-	option USE_FAILOVER_IMAGE = 1
-	option USE_FALLBACK_IMAGE = 0
-	option ROM_IMAGE_SIZE = FAILOVER_SIZE
-	option XIP_ROM_SIZE = FAILOVER_SIZE
+	option CONFIG_USE_FAILOVER_IMAGE = 1
+	option CONFIG_USE_FALLBACK_IMAGE = 0
+	option CONFIG_ROM_IMAGE_SIZE = CONFIG_FAILOVER_SIZE
+	option CONFIG_XIP_ROM_SIZE = CONFIG_FAILOVER_SIZE
 	option COREBOOT_EXTRA_VERSION = ".0Failover"
 end
 
-# buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+# buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"