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
This commit is contained in:
Stefan Reinauer 2009-06-30 15:17:49 +00:00 committed by Stefan Reinauer
commit 0867062412
863 changed files with 14663 additions and 14663 deletions

View file

@ -6,8 +6,8 @@
#include <string.h>
#include <pc80/ide.h>
#ifndef IDE_BOOT_DRIVE
#define IDE_BOOT_DRIVE 0
#ifndef CONFIG_IDE_BOOT_DRIVE
#define CONFIG_IDE_BOOT_DRIVE 0
#endif
static unsigned long offset;
@ -27,12 +27,12 @@ int stream_init(void)
#ifdef ONE_TRACK
offset = (ONE_TRACK*512);
#elif defined(IDE_OFFSET)
offset = IDE_OFFSET;
#elif defined(CONFIG_IDE_OFFSET)
offset = CONFIG_IDE_OFFSET;
#else
offset = 0x7e00;
#endif
res = ide_probe(IDE_BOOT_DRIVE);
res = ide_probe(CONFIG_IDE_BOOT_DRIVE);
delay(1);
return res;
}
@ -59,7 +59,7 @@ static byte_offset_t stream_ide_read(void *vdest, byte_offset_t offs, byte_offse
if (block_num != offs / 512 || first_fill) {
block_num = offs / 512;
printk_notice (".");
ide_read(IDE_BOOT_DRIVE, block_num, buffer);
ide_read(CONFIG_IDE_BOOT_DRIVE, block_num, buffer);
first_fill = 0;
}

View file

@ -42,7 +42,7 @@ unsigned long ulzma(unsigned char *src, unsigned char *dst);
/*XXXXXXXXXXXXXX */
unsigned char *rom_start = (unsigned char *)CONFIG_ROM_PAYLOAD_START;
unsigned char *rom_end = (unsigned char *)(CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE - 1);
unsigned char *rom_end = (unsigned char *)(CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE - 1);
/*XXXXXXXXXXXXXX */
static const unsigned char *rom;
@ -76,7 +76,7 @@ int stream_init(void)
dest = &_eheap; /* need a good address on RAM */
#if _RAMBASE<0x00100000
#if CONFIG_RAMBASE<0x00100000
olen = *(unsigned int *)dest;
#if (CONFIG_CONSOLE_VGA==1) || (CONFIG_PCI_ROM_RUN == 1)
if((dest < (unsigned char *)0xa0000) && ((dest+olen)>(unsigned char *)0xa0000)) {