Merge branch 'master' of git://git.denx.de/u-boot-video
This commit is contained in:
@@ -30,7 +30,6 @@
|
||||
#define CONFIG_SPL_POWER_SUPPORT
|
||||
#define CONFIG_SPL_I2C_SUPPORT
|
||||
|
||||
#define CONFIG_I2C_EDID
|
||||
#define CONFIG_SYS_WHITE_ON_BLACK
|
||||
#define CONFIG_CONSOLE_SCROLL_LINES 10
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
*/
|
||||
#define CONFIG_ENV_OFFSET (96 * 1024)
|
||||
|
||||
#define CONFIG_I2C_EDID
|
||||
#define CONFIG_SYS_WHITE_ON_BLACK
|
||||
#define CONFIG_CONSOLE_SCROLL_LINES 10
|
||||
|
||||
|
||||
@@ -37,8 +37,6 @@
|
||||
#define CONFIG_SYS_MMC_ENV_PART 2
|
||||
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
|
||||
|
||||
#define CONFIG_I2C_EDID
|
||||
|
||||
/* LCD support */
|
||||
#define CONFIG_LCD
|
||||
#define CONFIG_PWM_TEGRA
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
*/
|
||||
#define CONFIG_ENV_OFFSET (96 * 1024)
|
||||
|
||||
#define CONFIG_I2C_EDID
|
||||
#define CONFIG_SYS_WHITE_ON_BLACK
|
||||
#define CONFIG_CONSOLE_SCROLL_LINES 10
|
||||
|
||||
|
||||
@@ -195,8 +195,15 @@ void lcd_sync(void);
|
||||
#define CONSOLE_COLOR_WHITE 0x00ffffff /* Must remain last / highest */
|
||||
#define NBYTES(bit_code) (NBITS(bit_code) >> 3)
|
||||
#else /* 16bpp color definitions */
|
||||
#define CONSOLE_COLOR_BLACK 0x0000
|
||||
#define CONSOLE_COLOR_WHITE 0xffff /* Must remain last / highest */
|
||||
# define CONSOLE_COLOR_BLACK 0x0000
|
||||
# define CONSOLE_COLOR_RED 0xF800
|
||||
# define CONSOLE_COLOR_GREEN 0x07E0
|
||||
# define CONSOLE_COLOR_YELLOW 0xFFE0
|
||||
# define CONSOLE_COLOR_BLUE 0x001F
|
||||
# define CONSOLE_COLOR_MAGENTA 0xF81F
|
||||
# define CONSOLE_COLOR_CYAN 0x07FF
|
||||
# define CONSOLE_COLOR_GREY 0xC618
|
||||
# define CONSOLE_COLOR_WHITE 0xffff /* Must remain last / highest */
|
||||
#endif /* color definitions */
|
||||
|
||||
#if LCD_BPP == LCD_COLOR16
|
||||
|
||||
Reference in New Issue
Block a user