diff options
| author | Nico Huber <nico.h@gmx.de> | 2017-05-20 16:46:01 +0200 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-06-04 18:47:19 +0200 |
| commit | 6d8266b91d7c8338350f7f8b81c21d10c97aceb6 (patch) | |
| tree | 9b10087e4cd90b56fbe1474c46958b2e3286b30d /src/lib | |
| parent | 49d99fcebc7c3860def51812c2f723ad3e8a4ea3 (diff) | |
Kconfig: Add choice of framebuffer mode
Rename `FRAMEBUFFER_KEEP_VESA_MODE` to `LINEAR_FRAMEBUFFER` and put
it together with new `VGA_TEXT_FRAMEBUFFER` into a choice. There are
two versions of `LINEAR_FRAMEBUFFER` that differ only in the prompt
and help text (one for `HAVE_VBE_LINEAR_FRAMEBUFFER` and one for
`HAVE_LINEAR_FRAMEBUFFER`). Due to `kconfig_lint` we have to model
that with additional symbols.
Change-Id: I9144351491a14d9bb5e650c14933b646bc83fab0
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/19804
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/fallback_boot.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/fallback_boot.c b/src/lib/fallback_boot.c index 1c1255776b..443f209b1d 100644 --- a/src/lib/fallback_boot.c +++ b/src/lib/fallback_boot.c @@ -6,11 +6,13 @@ void __attribute__((weak)) set_boot_successful(void) { } void boot_successful(void) { -#if CONFIG_FRAMEBUFFER_SET_VESA_MODE && !CONFIG_FRAMEBUFFER_KEEP_VESA_MODE - void vbe_textmode_console(void); + if (IS_ENABLED(CONFIG_FRAMEBUFFER_SET_VESA_MODE) && + IS_ENABLED(CONFIG_VGA_TEXT_FRAMEBUFFER)) { + void vbe_textmode_console(void); + + vbe_textmode_console(); + } - vbe_textmode_console(); -#endif /* Remember this was a successful boot */ set_boot_successful(); |