common: Move ll_boot_init() to init.h

[oweals/u-boot.git] / drivers / video / console_truetype.c

diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index b770ad446ea5b775fec9370702ecf48c21f7cddb..30086600fb1fd973b5b7b094c4494e7498f254c3 100644 (file)
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2016 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -289,6 +288,7 @@ static int console_truetype_putc_xy(struct udevice *dev, uint x, uint y,
                }
 #endif
                default:
+                       free(data);
                        return -ENOSYS;
                }
 
@@ -444,7 +444,24 @@ struct font_info {
        .end = __ttf_ ## _name ## _end, \
        }
 
+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
+       FONT_ENTRY(nimbus_sans_l_regular),
+#endif
+#ifdef CONFIG_CONSOLE_TRUETYPE_ANKACODER
+       FONT_ENTRY(ankacoder_c75_r),
+#endif
+#ifdef CONFIG_CONSOLE_TRUETYPE_RUFSCRIPT
+       FONT_ENTRY(rufscript010),
+#endif
+#ifdef CONFIG_CONSOLE_TRUETYPE_CANTORAONE
+       FONT_ENTRY(cantoraone_regular),
+#endif
        {} /* sentinel */
 };