diff options
| author | Tom Rini <trini@ti.com> | 2015-02-10 10:41:54 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-10 10:41:54 -0500 |
| commit | 0dac731d1932027f4f813ec7aede35d5e30dec0e (patch) | |
| tree | 522a20ea29730f0b5be03c8ced3b16a37fc165fe /drivers/video/atmel_hlcdfb.c | |
| parent | 307367eaffc8638e10ba1784fc66bfe623ae79e2 (diff) | |
| parent | 7bf71d1f55d31a81ade8dd0fc72f06e4672689d0 (diff) | |
| download | u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.zip u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.tar.gz u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Conflicts:
include/splash.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/video/atmel_hlcdfb.c')
| -rw-r--r-- | drivers/video/atmel_hlcdfb.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 935ae42..0ce2370 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -13,6 +13,10 @@ #include <lcd.h> #include <atmel_hlcdc.h> +#if defined(CONFIG_LCD_LOGO) +#include <bmp_logo.h> +#endif + /* configurable parameters */ #define ATMEL_LCDC_CVAL_DEFAULT 0xc8 #define ATMEL_LCDC_DMA_BURST_LEN 8 @@ -37,6 +41,15 @@ void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue) panel_info.mmio + ATMEL_LCDC_LUT(regno)); } +ushort *configuration_get_cmap(void) +{ +#if defined(CONFIG_LCD_LOGO) + return bmp_logo_palette; +#else + return NULL; +#endif +} + void lcd_ctrl_init(void *lcdbase) { unsigned long value; |