Merge tag 'video-next-20211228' of https://source.denx.de/u-boot/custodians/u-boot...
authorTom Rini <trini@konsulko.com>
Tue, 28 Dec 2021 16:28:31 +0000 (11:28 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 28 Dec 2021 16:28:31 +0000 (11:28 -0500)
- 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

24 files changed:
1  2 
README
configs/apalis_imx6_defconfig
configs/colibri_imx6_defconfig
configs/gurnard_defconfig
configs/m53menlo_defconfig
include/configs/T102xRDB.h
include/configs/T104xRDB.h
include/configs/apalis_imx6.h
include/configs/cm_fx6.h
include/configs/colibri_imx6.h
include/configs/colibri_vf.h
include/configs/imxrt1050-evk.h
include/configs/ls1021aqds.h
include/configs/ls1021atwr.h
include/configs/m53menlo.h
include/configs/mx51evk.h
include/configs/mx53loco.h
include/configs/mx6ul_14x14_evk.h
include/configs/mx7dsabresd.h
include/configs/nokia_rx51.h
include/configs/pico-imx6ul.h
include/configs/pico-imx7d.h
include/configs/s5p4418_nanopi2.h
scripts/config_whitelist.txt

diff --cc README
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 13c8d8a54e55418d8f00cce14e8ee6448c84eddd,3c062d42f8d3dda90381b9bfc2445e34986dc938..c165f618be921868a4b496604dbd9295ed11dd29
@@@ -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
Simple merge
index 9a6f17f5bd2e56b523927e6523faaaecd835c719,e0174c583430b30902570933edc0f466691ec540..c8e733bc3663a9e059c8472bd3ff82e5251e30c7
@@@ -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
index 40984d661c80d29855f64a461b6ca03e1f8de51a,ce4ebbb55f42501f1f3e130bd32bbf9458b620f6..62f85185b761fe3f79495155918b33bea02ae925
@@@ -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
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 428667b4381357fef667a5511a0ed059c4d9cc11,c3528790f8a1c74ba8a9138460d0a7a888b31e72..79f03d16362b97fc83056d7e5d0b6a4b855b997c
@@@ -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