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/thomson/ip1000/Config-abuild.lb | 8 ++++---- targets/thomson/ip1000/Config.lb | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'targets/thomson') diff --git a/targets/thomson/ip1000/Config-abuild.lb b/targets/thomson/ip1000/Config-abuild.lb index 02175bc26b..bdacc46478 100644 --- a/targets/thomson/ip1000/Config-abuild.lb +++ b/targets/thomson/ip1000/Config-abuild.lb @@ -22,16 +22,16 @@ 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 payload __PAYLOAD__ end -buildrom ./coreboot.rom ROM_SIZE "fallback" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback" diff --git a/targets/thomson/ip1000/Config.lb b/targets/thomson/ip1000/Config.lb index 44aa77a475..b3d2c3baf8 100644 --- a/targets/thomson/ip1000/Config.lb +++ b/targets/thomson/ip1000/Config.lb @@ -25,9 +25,9 @@ mainboard thomson/ip1000 ## Total number of bytes allocated for coreboot use ## (fallback images and payloads). ## -# option ROM_SIZE = 1024 * 1024 +# option CONFIG_ROM_SIZE = 1024 * 1024 ## For VGA BIOS (-64k) -option ROM_SIZE = (1024 * 1024) - (64 * 1024) +option CONFIG_ROM_SIZE = (1024 * 1024) - (64 * 1024) ## ## VGA Console @@ -51,14 +51,14 @@ option CONFIG_VIDEO_MB = 8 ## ## Request this level of debugging output ## -option DEFAULT_CONSOLE_LOGLEVEL = 7 +option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 7 romimage "fallback" - option USE_FALLBACK_IMAGE = 1 - option FALLBACK_SIZE = ROM_SIZE + option CONFIG_USE_FALLBACK_IMAGE = 1 + option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE option COREBOOT_EXTRA_VERSION = "_IP1000" payload /tmp/filo.elf # payload /tmp/eb-5.4.3-eepro100.elf end -buildrom ./coreboot.rom ROM_SIZE "fallback" +buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback" -- cgit v1.2.3