Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

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

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 5ea7568fa4c8f1c0b70dbcd944675edc570e85ce..3d658e61d7c6ccba03164ca239b6962a85478fb2 100644 (file)
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <malloc.h>
 #include <mapmem.h>
 #include <stdio_dev.h>
 #include <video.h>
@@ -92,26 +93,24 @@ int video_clear(struct udevice *dev)
        struct video_priv *priv = dev_get_uclass_priv(dev);
 
        switch (priv->bpix) {
-#ifdef CONFIG_VIDEO_BPP16
-       case VIDEO_BPP16: {
-               u16 *ppix = priv->fb;
-               u16 *end = priv->fb + priv->fb_size;
-
-               while (ppix < end)
-                       *ppix++ = priv->colour_bg;
-               break;
-       }
-#endif
-#ifdef CONFIG_VIDEO_BPP32
-       case VIDEO_BPP32: {
-               u32 *ppix = priv->fb;
-               u32 *end = priv->fb + priv->fb_size;
-
-               while (ppix < end)
-                       *ppix++ = priv->colour_bg;
-               break;
-       }
-#endif
+       case VIDEO_BPP16:
+               if (IS_ENABLED(CONFIG_VIDEO_BPP16)) {
+                       u16 *ppix = priv->fb;
+                       u16 *end = priv->fb + priv->fb_size;
+
+                       while (ppix < end)
+                               *ppix++ = priv->colour_bg;
+                       break;
+               }
+       case VIDEO_BPP32:
+               if (IS_ENABLED(CONFIG_VIDEO_BPP32)) {
+                       u32 *ppix = priv->fb;
+                       u32 *end = priv->fb + priv->fb_size;
+
+                       while (ppix < end)
+                               *ppix++ = priv->colour_bg;
+                       break;
+               }
        default:
                memset(priv->fb, priv->colour_bg, priv->fb_size);
                break;
@@ -125,14 +124,14 @@ void video_set_default_colors(struct udevice *dev, bool invert)
        struct video_priv *priv = dev_get_uclass_priv(dev);
        int fore, back;
 
-#ifdef CONFIG_SYS_WHITE_ON_BLACK
-       /* White is used when switching to bold, use light gray here */
-       fore = VID_LIGHT_GRAY;
-       back = VID_BLACK;
-#else
-       fore = VID_BLACK;
-       back = VID_WHITE;
-#endif
+       if (CONFIG_IS_ENABLED(SYS_WHITE_ON_BLACK)) {
+               /* White is used when switching to bold, use light gray here */
+               fore = VID_LIGHT_GRAY;
+               back = VID_BLACK;
+       } else {
+               fore = VID_BLACK;
+               back = VID_WHITE;
+       }
        if (invert) {
                int temp;