From: Tom Rini <trini@konsulko.com>
Date: Tue, 28 Dec 2021 16:28:31 +0000 (-0500)
Subject: Merge tag 'video-next-20211228' of https://source.denx.de/u-boot/custodians/u-boot... 
X-Git-Tag: v2022.04-rc1~39^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87a9aa604de8a4a50642e25b88af328ab375893b;p=pandora-u-boot.git

Merge tag 'video-next-20211228' of https://source.denx.de/u-boot/custodians/u-boot-video into next

- various fixes to the sandbox display support
- support for showing a logo without splash screen config
- support for BMP drawing to depths other than 16bpp
- tests for the different types of supported BMP images
- support showing a logo when running coreboot via qemu
---

87a9aa604de8a4a50642e25b88af328ab375893b
diff --cc include/configs/apalis_imx6.h
index 13c8d8a54e5,3c062d42f8d..c165f618be9
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@@ -45,7 -45,7 +45,6 @@@
  #define CONFIG_USBD_HS
  
  /* Framebuffer and LCD */
- #define CONFIG_VIDEO_LOGO
 -#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
  #define CONFIG_VIDEO_BMP_LOGO
  #define CONFIG_IMX_HDMI
  #define CONFIG_IMX_VIDEO_SKIP
diff --cc include/configs/colibri_imx6.h
index 9a6f17f5bd2,e0174c58343..c8e733bc366
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@@ -35,7 -35,7 +35,6 @@@
  #define CONFIG_USBD_HS
  
  /* Framebuffer and LCD */
- #define CONFIG_VIDEO_LOGO
 -#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
  #define CONFIG_VIDEO_BMP_LOGO
  #define CONFIG_IMX_HDMI
  #define CONFIG_IMX_VIDEO_SKIP
diff --cc include/configs/colibri_vf.h
index 40984d661c8,ce4ebbb55f4..62f85185b76
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@@ -14,8 -14,9 +14,7 @@@
  #include <asm/arch/imx-regs.h>
  #include <linux/sizes.h>
  
 -#define CONFIG_SYS_FSL_CLK
 -
  #ifdef CONFIG_VIDEO_FSL_DCU_FB
- #define CONFIG_VIDEO_LOGO
  #define CONFIG_VIDEO_BMP_LOGO
  #define CONFIG_SYS_FSL_DCU_LE
  
diff --cc scripts/config_whitelist.txt
index 428667b4381,c3528790f8a..79f03d16362
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -2127,7 -3040,15 +2127,6 @@@ CONFIG_VERY_BIG_RA
  CONFIG_VIDEO_BCM2835
  CONFIG_VIDEO_BMP_LOGO
  CONFIG_VIDEO_DA8XX
- CONFIG_VIDEO_LOGO
 -CONFIG_VIDEO_FONT_4X6
 -CONFIG_VIDEO_MXS_MODE_SYSTEM
 -CONFIG_VIDEO_STD_TIMINGS
 -CONFIG_VID_FLS_ENV
 -CONFIG_VM86
 -CONFIG_VOIPAC_LCD
 -CONFIG_VOL_MONITOR_INA220
 -CONFIG_VOL_MONITOR_IR36021_READ
 -CONFIG_VOL_MONITOR_IR36021_SET
  CONFIG_VSC7385_ENET
  CONFIG_VSC7385_IMAGE
  CONFIG_VSC7385_IMAGE_SIZE