GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload/corebootfb: Add option to center a 80x25 console 

This makes payloads which are hardcoded to a 80x25 console look much
better, e.g. FILO with its "GRUB" user interface.

Change-Id: I9f4752328d85d148cd40a0c2337c7191e1d6a586
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38538
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Nico Huber 2020-01-23 13:23:09 +01:00 committed by Patrick Georgi
parent e612418221
commit de74842049
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
payloads/libpayload/Kconfig
View File

@ -315,6 +315,13 @@ config COREBOOT_VIDEO_CONSOLE
Say Y here if coreboot switched to a graphics mode and Say Y here if coreboot switched to a graphics mode and
your payload wants to use it. your payload wants to use it.
config COREBOOT_VIDEO_CENTERED
bool "Center a classic 80x25 console on bigger screens"
depends on COREBOOT_VIDEO_CONSOLE
help
Say 'y' here if your payload is hardcoded to a 80x25 console. Otherwise
its output would look squeezed into the upper-left corner of the screen.
config FONT_SCALE_FACTOR config FONT_SCALE_FACTOR
int "Scale factor for the included font" int "Scale factor for the included font"
depends on GEODELX_VIDEO_CONSOLE || COREBOOT_VIDEO_CONSOLE depends on GEODELX_VIDEO_CONSOLE || COREBOOT_VIDEO_CONSOLE

19
payloads/libpayload/drivers/video/corebootfb.c
View File

@ -236,8 +236,16 @@ static int corebootfb_init(void)
font_init(FI->x_resolution); font_init(FI->x_resolution);
/* Draw centered on the framebuffer if requested and feasible, */
const int center =
IS_ENABLED(CONFIG_LP_COREBOOT_VIDEO_CENTERED)
&& coreboot_video_console.columns * font_width <= FI->x_resolution
&& coreboot_video_console.rows * font_height <= FI->y_resolution;
/* adapt to the framebuffer size, otherwise. */
if (!center) {
coreboot_video_console.columns = FI->x_resolution / font_width; coreboot_video_console.columns = FI->x_resolution / font_width;
coreboot_video_console.rows = FI->y_resolution / font_height; coreboot_video_console.rows = FI->y_resolution / font_height;
}
chars = malloc(coreboot_video_console.rows * chars = malloc(coreboot_video_console.rows *
coreboot_video_console.columns * 2); coreboot_video_console.columns * 2);
@ -246,6 +254,17 @@ static int corebootfb_init(void)
// clear boot splash screen if there is one. // clear boot splash screen if there is one.
corebootfb_clear(); corebootfb_clear();
if (center) {
FI->physical_address +=
(FI->x_resolution - coreboot_video_console.columns * font_width)
/ 2 * FI->bits_per_pixel / 8
+ (FI->y_resolution - coreboot_video_console.rows * font_height)
/ 2 * FI->bytes_per_line;
FI->x_resolution = coreboot_video_console.columns * font_width;
FI->y_resolution = coreboot_video_console.rows * font_height;
}
return 0; return 0;
} }