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/nvidia/l1_2pvv/Config-abuild.lb | 26 +++++++++--------- targets/nvidia/l1_2pvv/Config.lb | 48 ++++++++++++++++----------------- targets/nvidia/l1_2pvv/Config.lb.kernel | 30 ++++++++++----------- 3 files changed, 52 insertions(+), 52 deletions(-) (limited to 'targets/nvidia') diff --git a/targets/nvidia/l1_2pvv/Config-abuild.lb b/targets/nvidia/l1_2pvv/Config-abuild.lb index 88dd1684e3..b1c927705b 100644 --- a/targets/nvidia/l1_2pvv/Config-abuild.lb +++ b/targets/nvidia/l1_2pvv/Config-abuild.lb @@ -4,33 +4,33 @@ 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=0x20000 + option CONFIG_USE_FAILOVER_IMAGE=0 + option CONFIG_USE_FALLBACK_IMAGE=0 + option CONFIG_ROM_IMAGE_SIZE=0x20000 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 CONFIG_USE_FAILOVER_IMAGE=0 + option CONFIG_USE_FALLBACK_IMAGE=1 + option CONFIG_ROM_IMAGE_SIZE=0x20000 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 end -buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover" diff --git a/targets/nvidia/l1_2pvv/Config.lb b/targets/nvidia/l1_2pvv/Config.lb index c6d546ed83..87171a7449 100644 --- a/targets/nvidia/l1_2pvv/Config.lb +++ b/targets/nvidia/l1_2pvv/Config.lb @@ -29,20 +29,20 @@ mainboard nvidia/l1_2pvv # serengeti_leopard romimage "normal" # 48K for SCSI FW -# option ROM_SIZE = 475136 +# option CONFIG_ROM_SIZE = 475136 # 48K for SCSI FW and 48K for ATI ROM -# option ROM_SIZE = 425984 +# option CONFIG_ROM_SIZE = 425984 # 64K for Etherboot -# option ROM_SIZE = 458752 +# option CONFIG_ROM_SIZE = 458752 # 44k for atixx.rom -# option ROM_SIZE = 479232 - option USE_FAILOVER_IMAGE=0 - option USE_FALLBACK_IMAGE=0 -# option ROM_IMAGE_SIZE=0x13800 -# option ROM_IMAGE_SIZE=0x18800 - option ROM_IMAGE_SIZE=0x20000 -# option ROM_IMAGE_SIZE=0x15800 - option XIP_ROM_SIZE=0x40000 +# option CONFIG_ROM_SIZE = 479232 + option CONFIG_USE_FAILOVER_IMAGE=0 + option CONFIG_USE_FALLBACK_IMAGE=0 +# option CONFIG_ROM_IMAGE_SIZE=0x13800 +# option CONFIG_ROM_IMAGE_SIZE=0x18800 + option CONFIG_ROM_IMAGE_SIZE=0x20000 +# option CONFIG_ROM_IMAGE_SIZE=0x15800 + option CONFIG_XIP_ROM_SIZE=0x40000 option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" # payload ../../../payloads/tg3--ide_disk.zelf # payload ../../../payloads/filo.elf @@ -64,13 +64,13 @@ romimage "normal" end romimage "fallback" - option USE_FAILOVER_IMAGE=0 - option USE_FALLBACK_IMAGE=1 -# option ROM_IMAGE_SIZE=0x13800 -# option ROM_IMAGE_SIZE=0x19800 - option ROM_IMAGE_SIZE=0x20000 -# option ROM_IMAGE_SIZE=0x15800 - option XIP_ROM_SIZE=0x40000 + option CONFIG_USE_FAILOVER_IMAGE=0 + option CONFIG_USE_FALLBACK_IMAGE=1 +# option CONFIG_ROM_IMAGE_SIZE=0x13800 +# option CONFIG_ROM_IMAGE_SIZE=0x19800 + option CONFIG_ROM_IMAGE_SIZE=0x20000 +# option CONFIG_ROM_IMAGE_SIZE=0x15800 + option CONFIG_XIP_ROM_SIZE=0x40000 option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" # payload ../../../payloads/tg3--ide_disk.zelf # payload ../../../payloads/filo.elf @@ -97,12 +97,12 @@ romimage "fallback" 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" diff --git a/targets/nvidia/l1_2pvv/Config.lb.kernel b/targets/nvidia/l1_2pvv/Config.lb.kernel index a0a16cf53e..70e95e4230 100644 --- a/targets/nvidia/l1_2pvv/Config.lb.kernel +++ b/targets/nvidia/l1_2pvv/Config.lb.kernel @@ -26,19 +26,19 @@ target l1_2pvv mainboard nvidia/l1_2pvv -option ROM_SIZE=0x200000 -option FALLBACK_SIZE=(ROM_SIZE-0x1000) +option CONFIG_ROM_SIZE=0x200000 +option CONFIG_FALLBACK_SIZE=(CONFIG_ROM_SIZE-0x1000) romimage "fallback" - option USE_FAILOVER_IMAGE=0 - option USE_FALLBACK_IMAGE=1 + option CONFIG_USE_FAILOVER_IMAGE=0 + option CONFIG_USE_FALLBACK_IMAGE=1 option CONFIG_COMPRESSED_PAYLOAD_LZMA=1 option CONFIG_PRECOMPRESSED_PAYLOAD=1 -# option ROM_IMAGE_SIZE=0x19800 - option ROM_IMAGE_SIZE=0x17000 -# option ROM_IMAGE_SIZE=0x15800 -# option ROM_IMAGE_SIZE=0x13800 - option XIP_ROM_SIZE=0x40000 +# option CONFIG_ROM_IMAGE_SIZE=0x19800 + option CONFIG_ROM_IMAGE_SIZE=0x17000 +# option CONFIG_ROM_IMAGE_SIZE=0x15800 +# option CONFIG_ROM_IMAGE_SIZE=0x13800 + option CONFIG_XIP_ROM_SIZE=0x40000 option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" # payload ../../../payloads/tg3--ide_disk.zelf # payload ../../../payloads/filo.elf @@ -67,13 +67,13 @@ romimage "fallback" 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 "fallback" "failover" -#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback" "failover" +#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" -- cgit v1.2.3