commit 0867062412dd4bfe5a556e5f3fd85ba5b682d79b
author Stefan Reinauer <stepan@coresystems.de> Tue Jun 30 15:17:49 2009 +0000
committer Stefan Reinauer <stepan@openbios.org> Tue Jun 30 15:17:49 2009 +0000
tree 81ca5db12b8567b48daaa23a541bfb8a5dc011f8
parent 9702b6bf7ec5a4fb16934f1cf2724480e2460c89

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

src/lib/fallback_boot.c

diff --git a/src/lib/fallback_boot.c b/src/lib/fallback_boot.c
index 9e892dd..59476fd 100644
--- a/src/lib/fallback_boot.c
+++ b/src/lib/fallback_boot.c
@@ -5,7 +5,7 @@
 #include <arch/io.h>
 
 
-#if HAVE_FALLBACK_BOOT == 1
+#if CONFIG_HAVE_FALLBACK_BOOT == 1
 void set_boot_successful(void)
 {
 	/* Remember I succesfully booted by setting

src/lib/uart8250.c

diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c
index b9abc9e..79eb1c5 100644
--- a/src/lib/uart8250.c
+++ b/src/lib/uart8250.c
@@ -80,7 +80,7 @@
 	int lcs;
 	divisor = 115200/(uart->baud ? uart->baud: 1);
 	lcs = 3;
-	if (base_port == TTYS0_BASE) {
+	if (base_port == CONFIG_TTYS0_BASE) {
 		/* Don't reinitialize the console serial port,
 		 * This is espeically nasty in SMP.
 		 */

src/lib/version.c

diff --git a/src/lib/version.c b/src/lib/version.c
index 404f50d..2c84c4a 100644
--- a/src/lib/version.c
+++ b/src/lib/version.c
@@ -1,10 +1,10 @@
 #include <version.h>
 
-#ifndef MAINBOARD_VENDOR
-#error MAINBOARD_VENDOR not defined
+#ifndef CONFIG_MAINBOARD_VENDOR
+#error CONFIG_MAINBOARD_VENDOR not defined
 #endif
-#ifndef MAINBOARD_PART_NUMBER
-#error  MAINBOARD_PART_NUMBER not defined
+#ifndef CONFIG_MAINBOARD_PART_NUMBER
+#error  CONFIG_MAINBOARD_PART_NUMBER not defined
 #endif
 
 #ifndef COREBOOT_VERSION
@@ -39,8 +39,8 @@
 #define COREBOOT_EXTRA_VERSION ""
 #endif
 
-const char mainboard_vendor[] = MAINBOARD_VENDOR;
-const char mainboard_part_number[] = MAINBOARD_PART_NUMBER;
+const char mainboard_vendor[] = CONFIG_MAINBOARD_VENDOR;
+const char mainboard_part_number[] = CONFIG_MAINBOARD_PART_NUMBER;
 
 const char coreboot_version[] = COREBOOT_VERSION;
 const char coreboot_extra_version[] = COREBOOT_EXTRA_VERSION;

src/lib/xmodem.c

diff --git a/src/lib/xmodem.c b/src/lib/xmodem.c
index aca6e49..8321151 100644
--- a/src/lib/xmodem.c
+++ b/src/lib/xmodem.c
@@ -26,17 +26,17 @@
 
 static int _inbyte(int msec)
 {
-	while (!uart8250_can_rx_byte(TTYS0_BASE)) {
+	while (!uart8250_can_rx_byte(CONFIG_TTYS0_BASE)) {
 		udelay(1000);
 		if (msec-- <= 0)
 			return -1;
 	}
-	return uart8250_rx_byte(TTYS0_BASE);
+	return uart8250_rx_byte(CONFIG_TTYS0_BASE);
 }
 
 static void _outbyte(unsigned char c)
 {
-	uart8250_tx_byte(TTYS0_BASE, c);
+	uart8250_tx_byte(CONFIG_TTYS0_BASE, c);
 }
 
 static unsigned short crc16_ccitt(const unsigned char *buf, int sz)