Signed-off-by: Matthias Weisser <matthias.weis...@graf-syteco.de>
---
drivers/video/cfb_console.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
mode change 100644 => 100755 drivers/video/cfb_console.c
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
old mode 100644
new mode 100755
index bcafb27..15b99cb
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -314,7 +314,7 @@ void console_cursor (int state);
#else
#define SWAP16(x) (x)
#define SWAP32(x) (x)
-#if defined(VIDEO_FB_16BPP_PIXEL_SWAP)
+#if defined(VIDEO_FB_16BPP_PIXEL_SWAP) || defined (CONFIG_VIDEO_JADEGDC)
#define SHORTSWAP32(x) ( ((x) >> 16) | ((x) << 16) )
#else
#define SHORTSWAP32(x) (x)
@@ -1188,9 +1188,17 @@ static void *video_logo (void)
ulong addr;
if ((s = getenv ("splashimage")) != NULL) {
+ int x = 0, y = 0;
+
addr = simple_strtoul (s, NULL, 16);
- if (video_display_bitmap (addr, 0, 0) == 0) {
+ if ((s = strchr (s, ' ')) != NULL) {
+ x = simple_strtoul (s + 1, NULL, 0);
+ if ((s = strchr (s + 1, ' ')) != NULL)
+ y = simple_strtoul (s + 1, NULL, 0);
+ }
+
+ if (video_display_bitmap (addr, x, y) == 0) {
return ((void *) (video_fb_address));
}
}
--
1.5.6.3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
