GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-video

Browse source
This commit is contained in:
Tom Rini 2015-08-30 19:48:39 -04:00
commit 7c0e5d865f
4 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/lcd_simplefb.c
View file

@ -16,11 +16,14 @@ DECLARE_GLOBAL_DATA_PTR;
static int lcd_dt_simplefb_configure_node(void *blob, int off) 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_col = lcd_get_pixel_width();
int vl_row = lcd_get_pixel_height(); 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, return fdt_setup_simplefb_node(blob, off, gd->fb_base, vl_col, vl_row,
vl_col * 2, "r5g6b5"); 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 #else
return -1; return -1;
#endif #endif

10
drivers/video/da8xx-fb.c
View file

@ -1035,16 +1035,6 @@ err_release_fb:
return NULL; 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, void da8xx_video_init(const struct da8xx_panel *panel,
const struct lcd_ctrl_config *lcd_cfg, int bits_pixel) const struct lcd_ctrl_config *lcd_cfg, int bits_pixel)
{ {

9
drivers/video/mx3fb.c
View file

@ -904,12 +904,3 @@ void *video_hw_init(void)
return (void *) &panel; 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;
}

9
drivers/video/mxc_ipuv3_fb.c
View file

@ -599,15 +599,6 @@ void *video_hw_init(void)
return (void *)&panel; 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, int ipuv3_fb_init(struct fb_videomode const *mode,
uint8_t disp, uint8_t disp,
uint32_t pixfmt) uint32_t pixfmt)