commit ec0ee64da7aa7e569da7d55ef86804d9b7fbea1b
author Myles Watson <mylesgw@gmail.com> Mon Oct 19 16:21:30 2009 +0000
committer Myles Watson <mylesgw@gmail.com> Mon Oct 19 16:21:30 2009 +0000
tree b90a7f3399c77007c9fc80bc9ff475dd3ff65dad
parent a29ad5cb09c1fd983bbace35185148630c62de5d

Clean up some #ifdef CONFIG_*
Change HAVE_FAN_CTL to be specific to the SuperIO that supports it.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4809 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

src/arch/i386/boot/coreboot_table.c

diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c
index 9aeb85c..9eb13b7 100644
--- a/src/arch/i386/boot/coreboot_table.c
+++ b/src/arch/i386/boot/coreboot_table.c
@@ -99,7 +99,7 @@
 
 static struct lb_serial *lb_serial(struct lb_header *header)
 {
-#if defined(CONFIG_TTYS0_BASE)
+#if CONFIG_CONSOLE_SERIAL8250
 	struct lb_record *rec;
 	struct lb_serial *serial;
 	rec = lb_new_record(header);
@@ -126,22 +126,22 @@
 
 static void lb_console(struct lb_header *header)
 {
-#ifdef CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_CONSOLE_SERIAL8250
 	add_console(header, LB_TAG_CONSOLE_SERIAL8250);
 #endif
-#ifdef CONFIG_CONSOLE_VGA
+#if CONFIG_CONSOLE_VGA
 	add_console(header, LB_TAG_CONSOLE_VGA);
 #endif
-#ifdef CONFIG_CONSOLE_BTEXT
+#if CONFIG_CONSOLE_BTEXT
 	add_console(header, LB_TAG_CONSOLE_BTEXT);
 #endif
-#ifdef CONFIG_CONSOLE_LOGBUF
+#if CONFIG_CONSOLE_LOGBUF
 	add_console(header, LB_TAG_CONSOLE_LOGBUF);
 #endif
-#ifdef CONFIG_CONSOLE_SROM
+#if CONFIG_CONSOLE_SROM
 	add_console(header, LB_TAG_CONSOLE_SROM);
 #endif
-#ifdef CONFIG_USBDEBUG_DIRECT
+#if CONFIG_USBDEBUG_DIRECT
 	add_console(header, LB_TAG_CONSOLE_EHCI);
 #endif
 }