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
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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) \
|
||||
|
||||
Reference in New Issue
Block a user