diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-26 23:15:57 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-26 23:15:57 +0200 |
| commit | 8bf7437c0127f417b566c93ffa59df7292a0e11f (patch) | |
| tree | 88931de07c5cface7e846c494e07f41e2d7f8b16 /common | |
| parent | e1491288743c3c3547c9b512d03f42eae530a114 (diff) | |
| parent | 35cf3b57eafe3ee1f693e24267e0ecfefab60251 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bmp.c | 1 | ||||
| -rw-r--r-- | common/lcd.c | 16 |
2 files changed, 1 insertions, 16 deletions
diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index 27d5896af9..faa10a4145 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -26,6 +26,7 @@ */ #include <common.h> +#include <lcd.h> #include <bmp_layout.h> #include <command.h> #include <asm/byteorder.h> diff --git a/common/lcd.c b/common/lcd.c index c87de0beff..dc8fea6694 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -79,25 +79,13 @@ static inline void lcd_putc_xy (ushort x, ushort y, uchar c); static int lcd_init (void *lcdbase); static int lcd_clear (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]); -extern void lcd_ctrl_init (void *lcdbase); -extern void lcd_enable (void); static void *lcd_logo (void); - -#if (LCD_BPP == LCD_COLOR8) || (LCD_BPP == LCD_COLOR16) -extern void lcd_setcolreg (ushort regno, - ushort red, ushort green, ushort blue); -#endif -#if LCD_BPP == LCD_MONOCHROME -extern void lcd_initcolregs (void); -#endif - static int lcd_getbgcolor (void); static void lcd_setfgcolor (int color); static void lcd_setbgcolor (int color); char lcd_is_enabled = 0; -extern vidinfo_t panel_info; #ifdef NOT_USED_SO_FAR static void lcd_getcolreg (ushort regno, @@ -815,10 +803,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) } #endif -#ifdef CONFIG_VIDEO_BMP_GZIP -extern bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp); -#endif - static void *lcd_logo (void) { #ifdef CONFIG_SPLASH_SCREEN |