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/tyan/s4880/Config.lb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'targets/tyan/s4880') diff --git a/targets/tyan/s4880/Config.lb b/targets/tyan/s4880/Config.lb index abb9912713..6b98702f49 100644 --- a/targets/tyan/s4880/Config.lb +++ b/targets/tyan/s4880/Config.lb @@ -8,16 +8,16 @@ mainboard tyan/s4880 # Tyan s4880 romimage "normal" # 48K for SCSI FW or ATI ROM - option ROM_SIZE = 512*1024-48*1024 + option CONFIG_ROM_SIZE = 512*1024-48*1024 # 48K for SCSI FW and 48K for ATI ROM -# option ROM_SIZE = 512*1024-48*1024-48*1024 +# option CONFIG_ROM_SIZE = 512*1024-48*1024-48*1024 # 64K for Etherboot -# option ROM_SIZE = 512*1024-64*1024 - option USE_FALLBACK_IMAGE=0 -# option ROM_IMAGE_SIZE=0x19000 -# option ROM_IMAGE_SIZE=0x19c00 - option ROM_IMAGE_SIZE=0x20000 - option XIP_ROM_SIZE=0x20000 +# option CONFIG_ROM_SIZE = 512*1024-64*1024 + option CONFIG_USE_FALLBACK_IMAGE=0 +# option CONFIG_ROM_IMAGE_SIZE=0x19000 +# option CONFIG_ROM_IMAGE_SIZE=0x19c00 + option CONFIG_ROM_IMAGE_SIZE=0x20000 + option CONFIG_XIP_ROM_SIZE=0x20000 option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal" # payload ../../../payloads/tg3--ide_disk.zelf # payload ../../../payloads/filo.elf @@ -32,11 +32,11 @@ romimage "normal" end romimage "fallback" - option USE_FALLBACK_IMAGE=1 -# option ROM_IMAGE_SIZE=0x19000 -# option ROM_IMAGE_SIZE=0x19c00 - option ROM_IMAGE_SIZE=0x20000 - option XIP_ROM_SIZE=0x20000 + option CONFIG_USE_FALLBACK_IMAGE=1 +# option CONFIG_ROM_IMAGE_SIZE=0x19000 +# option CONFIG_ROM_IMAGE_SIZE=0x19c00 + option CONFIG_ROM_IMAGE_SIZE=0x20000 + option CONFIG_XIP_ROM_SIZE=0x20000 option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback" # payload ../../../payloads/tg3--ide_disk.zelf # payload ../../../payloads/filo.elf @@ -50,4 +50,4 @@ romimage "fallback" # payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf end -buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" -- cgit v1.2.3