diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-14 18:10:46 -0700 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2016-01-30 10:56:34 +0100 |
| commit | c0603b98d48283f5f7e240c1fe71b291e7c761b1 (patch) | |
| tree | e53b76161dda24e36c96a984f72bb97b99acfb5f | |
| parent | 7ad4e30decfdc5aed3a1a0ac459ad12dd4d0f6ae (diff) | |
| download | talos-obmc-uboot-c0603b98d48283f5f7e240c1fe71b291e7c761b1.tar.gz talos-obmc-uboot-c0603b98d48283f5f7e240c1fe71b291e7c761b1.zip | |
video: Add the Cantoraone decorative font
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>
| -rw-r--r-- | drivers/video/console_truetype.c | 4 | ||||
| -rw-r--r-- | drivers/video/fonts/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/video/fonts/Makefile | 1 | ||||
| -rw-r--r-- | drivers/video/fonts/cantoraone_regular.ttf | bin | 0 -> 163116 bytes |
4 files changed, 15 insertions, 0 deletions
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c index 405e0659f0..c249f047f5 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -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 @@ -458,6 +459,9 @@ static struct font_info font_table[] = { #ifdef CONFIG_CONSOLE_TRUETYPE_RUFSCRIPT FONT_ENTRY(rufscript010), #endif +#ifdef CONFIG_CONSOLE_TRUETYPE_CANTORAONE + FONT_ENTRY(cantoraone_regular), +#endif {} /* sentinel */ }; diff --git a/drivers/video/fonts/Kconfig b/drivers/video/fonts/Kconfig index d3bf7429ac..3f1398db50 100644 --- a/drivers/video/fonts/Kconfig +++ b/drivers/video/fonts/Kconfig @@ -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 diff --git a/drivers/video/fonts/Makefile b/drivers/video/fonts/Makefile index a3f6ea3229..46137f4f7e 100644 --- a/drivers/video/fonts/Makefile +++ b/drivers/video/fonts/Makefile @@ -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 Binary files differnew file mode 100644 index 0000000000..57446a27a0 --- /dev/null +++ b/drivers/video/fonts/cantoraone_regular.ttf |
