summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-09-25 16:18:22 -0700
committerTom Rini <trini@ti.com>2012-09-25 16:18:22 -0700
commitb3873d3f4c424e6563750bb517fac03c2e833cdc (patch)
tree3ddcf37e04ca77cfaa6ad5b7b14bf233c841e0fd /board
parent5cf41dccff9d1e8c297de6eae8422d3e322eebbc (diff)
parentd23019f3d65c2746d8aecf5ab2c93591f00cb965 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'board')
-rw-r--r--board/mcc200/lcd.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/board/mcc200/lcd.c b/board/mcc200/lcd.c
index d8f754c4a18..893f4b7cb8d 100644
--- a/board/mcc200/lcd.c
+++ b/board/mcc200/lcd.c
@@ -21,6 +21,7 @@
#include <common.h>
#include <lcd.h>
#include <mpc5xxx.h>
+#include <malloc.h>
#ifdef CONFIG_LCD
@@ -210,4 +211,23 @@ void show_progress (int size, int tot)
}
#endif
+
+int bmp_display(ulong addr, int x, int y)
+{
+ int ret;
+ bmp_image_t *bmp = (bmp_image_t *)addr;
+
+ if (!bmp) {
+ printf("There is no valid bmp file at the given address\n");
+ return 1;
+ }
+
+ ret = lcd_display_bitmap((ulong)bmp, x, y);
+
+ if ((unsigned long)bmp != addr)
+ free(bmp);
+
+ return ret;
+}
+
#endif /* CONFIG_LCD */