Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[config] Split console configuration out to config/console.h
  • Loading branch information
Michael Brown committed Oct 12, 2008
1 parent aef6d0d commit 8c7deba
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
21 changes: 21 additions & 0 deletions 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 */
2 changes: 2 additions & 0 deletions src/config/defaults/pcbios.h
Expand Up @@ -9,4 +9,6 @@

#define IOAPI_X86

#define CONSOLE_PCBIOS

#endif /* CONFIG_DEFAULTS_PCBIOS_H */
14 changes: 0 additions & 14 deletions src/config/general.h
Expand Up @@ -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
*
Expand Down
15 changes: 3 additions & 12 deletions src/core/config.c
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 8c7deba

Please sign in to comment.