diff options
| author | Tom Rini <trini@ti.com> | 2013-07-10 08:42:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-10 08:42:25 -0400 |
| commit | 2f4998ab4429af4b805f8566268c3b761aa4babd (patch) | |
| tree | 781c234b704484f833779e29ab6f9330ebf00e9f /include | |
| parent | c479c1361ade3cf2346f41a922b85373ddff8a26 (diff) | |
| parent | ff8fb56b6f7edafc1bcba8ef008b3f368cabe60d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/cm_t35.h | 1 | ||||
| -rw-r--r-- | include/lcd.h | 4 | ||||
| -rw-r--r-- | include/splash.h | 36 |
3 files changed, 38 insertions, 3 deletions
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index c6e357a8ce..b258da9e92 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -339,6 +339,5 @@ #define CONFIG_SPLASH_SCREEN #define CONFIG_CMD_BMP #define CONFIG_BMP_16BPP -#define CONFIG_SPLASH_SCREEN_PREPARE #endif /* __CONFIG_H */ diff --git a/include/lcd.h b/include/lcd.h index 30225edf56..8718a01902 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -37,7 +37,6 @@ extern struct vidinfo panel_info; void lcd_ctrl_init(void *lcdbase); void lcd_enable(void); -int board_splash_screen_prepare(void); /* setcolreg used in 8bpp/16bpp; initcolregs used in monochrome */ void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue); @@ -46,7 +45,8 @@ void lcd_initcolregs(void); int lcd_getfgcolor(void); /* gunzip_bmp used if CONFIG_VIDEO_BMP_GZIP */ -struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp); +struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp, + void **alloc_addr); int bmp_display(ulong addr, int x, int y); /** diff --git a/include/splash.h b/include/splash.h new file mode 100644 index 0000000000..89ee7b22ec --- /dev/null +++ b/include/splash.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2013, Boundary Devices <info@boundarydevices.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., http://www.fsf.org/about/contact/ + */ + +#ifndef _SPLASH_H_ +#define _SPLASH_H_ + + +int splash_screen_prepare(void); + +#ifdef CONFIG_SPLASH_SCREEN_ALIGN +void splash_get_pos(int *x, int *y); +#else +static inline void splash_get_pos(int *x, int *y) { } +#endif + +#define BMP_ALIGN_CENTER 0x7FFF + +#endif |