Merge git://git.denx.de/u-boot-video
This commit is contained in:
@@ -23,16 +23,6 @@
|
||||
/* general purpose I/O */
|
||||
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
|
||||
|
||||
/* LCD */
|
||||
#define LCD_BPP LCD_COLOR16
|
||||
#define LCD_OUTPUT_BPP 24
|
||||
#define CONFIG_LCD_LOGO
|
||||
#define CONFIG_LCD_INFO
|
||||
#define CONFIG_LCD_INFO_BELOW_LOGO
|
||||
#define CONFIG_ATMEL_HLCD
|
||||
#define CONFIG_ATMEL_LCD_RGB565
|
||||
|
||||
|
||||
/*
|
||||
* BOOTP options
|
||||
*/
|
||||
|
||||
@@ -35,18 +35,6 @@
|
||||
#define CONFIG_SF_DEFAULT_SPEED 30000000
|
||||
#endif
|
||||
|
||||
/* LCD */
|
||||
|
||||
#ifdef CONFIG_LCD
|
||||
#define LCD_BPP LCD_COLOR16
|
||||
#define LCD_OUTPUT_BPP 24
|
||||
#define CONFIG_LCD_LOGO
|
||||
#define CONFIG_LCD_INFO
|
||||
#define CONFIG_LCD_INFO_BELOW_LOGO
|
||||
#define CONFIG_ATMEL_HLCD
|
||||
#define CONFIG_ATMEL_LCD_RGB565
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SD_BOOT
|
||||
|
||||
/* bootstrap + u-boot + env in sd card */
|
||||
|
||||
@@ -28,15 +28,6 @@
|
||||
*/
|
||||
#define ATMEL_PMC_UHP (1 << 6)
|
||||
|
||||
/* LCD */
|
||||
#define LCD_BPP LCD_COLOR16
|
||||
#define LCD_OUTPUT_BPP 24
|
||||
#define CONFIG_LCD_LOGO
|
||||
#define CONFIG_LCD_INFO
|
||||
#define CONFIG_LCD_INFO_BELOW_LOGO
|
||||
#define CONFIG_ATMEL_HLCD
|
||||
#define CONFIG_ATMEL_LCD_RGB565
|
||||
|
||||
/* board specific (not enough SRAM) */
|
||||
#define CONFIG_SAMA5D3_LCD_BASE 0x23E00000
|
||||
|
||||
|
||||
@@ -47,17 +47,6 @@
|
||||
#define CONFIG_ATMEL_NAND_HW_PMECC
|
||||
#endif
|
||||
|
||||
/* LCD */
|
||||
#ifdef CONFIG_LCD
|
||||
#define LCD_BPP LCD_COLOR16
|
||||
#define LCD_OUTPUT_BPP 24
|
||||
#define CONFIG_LCD_LOGO
|
||||
#define CONFIG_LCD_INFO
|
||||
#define CONFIG_LCD_INFO_BELOW_LOGO
|
||||
#define CONFIG_ATMEL_HLCD
|
||||
#define CONFIG_ATMEL_LCD_RGB565
|
||||
#endif
|
||||
|
||||
/* SPL */
|
||||
#define CONFIG_SPL_FRAMEWORK
|
||||
#define CONFIG_SPL_TEXT_BASE 0x200000
|
||||
|
||||
@@ -45,15 +45,6 @@
|
||||
#define CONFIG_ATMEL_NAND_HW_PMECC
|
||||
#endif
|
||||
|
||||
/* LCD */
|
||||
#define LCD_BPP LCD_COLOR16
|
||||
#define LCD_OUTPUT_BPP 18
|
||||
#define CONFIG_LCD_LOGO
|
||||
#define CONFIG_LCD_INFO
|
||||
#define CONFIG_LCD_INFO_BELOW_LOGO
|
||||
#define CONFIG_ATMEL_HLCD
|
||||
#define CONFIG_ATMEL_LCD_RGB565
|
||||
|
||||
/* SPL */
|
||||
#define CONFIG_SPL_FRAMEWORK
|
||||
#define CONFIG_SPL_TEXT_BASE 0x200000
|
||||
|
||||
@@ -114,6 +114,13 @@ struct video_ops {
|
||||
*/
|
||||
int video_reserve(ulong *addrp);
|
||||
|
||||
/**
|
||||
* video_clear() - Clear a device's frame buffer to background color.
|
||||
*
|
||||
* @dev: Device to clear
|
||||
*/
|
||||
void video_clear(struct udevice *dev);
|
||||
|
||||
/**
|
||||
* video_sync() - Sync a device's frame buffer with its hardware
|
||||
*
|
||||
|
||||
@@ -29,6 +29,9 @@
|
||||
* @xsize_frac: Width of the display in fractional units
|
||||
* @xstart_frac: Left margin for the text console in fractional units
|
||||
* @last_ch: Last character written to the text console on this line
|
||||
* @escape: TRUE if currently accumulating an ANSI escape sequence
|
||||
* @escape_len: Length of accumulated escape sequence so far
|
||||
* @escape_buf: Buffer to accumulate escape sequence
|
||||
*/
|
||||
struct vidconsole_priv {
|
||||
struct stdio_dev sdev;
|
||||
@@ -42,6 +45,14 @@ struct vidconsole_priv {
|
||||
int xsize_frac;
|
||||
int xstart_frac;
|
||||
int last_ch;
|
||||
/*
|
||||
* ANSI escape sequences are accumulated character by character,
|
||||
* starting after the ESC char (0x1b) until the entire sequence
|
||||
* is consumed at which point it is acted upon.
|
||||
*/
|
||||
int escape;
|
||||
int escape_len;
|
||||
char escape_buf[32];
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user