From 6d8266b91d7c8338350f7f8b81c21d10c97aceb6 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 20 May 2017 16:46:01 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/19804 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/lib/fallback_boot.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/lib/fallback_boot.c') 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(); -- cgit v1.2.3