From 0867062412dd4bfe5a556e5f3fd85ba5b682d79b Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 30 Jun 2009 15:17:49 +0000 Subject: 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 Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4381 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- targets/emulation/qemu-x86/Config-abuild.lb | 8 ++++---- targets/emulation/qemu-x86/Config-car.lb | 14 +++++++------- targets/emulation/qemu-x86/Config-lab.lb | 8 ++++---- targets/emulation/qemu-x86/Config.OLPC.lb | 8 ++++---- targets/emulation/qemu-x86/Config.lb | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'targets/emulation') diff --git a/targets/emulation/qemu-x86/Config-abuild.lb b/targets/emulation/qemu-x86/Config-abuild.lb index bcfc9c5aad..0d537cad91 100644 --- a/targets/emulation/qemu-x86/Config-abuild.lb +++ b/targets/emulation/qemu-x86/Config-abuild.lb @@ -2,17 +2,17 @@ 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 "fallback" - option USE_FALLBACK_IMAGE=1 + option CONFIG_USE_FALLBACK_IMAGE=1 option COREBOOT_EXTRA_VERSION=".0" payload __PAYLOAD__ end -buildrom ./coreboot.rom ROM_SIZE "fallback" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback" diff --git a/targets/emulation/qemu-x86/Config-car.lb b/targets/emulation/qemu-x86/Config-car.lb index bdb27bc9cd..00b2200b2e 100644 --- a/targets/emulation/qemu-x86/Config-car.lb +++ b/targets/emulation/qemu-x86/Config-car.lb @@ -3,24 +3,24 @@ target qemu-x86-car mainboard emulation/qemu-x86 -option USE_DCACHE_RAM=1 +option CONFIG_USE_DCACHE_RAM=1 option CONFIG_USE_INIT=1 -option ROM_SIZE=512*1024 +option CONFIG_ROM_SIZE=512*1024 option CONFIG_USE_INIT=1 option CONFIG_USE_PRINTK_IN_CAR=1 option CC="gcc -m32" -option HAVE_PIRQ_TABLE=1 -option IRQ_SLOT_COUNT=6 +option CONFIG_HAVE_PIRQ_TABLE=1 +option CONFIG_IRQ_SLOT_COUNT=6 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="-GRUB2" # payload /home/stepan/core.img payload ../payload.elf end -buildrom ./coreboot.rom ROM_SIZE "fallback" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback" diff --git a/targets/emulation/qemu-x86/Config-lab.lb b/targets/emulation/qemu-x86/Config-lab.lb index 970b95295d..2e38aa1fd1 100644 --- a/targets/emulation/qemu-x86/Config-lab.lb +++ b/targets/emulation/qemu-x86/Config-lab.lb @@ -3,19 +3,19 @@ target qemu-x86 mainboard emulation/qemu-x86 -option ROM_SIZE=2048*1024 +option CONFIG_ROM_SIZE=2048*1024 option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 option CONFIG_PRECOMPRESSED_PAYLOAD=1 option CC="gcc -m32" -option HAVE_PIRQ_TABLE=1 -option IRQ_SLOT_COUNT=6 +option CONFIG_HAVE_PIRQ_TABLE=1 +option CONFIG_IRQ_SLOT_COUNT=6 romimage "image" option COREBOOT_EXTRA_VERSION="-LAB" payload ../payload.elf.lzma end -buildrom ./coreboot.rom ROM_SIZE "image" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "image" diff --git a/targets/emulation/qemu-x86/Config.OLPC.lb b/targets/emulation/qemu-x86/Config.OLPC.lb index 93c4fb3557..6f5b2abe4c 100644 --- a/targets/emulation/qemu-x86/Config.OLPC.lb +++ b/targets/emulation/qemu-x86/Config.OLPC.lb @@ -3,19 +3,19 @@ target qemu-x86-OLPC mainboard emulation/qemu-x86 -option ROM_SIZE=1024*1024 - (128 * 1024) +option CONFIG_ROM_SIZE=1024*1024 - (128 * 1024) option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 option CONFIG_PRECOMPRESSED_PAYLOAD=0 option CC="gcc -m32" -option HAVE_PIRQ_TABLE=1 -option IRQ_SLOT_COUNT=6 +option CONFIG_HAVE_PIRQ_TABLE=1 +option CONFIG_IRQ_SLOT_COUNT=6 romimage "image" option COREBOOT_EXTRA_VERSION="-OpenBIOS" payload /tmp/olpcpayload.elf end -buildrom ./coreboot.rom ROM_SIZE "image" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "image" diff --git a/targets/emulation/qemu-x86/Config.lb b/targets/emulation/qemu-x86/Config.lb index 91d4413725..659da67358 100644 --- a/targets/emulation/qemu-x86/Config.lb +++ b/targets/emulation/qemu-x86/Config.lb @@ -3,14 +3,14 @@ target qemu-x86 mainboard emulation/qemu-x86 -option ROM_SIZE=512*1024 +option CONFIG_ROM_SIZE=512*1024 option CC="gcc -m32" -option HAVE_PIRQ_TABLE=1 -option IRQ_SLOT_COUNT=6 -option DEFAULT_CONSOLE_LOGLEVEL=9 -option MAXIMUM_CONSOLE_LOGLEVEL=9 +option CONFIG_HAVE_PIRQ_TABLE=1 +option CONFIG_IRQ_SLOT_COUNT=6 +option CONFIG_DEFAULT_CONSOLE_LOGLEVEL=9 +option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=9 romimage "normal" option COREBOOT_EXTRA_VERSION="-GRUB2" @@ -18,5 +18,5 @@ romimage "normal" payload ../payload.elf end -buildrom ./coreboot.rom ROM_SIZE "normal" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" -- cgit v1.2.3