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

- 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

diff --cc README
Simple merge

diff --cc configs/apalis_imx6_defconfig
Simple merge

diff --cc configs/colibri_imx6_defconfig
Simple merge

diff --cc configs/gurnard_defconfig
Simple merge

diff --cc configs/m53menlo_defconfig
Simple merge

diff --cc include/configs/T102xRDB.h
Simple merge

diff --cc include/configs/T104xRDB.h
Simple merge

diff --cc include/configs/apalis_imx6.h
index 13c8d8a,3c062d4..c165f61
--- 1/include/configs/apalis_imx6.h
--- 2/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/cm_fx6.h
Simple merge

diff --cc include/configs/colibri_imx6.h
index 9a6f17f,e0174c5..c8e733b
--- 1/include/configs/colibri_imx6.h
--- 2/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 40984d6,ce4ebbb..62f8518
--- 1/include/configs/colibri_vf.h
--- 2/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 include/configs/imxrt1050-evk.h
Simple merge

diff --cc include/configs/ls1021aqds.h
Simple merge

diff --cc include/configs/ls1021atwr.h
Simple merge

diff --cc include/configs/m53menlo.h
Simple merge

diff --cc include/configs/mx51evk.h
Simple merge

diff --cc include/configs/mx53loco.h
Simple merge

diff --cc include/configs/mx6ul_14x14_evk.h
Simple merge

diff --cc include/configs/mx7dsabresd.h
Simple merge

diff --cc include/configs/nokia_rx51.h
Simple merge

diff --cc include/configs/pico-imx6ul.h
Simple merge

diff --cc include/configs/pico-imx7d.h
Simple merge

diff --cc include/configs/s5p4418_nanopi2.h
Simple merge

diff --cc scripts/config_whitelist.txt
index 428667b,c352879..79f03d1
--- 1/scripts/config_whitelist.txt
--- 2/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