coreboot: Switch to a monospaced font

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>

diff --git a/configs/coreboot64_defconfig b/configs/coreboot64_defconfig
index da42ad0a20a0c2224f3ef649c6c698d6586f4087..553f1dc83f040bd8f6c30b75fd512b28ab0d60a8 100644 (file)
--- a/configs/coreboot64_defconfig
+++ b/configs/coreboot64_defconfig
@@ -61,6 +61,9 @@ CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_VIDEO_COPY=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_SPL_ACPI=y
 CONFIG_CMD_DHRYSTONE=y

diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig
index 0b103efe16dbf147ccf38d84a013f05b76673e67..e68a3aed659741c996ed088d3b8145104c6e3e19 100644 (file)
--- a/configs/coreboot_defconfig
+++ b/configs/coreboot_defconfig
@@ -55,6 +55,9 @@ CONFIG_SOUND=y
 CONFIG_SOUND_I8254=y
 CONFIG_VIDEO_COPY=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_CMD_DHRYSTONE=y
 # CONFIG_GZIP is not set

diff --git a/test/cmd/font.c b/test/cmd/font.c
index 2aea7b68c47dd5f1f6a797ff70485bc6976b74cc..3335dd65bea8f21f4a6c26e7afba0649b137459e 100644 (file)
--- a/test/cmd/font.c
+++ b/test/cmd/font.c
@@ -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(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))
                ut_assert_nextline("cantoraone_regular");
        ut_assert_console_end();
 
        ut_assertok(vidconsole_get_font_size(dev, &name, &size));
-       ut_asserteq_str("nimbus_sans_l_regular", name);
-       ut_asserteq(18, size);
+       if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_ANKACODER))
+               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))
                return 0;