summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-03-12 20:59:09 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-03-14 07:16:20 +0100
commita38b236759978e45bceacd5f41b29a7197735971 (patch)
tree8976537109d9861f18872562deb956b8fff0dab0
parent2e7d66f526217f6ff3167e4580aecb9548a0de33 (diff)
downloadbarebox-a38b236759978e45bceacd5f41b29a7197735971.tar.gz
barebox-a38b236759978e45bceacd5f41b29a7197735971.tar.xz
splash: fix background color support
the fb info is stored in struct screen by fb_open Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--commands/splash.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/commands/splash.c b/commands/splash.c
index 4cc463ec49..0955c011e6 100644
--- a/commands/splash.c
+++ b/commands/splash.c
@@ -13,7 +13,6 @@ static int do_splash(int argc, char *argv[])
struct screen sc;
int ret, opt, fd;
char *fbdev = "/dev/fb0";
- struct fb_info info;
char *image_file;
int offscreen = 0;
u32 bg_color = 0x00000000;
@@ -21,7 +20,6 @@ static int do_splash(int argc, char *argv[])
memset(&s, 0, sizeof(s));
memset(&sc, 0, sizeof(sc));
- memset(&info, 0, sizeof(info));
s.x = -1;
s.y = -1;
@@ -61,12 +59,12 @@ static int do_splash(int argc, char *argv[])
if (sc.offscreenbuf) {
if (do_bg)
- memset_pixel(&info, sc.offscreenbuf, bg_color,
+ memset_pixel(&sc.info, sc.offscreenbuf, bg_color,
sc.s.width * sc.s.height);
else
memcpy(sc.offscreenbuf, sc.fb, sc.fbsize);
} else if (do_bg) {
- memset_pixel(&info, sc.fb, bg_color, sc.s.width * sc.s.height);
+ memset_pixel(&sc.info, sc.fb, bg_color, sc.s.width * sc.s.height);
}
if (image_renderer_file(&sc, &s, image_file) < 0)