summaryrefslogtreecommitdiffstats
path: root/src/core/config.c
diff options
context:
space:
mode:
authorMichael Brown2008-10-12 03:30:31 +0200
committerMichael Brown2008-10-12 03:30:31 +0200
commit8c7deba349e06e9d86133ce570650ffa3212f3f1 (patch)
tree7d653d9d52f64f6ebe97320e16d504cc78ed6a5e /src/core/config.c
parent[ioapi] Absorb virt_to_phys() and phys_to_virt() into the I/O API (diff)
downloadipxe-8c7deba349e06e9d86133ce570650ffa3212f3f1.tar.gz
ipxe-8c7deba349e06e9d86133ce570650ffa3212f3f1.tar.xz
ipxe-8c7deba349e06e9d86133ce570650ffa3212f3f1.zip
[config] Split console configuration out to config/console.h
Diffstat (limited to 'src/core/config.c')
-rw-r--r--src/core/config.c15
1 files changed, 3 insertions, 12 deletions
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