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

diff --git a/targets/gigabyte/ga_2761gxdk/Config-abuild.lb b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
index bba261153c..14e83807e8 100644
--- a/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
+++ b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
@@ -23,39 +23,39 @@ 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 = 512*1024
+option CONFIG_ROM_SIZE = 512*1024
 
 romimage "normal"
-        option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=0
-	option ROM_IMAGE_SIZE=0x28000
-	option XIP_ROM_SIZE=0x40000
+        option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=0
+	option CONFIG_ROM_IMAGE_SIZE=0x28000
+	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
-        option USE_FAILOVER_IMAGE=0
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x20000
-	option XIP_ROM_SIZE=0x40000
+        option CONFIG_USE_FAILOVER_IMAGE=0
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
+	option CONFIG_XIP_ROM_SIZE=0x40000
 	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	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=".0-Failover"
 end
 
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/gigabyte/ga_2761gxdk/Config.lb b/targets/gigabyte/ga_2761gxdk/Config.lb
index fc802f24a2..1266366e80 100644
--- a/targets/gigabyte/ga_2761gxdk/Config.lb
+++ b/targets/gigabyte/ga_2761gxdk/Config.lb
@@ -26,33 +26,33 @@ mainboard gigabyte/ga_2761gxdk
 
 romimage "normal"
 #       32K for VGA BIOS
-        option ROM_SIZE = (512*1024 - 32*1024)
+        option CONFIG_ROM_SIZE = (512*1024 - 32*1024)
 
-        option USE_FAILOVER_IMAGE=0
-        option ROM_IMAGE_SIZE=0x20000
-        option XIP_ROM_SIZE=0x40000
+        option CONFIG_USE_FAILOVER_IMAGE=0
+        option CONFIG_ROM_IMAGE_SIZE=0x20000
+        option CONFIG_XIP_ROM_SIZE=0x40000
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #	payload ../../../../payloads/filo_uda1.elf
 	payload ../payload.elf
 end
 
 romimage "fallback"
-        option USE_FAILOVER_IMAGE=0
-        option USE_FALLBACK_IMAGE=1
-        option ROM_IMAGE_SIZE=0x20000
-        option XIP_ROM_SIZE=0x40000
+        option CONFIG_USE_FAILOVER_IMAGE=0
+        option CONFIG_USE_FALLBACK_IMAGE=1
+        option CONFIG_ROM_IMAGE_SIZE=0x20000
+        option CONFIG_XIP_ROM_SIZE=0x40000
         option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #	payload ../../../../payloads/filo_uda1.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="$(shell cat ../../VERSION)_Failover"
 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"