mmc: sdhci: Use debug for not supported SDMA info message

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

diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 46c5205853cc53e7f2f735535a8b5c42df0be136..6d7661db89d7e3020e84f171e2f3bee014cf24d1 100644 (file)
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -1,11 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2016 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <dm.h>
+#include <malloc.h>
 #include <video.h>
 #include <video_console.h>
 
@@ -287,8 +287,30 @@ static int console_truetype_putc_xy(struct udevice *dev, uint x, uint y,
                        }
                        break;
                }
+#endif
+#ifdef CONFIG_VIDEO_BPP32
+               case VIDEO_BPP32: {
+                       u32 *dst = (u32 *)line + xoff;
+                       int i;
+
+                       for (i = 0; i < width; i++) {
+                               int val = *bits;
+                               int out;
+
+                               if (vid_priv->colour_bg)
+                                       val = 255 - val;
+                               out = val | val << 8 | val << 16;
+                               if (vid_priv->colour_fg)
+                                       *dst++ |= out;
+                               else
+                                       *dst++ &= out;
+                               bits++;
+                       }
+                       break;
+               }
 #endif
                default:
+                       free(data);
                        return -ENOSYS;
                }
 
@@ -445,10 +467,22 @@ 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
        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 */
 };