Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 03:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

coreboot: Switch to a monospaced font

Browse source 
The default font is proportional, with different character widths.
Select a monospace font for coreboot so that the 'dm tree' output lines
up correctly.

Update the coreboot tests to match.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2024-01-07 17:14:55 -07:00
parent 112eb85c5a
commit f0feda9082
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configs/coreboot64_defconfig
View file

@ -61,6 +61,9 @@ CONFIG_SOUND=y
CONFIG_SOUND_I8254=y CONFIG_SOUND_I8254=y
CONFIG_VIDEO_COPY=y CONFIG_VIDEO_COPY=y
CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE=y
CONFIG_CONSOLE_TRUETYPE_SIZE=20
# CONFIG_CONSOLE_TRUETYPE_NIMBUS is not set
CONFIG_CONSOLE_TRUETYPE_ANKACODER=y
CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_SPL_ACPI=y CONFIG_SPL_ACPI=y
CONFIG_CMD_DHRYSTONE=y CONFIG_CMD_DHRYSTONE=y

3
configs/coreboot_defconfig
View file

@ -55,6 +55,9 @@ CONFIG_SOUND=y
CONFIG_SOUND_I8254=y CONFIG_SOUND_I8254=y
CONFIG_VIDEO_COPY=y CONFIG_VIDEO_COPY=y
CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE=y
CONFIG_CONSOLE_TRUETYPE_SIZE=20
# CONFIG_CONSOLE_TRUETYPE_NIMBUS is not set
CONFIG_CONSOLE_TRUETYPE_ANKACODER=y
CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_CONSOLE_SCROLL_LINES=5
CONFIG_CMD_DHRYSTONE=y CONFIG_CMD_DHRYSTONE=y
# CONFIG_GZIP is not set # CONFIG_GZIP is not set

12
test/cmd/font.c
View file

@ -27,14 +27,20 @@ static int font_test_base(struct unit_test_state *uts)
ut_assertok(uclass_first_device_err(UCLASS_VIDEO_CONSOLE, &dev)); ut_assertok(uclass_first_device_err(UCLASS_VIDEO_CONSOLE, &dev));
ut_assertok(run_command("font list", 0)); ut_assertok(run_command("font list", 0));
ut_assert_nextline("nimbus_sans_l_regular"); if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_NIMBUS))
ut_assert_nextline("nimbus_sans_l_regular");
if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_ANKACODER))
ut_assert_nextline("ankacoder_c75_r");
if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_CANTORAONE)) if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_CANTORAONE))
ut_assert_nextline("cantoraone_regular"); ut_assert_nextline("cantoraone_regular");
ut_assert_console_end(); ut_assert_console_end();
ut_assertok(vidconsole_get_font_size(dev, &name, &size)); ut_assertok(vidconsole_get_font_size(dev, &name, &size));
ut_asserteq_str("nimbus_sans_l_regular", name); if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_ANKACODER))
ut_asserteq(18, size); ut_asserteq_str("ankacoder_c75_r", name);
else
ut_asserteq_str("nimbus_sans_l_regular", name);
ut_asserteq(CONFIG_CONSOLE_TRUETYPE_SIZE, size);
if (!IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_CANTORAONE)) if (!IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_CANTORAONE))
return 0; return 0;