From 0867062412dd4bfe5a556e5f3fd85ba5b682d79b Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stepan@coresystems.de>
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 <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/boot/filo.c         | 22 +++++++++++-----------
 src/boot/hardwaremain.c |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/boot')

diff --git a/src/boot/filo.c b/src/boot/filo.c
index cd14fa13b3..d6ee9305e9 100644
--- a/src/boot/filo.c
+++ b/src/boot/filo.c
@@ -14,11 +14,11 @@
 #define ENTER '\r'
 #define ESCAPE '\x1b'
 
-#ifndef AUTOBOOT_CMDLINE
+#ifndef CONFIG_AUTOBOOT_CMDLINE
 #define autoboot(mem)
 #endif
 
-#if !AUTOBOOT_DELAY
+#if !CONFIG_AUTOBOOT_DELAY
 #define autoboot_delay() 0 /* success */
 #endif
 
@@ -115,8 +115,8 @@ static void boot(struct lb_memory *mem, const char *line)
     free(boot_file);
 }
 
-#ifdef AUTOBOOT_CMDLINE
-#if AUTOBOOT_DELAY
+#ifdef CONFIG_AUTOBOOT_CMDLINE
+#if CONFIG_AUTOBOOT_DELAY
 static inline int autoboot_delay(void)
 {
     unsigned int timeout;
@@ -126,7 +126,7 @@ static inline int autoboot_delay(void)
     key = 0;
 
     printk_info("Press <Enter> for default boot, or <Esc> for boot prompt... ");
-    for (sec = AUTOBOOT_DELAY; sec>0 && key==0; sec--) {
+    for (sec = CONFIG_AUTOBOOT_DELAY; sec>0 && key==0; sec--) {
 	printk_info("%d", sec);
 	timeout = 10;
 	while (timeout-- > 0) {
@@ -151,7 +151,7 @@ static inline int autoboot_delay(void)
 	    return 0; /* default accepted */
     }
 }
-#endif /* AUTOBOOT_DELAY */
+#endif /* CONFIG_AUTOBOOT_DELAY */
 
 static void autoboot(struct lb_memory *mem)
 {
@@ -160,11 +160,11 @@ static void autoboot(struct lb_memory *mem)
 	return;
 
     if (autoboot_delay()==0) {
-	printk_info("boot: %s\n", AUTOBOOT_CMDLINE);
-	boot(mem, AUTOBOOT_CMDLINE);
+	printk_info("boot: %s\n", CONFIG_AUTOBOOT_CMDLINE);
+	boot(mem, CONFIG_AUTOBOOT_CMDLINE);
     }
 }
-#endif /* AUTOBOOT_CMDLINE */
+#endif /* CONFIG_AUTOBOOT_CMDLINE */
 
 /* The main routine */
 int filo(struct lb_memory *mem)
@@ -179,8 +179,8 @@ int filo(struct lb_memory *mem)
     /* The above didn't work, ask user */
     while (havechar())
 	getchar();
-#ifdef AUTOBOOT_CMDLINE
-    strncpy(line, AUTOBOOT_CMDLINE, sizeof(line)-1);
+#ifdef CONFIG_AUTOBOOT_CMDLINE
+    strncpy(line, CONFIG_AUTOBOOT_CMDLINE, sizeof(line)-1);
     line[sizeof(line)-1] = '\0';
 #else
     line[0] = '\0';
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index 2419dc2134..058be24ebc 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -37,7 +37,7 @@ it with the version available from LANL.
 #include <boot/tables.h>
 #include <boot/elf.h>
 #include <cbfs.h>
-#if HAVE_ACPI_RESUME
+#if CONFIG_HAVE_ACPI_RESUME
 #include <arch/acpi.h>
 #endif
 
@@ -88,7 +88,7 @@ void hardwaremain(int boot_complete)
 	dev_initialize();
 	post_code(0x89);
 
-#if HAVE_ACPI_RESUME == 1
+#if CONFIG_HAVE_ACPI_RESUME == 1
 	suspend_resume();
 	post_code(0x8a);
 #endif
@@ -98,7 +98,7 @@ void hardwaremain(int boot_complete)
 	 */
 	lb_mem = write_tables();
 #if CONFIG_CBFS == 1
-# if USE_FALLBACK_IMAGE == 1
+# if CONFIG_USE_FALLBACK_IMAGE == 1
 	cbfs_load_payload(lb_mem, "fallback/payload");
 # else
 	cbfs_load_payload(lb_mem, "normal/payload");
-- 
cgit v1.2.3