summaryrefslogtreecommitdiff
path: root/src/arch/i386/boot
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2009-10-19 16:21:30 +0000
committerMyles Watson <mylesgw@gmail.com>2009-10-19 16:21:30 +0000
commitec0ee64da7aa7e569da7d55ef86804d9b7fbea1b (patch)
treeb90a7f3399c77007c9fc80bc9ff475dd3ff65dad /src/arch/i386/boot
parenta29ad5cb09c1fd983bbace35185148630c62de5d (diff)
downloadcoreboot-ec0ee64da7aa7e569da7d55ef86804d9b7fbea1b.tar.xz
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
Diffstat (limited to 'src/arch/i386/boot')
-rw-r--r--src/arch/i386/boot/coreboot_table.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c
index 9aeb85cd98..9eb13b73f1 100644
--- a/src/arch/i386/boot/coreboot_table.c
+++ b/src/arch/i386/boot/coreboot_table.c
@@ -99,7 +99,7 @@ static struct lb_memory *lb_memory(struct lb_header *header)
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 add_console(struct lb_header *header, u16 consoletype)
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
}