dm: core: Update of_read_fmap_entry() for livetree

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

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 945b20ddfd7a686d5c6b5c26bc5d59477e8cda63..dd0873767ba5ef6c38ea771ce2e51d1cc13f7c53 100644 (file)
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2015 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -117,9 +116,12 @@ void video_clear(struct udevice *dev)
 void video_set_default_colors(struct video_priv *priv)
 {
 #ifdef CONFIG_SYS_WHITE_ON_BLACK
-       priv->colour_fg = vid_console_color(priv, VID_WHITE);
+       /* White is used when switching to bold, use light gray here */
+       priv->fg_col_idx = VID_LIGHT_GRAY;
+       priv->colour_fg = vid_console_color(priv, VID_LIGHT_GRAY);
        priv->colour_bg = vid_console_color(priv, VID_BLACK);
 #else
+       priv->fg_col_idx = VID_BLACK;
        priv->colour_fg = vid_console_color(priv, VID_BLACK);
        priv->colour_bg = vid_console_color(priv, VID_WHITE);
 #endif
@@ -269,7 +271,7 @@ static int video_post_bind(struct udevice *dev)
        ulong size;
 
        /* Before relocation there is nothing to do here */
-       if ((!gd->flags & GD_FLG_RELOC))
+       if (!(gd->flags & GD_FLG_RELOC))
                return 0;
        size = alloc_fb(dev, &addr);
        if (addr < gd->video_bottom) {