diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-18 23:59:16 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-18 23:59:16 +0300 |
| commit | 04909251fdecac9d05e527b83e86e043e8df00ea (patch) | |
| tree | 28457d74af51288b0617623d3042693d7696e62b /include | |
| parent | 83fdb4388253240138e2ce364abe6b070b756d87 (diff) | |
| parent | fb3dd9c005045c2748e30d555d252c6985b97349 (diff) | |
| download | u-boot-04909251fdecac9d05e527b83e86e043e8df00ea.tar.xz | |
Merge tag 'video-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-video into next
- migrate remaining imx5/imx6qd boards to DM_VIDEO
- use 'vidconsole' stdout in nitrogen6x upgrade script
- add option for selection of the vidconsole commands
lcdputs and setcurs
- allow building ipuv3 driver with disabled CONFIG_PANEL
- make backlight and panel drivers optional
- remove useless code from ipuv3 driver
- extend existing DM_VIDEO work-around for console name
to support 'vga'
- remove non-DM code in ipuv3
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/advantech_dms-ba16.h | 2 | ||||
| -rw-r--r-- | include/configs/tbs2910.h | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index d44028d510..9cbdb1face 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -202,7 +202,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 /* Framebuffer */ -#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN @@ -211,7 +210,6 @@ #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#endif #define CONFIG_IMX6_PWM_PER_CLK 66000000 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 17de122852..eb16eb3d8a 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -37,11 +37,9 @@ #define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ /* Framebuffer */ -#ifdef CONFIG_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#endif /* PCI */ #ifdef CONFIG_CMD_PCI @@ -102,11 +100,11 @@ "scriptaddr=0x14000000\0" \ "set_con_serial=setenv stdout serial; " \ "setenv stderr serial\0" \ - "set_con_hdmi=setenv stdout serial,vga; " \ - "setenv stderr serial,vga\0" \ - "stderr=serial,vga\0" \ + "set_con_hdmi=setenv stdout serial,vidconsole; " \ + "setenv stderr serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" \ "stdin=serial,usbkbd\0" \ - "stdout=serial,vga\0" + "stdout=serial,vidconsole\0" /* Enable distro boot */ #define BOOT_TARGET_DEVICES(func) \ |