diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-26 09:48:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-26 09:48:07 -0500 |
| commit | b72ae192e39f933100b0eb034768cb4daeebf67a (patch) | |
| tree | 34d7b00636a472040f81b3ee1ae7f1a0a09ec1b7 /include | |
| parent | d6ea6d88769e85f6873a94065a1ba167c9b592da (diff) | |
| parent | 7588c312528eea9e24ef5c1b9a29a256ac5024d4 (diff) | |
| download | talos-obmc-uboot-b72ae192e39f933100b0eb034768cb4daeebf67a.tar.gz talos-obmc-uboot-b72ae192e39f933100b0eb034768cb4daeebf67a.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/chromebook_jerry.h | 1 | ||||
| -rw-r--r-- | include/configs/firefly-rk3288.h | 1 | ||||
| -rw-r--r-- | include/configs/nyan-big.h | 2 | ||||
| -rw-r--r-- | include/configs/rock2.h | 1 | ||||
| -rw-r--r-- | include/lcd.h | 11 |
5 files changed, 9 insertions, 7 deletions
diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index 150e8765d6..67f45c0f90 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -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 diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h index d6423e7e55..a29f55709d 100644 --- a/include/configs/firefly-rk3288.h +++ b/include/configs/firefly-rk3288.h @@ -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 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 9464153f58..176f6e902b 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -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 diff --git a/include/configs/rock2.h b/include/configs/rock2.h index d6423e7e55..a29f55709d 100644 --- a/include/configs/rock2.h +++ b/include/configs/rock2.h @@ -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 diff --git a/include/lcd.h b/include/lcd.h index d7651a8f08..f76fca77f9 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -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 |
