diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:42:17 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:42:17 +0200 |
| commit | fedab338f3459315cb69627fcf46032ec8df1753 (patch) | |
| tree | f3364476201839514e578be0938832620be18244 /common/cmd_bmp.c | |
| parent | 74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008 (diff) | |
| parent | f6b690e65c0aa5f3da22546ac597d9f01cff2e4e (diff) | |
| download | olio-uboot-2014.01-fedab338f3459315cb69627fcf46032ec8df1753.tar.xz olio-uboot-2014.01-fedab338f3459315cb69627fcf46032ec8df1753.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
* 'master' of git://git.denx.de/u-boot-video:
video: atmel/lcd: add LCD driver for new Atmel SoC
video: cfb_console: flush dcache for frame buffer in DRAM
cfb_console: Ignore bell character
cfb_console: Add console_clear_line function
cfb_console: Fix function console_back
omap3_dss: cosmetic changes
omap3_dss: add optional framebuffer
mx53loco: Add LCD support
mx5: Rename mx51_fb_init()
mx53: Allow IPUv3 driver to also work on mx53
mx51evk: Add LCD support
EXYNOS: display 32bpp bitmap TIZEN logo
create lib/tizen directory
LCD: display 32bpp decompressed bitmap image
common/lcd.c: reduce one CONFIG_LCD_LOGO ifdef
common/lcd.c: reduce some CONFIG_LCD_*_LOGO ifdefs
common/lcd.c: use ARRAY_SIZE
cmd_bmp.c: make bmp_display() usable by drivers or board code
LCD: support another s6e8ax0 panel type
LCD: change s6e8ax0 panel gamma value
include/video.h: drop unused video_printf()
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common/cmd_bmp.c')
| -rw-r--r-- | common/cmd_bmp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index 4c29fa34b..b8809e3bf 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -33,7 +33,6 @@ #include <malloc.h> static int bmp_info (ulong addr); -static int bmp_display (ulong addr, int x, int y); /* * Allocate and decompress a BMP image using gunzip(). @@ -221,7 +220,7 @@ static int bmp_info(ulong addr) * Return: None * */ -static int bmp_display(ulong addr, int x, int y) +int bmp_display(ulong addr, int x, int y) { int ret; bmp_image_t *bmp = (bmp_image_t *)addr; |