]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
video: Add the Cantoraone decorative font
authorSimon Glass <sjg@chromium.org>
Fri, 15 Jan 2016 01:10:46 +0000 (18:10 -0700)
committerAnatolij Gustschin <agust@denx.de>
Sat, 30 Jan 2016 09:56:34 +0000 (10:56 +0100)
This font is a little more ornate than normal. Example uses are on security
screens where a feeling of formality is required.

Signed-off-by: Simon Glass <sjg@chromium.org>
drivers/video/console_truetype.c
drivers/video/fonts/Kconfig
drivers/video/fonts/Makefile
drivers/video/fonts/cantoraone_regular.ttf [new file with mode: 0644]

index 405e0659f01d8cd70a777d7c8bac468df9d62ac2..c249f047f5b21b237a1ac6f2a0ca3b48e08ee89d 100644 (file)
@@ -447,6 +447,7 @@ struct font_info {
 FONT_DECL(nimbus_sans_l_regular);
 FONT_DECL(ankacoder_c75_r);
 FONT_DECL(rufscript010);
+FONT_DECL(cantoraone_regular);
 
 static struct font_info font_table[] = {
 #ifdef CONFIG_CONSOLE_TRUETYPE_NIMBUS
@@ -457,6 +458,9 @@ static struct font_info font_table[] = {
 #endif
 #ifdef CONFIG_CONSOLE_TRUETYPE_RUFSCRIPT
        FONT_ENTRY(rufscript010),
+#endif
+#ifdef CONFIG_CONSOLE_TRUETYPE_CANTORAONE
+       FONT_ENTRY(cantoraone_regular),
 #endif
        {} /* sentinel */
 };
index d3bf7429ac0fec6bd587c2f5ee632d183b5aad1c..3f1398db50cda3458b420e4e5ebd5c4d9484d2ea 100644 (file)
@@ -38,4 +38,14 @@ config CONSOLE_TRUETYPE_RUFSCRIPT
          License: GPL with font exception
          http://www.gnu.org/copyleft/gpl.html
 
+config CONSOLE_TRUETYPE_CANTORAONE
+       bool "Cantoraone"
+       depends on CONSOLE_TRUETYPE
+       help
+         Cantora is a friendly semi formal, semi condensed, semi sans-serif
+         with a hint of handwriting. Perfect for headlines.
+         From https://fontlibrary.org/en/font/cantora
+         License: SIL Open Font Licence
+         http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL
+
 endmenu
index a3f6ea3229c66e93dc7132fb8c04b84a2e5c19fe..46137f4f7e586bddd5ab577c6f51e082ac1cb755 100644 (file)
@@ -8,3 +8,4 @@
 obj-$(CONFIG_CONSOLE_TRUETYPE_NIMBUS) += nimbus_sans_l_regular.o
 obj-$(CONFIG_CONSOLE_TRUETYPE_ANKACODER) += ankacoder_c75_r.o
 obj-$(CONFIG_CONSOLE_TRUETYPE_RUFSCRIPT) += rufscript010.o
+obj-$(CONFIG_CONSOLE_TRUETYPE_CANTORAONE) += cantoraone_regular.o
diff --git a/drivers/video/fonts/cantoraone_regular.ttf b/drivers/video/fonts/cantoraone_regular.ttf
new file mode 100644 (file)
index 0000000..57446a2
Binary files /dev/null and b/drivers/video/fonts/cantoraone_regular.ttf differ