diff options
| author | Michael Brown <mcb30@etherboot.org> | 2008-10-12 02:30:31 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2008-10-12 02:30:31 +0100 |
| commit | 8c7deba349e06e9d86133ce570650ffa3212f3f1 (patch) | |
| tree | 7d653d9d52f64f6ebe97320e16d504cc78ed6a5e | |
| parent | aef6d0df5cf4e4c917e44d6b145802fa206da246 (diff) | |
| download | ipxe-8c7deba349e06e9d86133ce570650ffa3212f3f1.tar.gz | |
[config] Split console configuration out to config/console.h
| -rw-r--r-- | src/config/console.h | 21 | ||||
| -rw-r--r-- | src/config/defaults/pcbios.h | 2 | ||||
| -rw-r--r-- | src/config/general.h | 14 | ||||
| -rw-r--r-- | src/core/config.c | 15 |
4 files changed, 26 insertions, 26 deletions
diff --git a/src/config/console.h b/src/config/console.h new file mode 100644 index 000000000..b4ea1dda6 --- /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 f1a48bcac..193871f16 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 d47b76771..ea09761ea 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -8,20 +8,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 b5624fae7..81e65ad46 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 |