diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-30 19:48:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-30 19:48:39 -0400 |
| commit | 7c0e5d865ff0b86dfce492b656238919c659d756 (patch) | |
| tree | 673b7954e13e1964240cff790f49c0044c418b5e | |
| parent | f875bbb49111c308b90b9ca74d1b79f69498b278 (diff) | |
| parent | c385ac283023a4fdd304674a8163ac271a1fb758 (diff) | |
| download | u-boot-imx-7c0e5d865ff0b86dfce492b656238919c659d756.zip u-boot-imx-7c0e5d865ff0b86dfce492b656238919c659d756.tar.gz u-boot-imx-7c0e5d865ff0b86dfce492b656238919c659d756.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
| -rw-r--r-- | common/lcd_simplefb.c | 5 | ||||
| -rw-r--r-- | drivers/video/da8xx-fb.c | 10 | ||||
| -rw-r--r-- | drivers/video/mx3fb.c | 9 | ||||
| -rw-r--r-- | drivers/video/mxc_ipuv3_fb.c | 9 |
4 files changed, 4 insertions, 29 deletions
diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c index 8db2add..2ba00f6 100644 --- a/common/lcd_simplefb.c +++ b/common/lcd_simplefb.c @@ -16,11 +16,14 @@ DECLARE_GLOBAL_DATA_PTR; static int lcd_dt_simplefb_configure_node(void *blob, int off) { -#if LCD_BPP == LCD_COLOR16 int vl_col = lcd_get_pixel_width(); int vl_row = lcd_get_pixel_height(); +#if LCD_BPP == LCD_COLOR16 return fdt_setup_simplefb_node(blob, off, gd->fb_base, vl_col, vl_row, vl_col * 2, "r5g6b5"); +#elif LCD_BPP == LCD_COLOR32 + return fdt_setup_simplefb_node(blob, off, gd->fb_base, vl_col, vl_row, + vl_col * 4, "a8r8g8b8"); #else return -1; #endif diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 3a5f325..e2b2144 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -1035,16 +1035,6 @@ err_release_fb: return NULL; } -void video_set_lut(unsigned int index, /* color number */ - unsigned char r, /* red */ - unsigned char g, /* green */ - unsigned char b /* blue */ - ) -{ - - return; -} - void da8xx_video_init(const struct da8xx_panel *panel, const struct lcd_ctrl_config *lcd_cfg, int bits_pixel) { diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index aa4cc43..3f10d5c 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -904,12 +904,3 @@ void *video_hw_init(void) return (void *) &panel; } - -void video_set_lut(unsigned int index, /* color number */ - unsigned char r, /* red */ - unsigned char g, /* green */ - unsigned char b /* blue */ - ) -{ - return; -} diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c index 1fa9531..265274b 100644 --- a/drivers/video/mxc_ipuv3_fb.c +++ b/drivers/video/mxc_ipuv3_fb.c @@ -599,15 +599,6 @@ void *video_hw_init(void) return (void *)&panel; } -void video_set_lut(unsigned int index, /* color number */ - unsigned char r, /* red */ - unsigned char g, /* green */ - unsigned char b /* blue */ - ) -{ - return; -} - int ipuv3_fb_init(struct fb_videomode const *mode, uint8_t disp, uint32_t pixfmt) |