Merge tag 'v2025.01-rc6' into next

[J-u-boot.git] / include / video.h

diff --git a/include/video.h b/include/video.h
index 606c8a37fb8dc3850216a35d8bc509c681d9dcc4..4ec71ab16da884023e70c8b61aa6e1e4e25c9c37 100644 (file)
--- a/include/video.h
+++ b/include/video.h
@@ -57,12 +57,8 @@ enum video_log2_bpp {
        VIDEO_BPP32,
 };
 
-/*
- * Convert enum video_log2_bpp to bytes and bits. Note we omit the outer
- * brackets to allow multiplication by fractional pixels.
- */
+/* Convert enum video_log2_bpp to bytes and bits */
 #define VNBYTES(bpix)  ((1 << (bpix)) / 8)
-
 #define VNBITS(bpix)   (1 << (bpix))
 
 enum video_format {
@@ -78,7 +74,8 @@ enum video_format {
  *
  * @xsize:     Number of pixel columns (e.g. 1366)
  * @ysize:     Number of pixels rows (e.g.. 768)
- * @rot:       Display rotation (0=none, 1=90 degrees clockwise, etc.)
+ * @rot:       Display rotation (0=none, 1=90 degrees clockwise, etc.). THis
+ *             does not affect @xsize and @ysize
  * @bpix:      Encoded bits per pixel (enum video_log2_bpp)
  * @format:    Pixel format (enum video_format)
  * @vidconsole_drv_name:       Driver to use for the text console, NULL to
@@ -181,6 +178,7 @@ enum colour_idx {
        VID_LIGHT_MAGENTA,
        VID_LIGHT_CYAN,
        VID_WHITE,
+       VID_DARK_GREY,
 
        VID_COLOUR_COUNT
 };