diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-21 07:12:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-21 07:12:46 -0400 |
| commit | b9625abe03452f3926afa4308bf25c361af9c0ef (patch) | |
| tree | 9bdae44eb53ae0781e71285dbb5be9e2bbbfa846 /include | |
| parent | 79764b5081d276596dc9294dece73354f81a6801 (diff) | |
| parent | e63168a9ffae18f807f59925bb5d9d4623633e46 (diff) | |
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 'include')
| -rw-r--r-- | include/configs/mx53cx9020.h | 6 | ||||
| -rw-r--r-- | include/video_console.h | 16 |
2 files changed, 17 insertions, 5 deletions
diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 9bf5d9169b..ab61a07f96 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -159,11 +159,7 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 /* Framebuffer and LCD */ +#define CONFIG_IMX_VIDEO_SKIP #define CONFIG_PREBOOT -#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE -#define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN -#define CONFIG_BMP_16BPP -#define CONFIG_VIDEO_LOGO #endif /* __CONFIG_H */ diff --git a/include/video_console.h b/include/video_console.h index 52a41ac200..0936ceaaf1 100644 --- a/include/video_console.h +++ b/include/video_console.h @@ -215,6 +215,22 @@ int vidconsole_set_row(struct udevice *dev, uint row, int clr); int vidconsole_put_char(struct udevice *dev, char ch); /** + * vidconsole_put_string() - Output a string to the current console position + * + * Outputs a string to the console and advances the cursor. This function + * handles wrapping to new lines and scrolling the console. Special + * characters are handled also: \n, \r, \b and \t. + * + * The device always starts with the cursor at position 0,0 (top left). It + * can be adjusted manually using vidconsole_position_cursor(). + * + * @dev: Device to adjust + * @str: String to write + * @return 0 if OK, -ve on error + */ +int vidconsole_put_string(struct udevice *dev, const char *str); + +/** * vidconsole_position_cursor() - Move the text cursor * * @dev: Device to adjust |