diff options
author | Tom Rini <trini@konsulko.com> | 2019-05-21 14:12:46 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-05-21 14:12:46 +0300 |
commit | b9625abe03452f3926afa4308bf25c361af9c0ef (patch) | |
tree | 9bdae44eb53ae0781e71285dbb5be9e2bbbfa846 /drivers/video | |
parent | 79764b5081d276596dc9294dece73354f81a6801 (diff) | |
parent | e63168a9ffae18f807f59925bb5d9d4623633e46 (diff) | |
download | u-boot-b9625abe03452f3926afa4308bf25c361af9c0ef.tar.xz |
Merge tag 'video-for-2019.07-rc3' of git://git.denx.de/u-boot-video
- update for using splashfile instead of location->name
when loading the splash image from a FIT
- updates for loading internal and external splash data from FIT
- DM_GPIO/DM_VIDEO migration for mx53 cx9020 board
- fix boot issue on mx6sabresd board after DM_VIDEO migration
- increase the max preallocated framebuffer BPP to 32 in ipuv3
driver to prepare for configurations with higher color depth
- allow to use vidconsole_put_string() in board code for text
output on LCD displays
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/imx/mxc_ipuv3_fb.c | 3 | ||||
-rw-r--r-- | drivers/video/vidconsole-uclass.c | 17 |
2 files changed, 17 insertions, 3 deletions
diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index 3e38d4bdcc..29ecac40a2 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -678,13 +678,14 @@ static int ipuv3_video_bind(struct udevice *dev) struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * - (1 << LCD_MAX_LOG2_BPP) / 8; + (1 << VIDEO_BPP32) / 8; return 0; } static const struct udevice_id ipuv3_video_ids[] = { { .compatible = "fsl,imx6q-ipu" }, + { .compatible = "fsl,imx53-ipu" }, { } }; diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index c31303b56e..af88588904 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -529,6 +529,20 @@ int vidconsole_put_char(struct udevice *dev, char ch) return 0; } +int vidconsole_put_string(struct udevice *dev, const char *str) +{ + const char *s; + int ret; + + for (s = str; *s; s++) { + ret = vidconsole_put_char(dev, *s); + if (ret) + return ret; + } + + return 0; +} + static void vidconsole_putc(struct stdio_dev *sdev, const char ch) { struct udevice *dev = sdev->priv; @@ -541,8 +555,7 @@ static void vidconsole_puts(struct stdio_dev *sdev, const char *s) { struct udevice *dev = sdev->priv; - while (*s) - vidconsole_put_char(dev, *s++); + vidconsole_put_string(dev, s); video_sync(dev->parent, false); } |