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

diff --git a/targets/bcom/winnet100/Config.lb b/targets/bcom/winnet100/Config.lb
index ec5210fe68..de81d0f75d 100644
--- a/targets/bcom/winnet100/Config.lb
+++ b/targets/bcom/winnet100/Config.lb
@@ -23,7 +23,7 @@
 target winnet100
 mainboard bcom/winnet100
 
-option ROM_SIZE = 256 * 1024
+option CONFIG_ROM_SIZE = 256 * 1024
 
 ## Enable VGA with a splash screen (only 640x480 to run on most monitors).
 ## We want to support up to 1024x768@16 so we need 2MiB video memory.
@@ -33,21 +33,21 @@ option CONFIG_GX1_VIDEOMODE = 0
 option CONFIG_SPLASH_GRAPHIC = 1
 option CONFIG_VIDEO_MB = 2
 
-option DEFAULT_CONSOLE_LOGLEVEL = 6
-option MAXIMUM_CONSOLE_LOGLEVEL = 6
+option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 6
+option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 6
 
 romimage "normal"
-	option USE_FALLBACK_IMAGE = 0
-	option ROM_IMAGE_SIZE = 64 * 1024
+	option CONFIG_USE_FALLBACK_IMAGE = 0
+	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload ../../../../../../../images/etherboot.elf
 end
 
 romimage "fallback"
-	option USE_FALLBACK_IMAGE = 1
-	option ROM_IMAGE_SIZE = 64 * 1024
+	option CONFIG_USE_FALLBACK_IMAGE = 1
+	option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
 	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload ../../../../../../../images/etherboot.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
diff --git a/targets/bcom/winnetp680/Config-abuild.lb b/targets/bcom/winnetp680/Config-abuild.lb
index d364cb7cbd..2a65acae0d 100644
--- a/targets/bcom/winnetp680/Config-abuild.lb
+++ b/targets/bcom/winnetp680/Config-abuild.lb
@@ -4,18 +4,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__
 
-option ROM_SIZE=512*1024
+option CONFIG_ROM_SIZE=512*1024
 
 romimage "fallback" 
-	option USE_FALLBACK_IMAGE=1
-	option ROM_IMAGE_SIZE=0x20000
+	option CONFIG_USE_FALLBACK_IMAGE=1
+	option CONFIG_ROM_IMAGE_SIZE=0x20000
 	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
-buildrom ./coreboot.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
diff --git a/targets/bcom/winnetp680/Config.lb b/targets/bcom/winnetp680/Config.lb
index 079e2ec8b3..ced4de9ba8 100644
--- a/targets/bcom/winnetp680/Config.lb
+++ b/targets/bcom/winnetp680/Config.lb
@@ -22,24 +22,24 @@
 target bcom-winnet-p680
 mainboard bcom/winnetp680
 
-option MAXIMUM_CONSOLE_LOGLEVEL=8
-option DEFAULT_CONSOLE_LOGLEVEL=8
+option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
+option CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 option CONFIG_CONSOLE_SERIAL8250=1
 
 # coreboot C code runs at this location in RAM
-option _RAMBASE=0x00004000
+option CONFIG_RAMBASE=0x00004000
 
 #
 # If space is allotted for a VGA BIOS,
 # generate the final ROM like this:
 # cat vgabios bochsbios coreboot.rom > coreboot.rom.final
 #
-#option ROM_SIZE = (512 * 1024) - (63 * 1024) - (64 * 1024)
-option ROM_SIZE = (512 * 1024)
+#option CONFIG_ROM_SIZE = (512 * 1024) - (63 * 1024) - (64 * 1024)
+option CONFIG_ROM_SIZE = (512 * 1024)
 
 romimage "image"
 	option COREBOOT_EXTRA_VERSION = "-winnetp680"
 	payload ../payload.elf
 end
 
-buildrom ./coreboot.rom ROM_SIZE "image"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"