video: Add a dark-grey console colour

This is useful for highlighting something with a black background, as
is needed with cedit when using a white-on-black console. Add this as
a new colour.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/boot/scene.c b/boot/scene.c
index 270c9c67233939811b3a2dce4034a4db94e696af..0135287cfcb81df88452eb452d01744aa7500727 100644 (file)
--- a/boot/scene.c
+++ b/boot/scene.c
@@ -339,7 +339,7 @@ static void scene_render_background(struct scene_obj *obj, bool box_only)
 
        /* draw a background for the object */
        if (CONFIG_IS_ENABLED(SYS_WHITE_ON_BLACK)) {
-               fore = VID_BLACK;
+               fore = VID_DARK_GREY;
                back = VID_WHITE;
        } else {
                fore = VID_LIGHT_GRAY;

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index 9823673f817f5c358b4d3c2e6fc102404bda2ac5..a5b3e8980668e2d0d7e7a7f59a84ae1444ede629 100644 (file)
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -294,6 +294,9 @@ static const struct vid_rgb colours[VID_COLOUR_COUNT] = {
        { 0xff, 0x00, 0xff },  /* bright magenta */
        { 0x00, 0xff, 0xff },  /* bright cyan */
        { 0xff, 0xff, 0xff },  /* white */
+
+       /* an extra one for menus */
+       { 0x40, 0x40, 0x40 },  /* dark gray */
 };
 
 u32 video_index_to_colour(struct video_priv *priv, enum colour_idx idx)

diff --git a/include/video.h b/include/video.h
index 606c8a37fb8dc3850216a35d8bc509c681d9dcc4..fd19723b1d2627c99efaffe48c246c9243ce6d4f 100644 (file)
--- a/include/video.h
+++ b/include/video.h
@@ -181,6 +181,7 @@ enum colour_idx {
        VID_LIGHT_MAGENTA,
        VID_LIGHT_CYAN,
        VID_WHITE,
+       VID_DARK_GREY,
 
        VID_COLOUR_COUNT
 };