diff options
| author | Michael Brown | 2015-10-16 17:14:29 +0200 |
|---|---|---|
| committer | Michael Brown | 2015-10-16 17:38:39 +0200 |
| commit | 4b7443d132d4d889618588d78ed111099f16c6f9 (patch) | |
| tree | 3dcb7c124669dac9582692ec9ac8534235b3424c /src/arch/i386 | |
| parent | [console] Tidy up config/console.h (diff) | |
| download | ipxe-4b7443d132d4d889618588d78ed111099f16c6f9.tar.gz ipxe-4b7443d132d4d889618588d78ed111099f16c6f9.tar.xz ipxe-4b7443d132d4d889618588d78ed111099f16c6f9.zip | |
[build] Generalise CONSOLE_VESAFB to CONSOLE_FRAMEBUFFER
The name "vesafb" is intrinsically specific to a BIOS environment.
Generalise the build configuration option CONSOLE_VESAFB to
CONSOLE_FRAMEBUFFER, in preparation for adding EFI framebuffer
support.
Existing configurations using CONSOLE_VESAFB will continue to work.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/interface/pcbios/vesafb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/arch/i386/interface/pcbios/vesafb.c b/src/arch/i386/interface/pcbios/vesafb.c index 6d2c1bca..50e48585 100644 --- a/src/arch/i386/interface/pcbios/vesafb.c +++ b/src/arch/i386/interface/pcbios/vesafb.c @@ -60,7 +60,13 @@ struct console_driver bios_console __attribute__ (( weak )); #define EIO_VBE( code ) \ EUNIQ ( EINFO_EIO, (code), EIO_FAILED, EIO_HARDWARE, EIO_MODE ) -/* Set default console usage if applicable */ +/* Set default console usage if applicable + * + * We accept either CONSOLE_FRAMEBUFFER or CONSOLE_VESAFB. + */ +#if ( defined ( CONSOLE_FRAMEBUFFER ) && ! defined ( CONSOLE_VESAFB ) ) +#define CONSOLE_VESAFB CONSOLE_FRAMEBUFFER +#endif #if ! ( defined ( CONSOLE_VESAFB ) && CONSOLE_EXPLICIT ( CONSOLE_VESAFB ) ) #undef CONSOLE_VESAFB #define CONSOLE_VESAFB ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_LOG ) |