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 --- src/stream/rom_stream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/stream/rom_stream.c') diff --git a/src/stream/rom_stream.c b/src/stream/rom_stream.c index c05af2d677..2c8699d2c5 100644 --- a/src/stream/rom_stream.c +++ b/src/stream/rom_stream.c @@ -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)) { -- cgit v1.2.3