From 8c7deba349e06e9d86133ce570650ffa3212f3f1 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Sun, 12 Oct 2008 02:30:31 +0100
Subject: [PATCH] [config] Split console configuration out to config/console.h

---
 src/config/console.h         | 21 +++++++++++++++++++++
 src/config/defaults/pcbios.h |  2 ++
 src/config/general.h         | 14 --------------
 src/core/config.c            | 15 +++------------
 4 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 src/config/console.h

diff --git a/src/config/console.h b/src/config/console.h
new file mode 100644
index 00000000..b4ea1dda
--- /dev/null
+++ b/src/config/console.h
@@ -0,0 +1,21 @@
+#ifndef CONFIG_CONSOLE_H
+#define CONFIG_CONSOLE_H
+
+/** @file
+ *
+ * Console configuration
+ *
+ * These options specify the console types that Etherboot will use for
+ * interaction with the user.
+ *
+ */
+
+#include <config/defaults.h>
+
+//#define	CONSOLE_PCBIOS		/* Default BIOS console */
+//#define	CONSOLE_SERIAL		/* Serial port */
+//#define	CONSOLE_DIRECT_VGA	/* Direct access to VGA card */
+//#define	CONSOLE_BTEXT		/* Who knows what this does? */
+//#define	CONSOLE_PC_KBD		/* Direct access to PC keyboard */
+
+#endif /* CONFIG_CONSOLE_H */
diff --git a/src/config/defaults/pcbios.h b/src/config/defaults/pcbios.h
index f1a48bca..193871f1 100644
--- a/src/config/defaults/pcbios.h
+++ b/src/config/defaults/pcbios.h
@@ -9,4 +9,6 @@
 
 #define IOAPI_X86
 
+#define CONSOLE_PCBIOS
+
 #endif /* CONFIG_DEFAULTS_PCBIOS_H */
diff --git a/src/config/general.h b/src/config/general.h
index d47b7677..ea09761e 100644
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -7,20 +7,6 @@
  *
  */
 
-/*
- * Console configuration
- *
- * These options specify the console types that Etherboot will use for
- * interaction with the user.
- *
- */
-
-#define	CONSOLE_FIRMWARE	/* Default BIOS console */
-#undef	CONSOLE_SERIAL		/* Serial port */
-#undef	CONSOLE_DIRECT_VGA	/* Direct access to VGA card */
-#undef	CONSOLE_BTEXT		/* Who knows what this does? */
-#undef	CONSOLE_PC_KBD		/* Direct access to PC keyboard */
-
 /*
  * Timer configuration
  *
diff --git a/src/core/config.c b/src/core/config.c
index b5624fae..81e65ad4 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -5,7 +5,8 @@
  * your option) any later version.
  */
 
-#include "config/general.h"
+#include <config/general.h>
+#include <config/console.h>
 
 /*
  * Build ID string calculations
@@ -38,19 +39,9 @@
 /*
  * Drag in all requested console types
  *
- * CONSOLE_DUAL sets both CONSOLE_FIRMWARE and CONSOLE_SERIAL for
- * legacy compatibility.
- *
  */
 
-#ifdef	CONSOLE_DUAL
-#undef	CONSOLE_FIRMWARE
-#define	CONSOLE_FIRMWARE	1
-#undef	CONSOLE_SERIAL
-#define	CONSOLE_SERIAL		1
-#endif
-
-#ifdef CONSOLE_FIRMWARE
+#ifdef CONSOLE_PCBIOS
 REQUIRE_OBJECT ( bios_console );
 #endif
 #ifdef CONSOLE_SERIAL