From cb65061c279334a11fd73bb487f55118b14d9637 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 21 Dec 2013 10:17:09 +0100
Subject: [PATCH] Revert "berryboot-tools: update for fullsize splash"

This reverts commit e961c8860480fbe1ff24a8fac6e94e2a44cb5dd4.
---
 packages/tools/berryboot-tools/install                | 6 +++---
 packages/tools/berryboot-tools/scripts/berryboot-init | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/tools/berryboot-tools/install b/packages/tools/berryboot-tools/install
index ae0e5fd96d..d22fc5c7d0 100755
--- a/packages/tools/berryboot-tools/install
+++ b/packages/tools/berryboot-tools/install
@@ -32,8 +32,8 @@ mkdir -p $INSTALL/bin
   cp $PLYMOUTH_DIR/ply-image $INSTALL/bin
 
 mkdir -p $INSTALL/splash
-  if [ -f $PROJECT_DIR/$PROJECT/splash/splash-full.png ]; then
-    cp $PROJECT_DIR/$PROJECT/splash/splash-full.png $INSTALL/splash
+  if [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then
+    cp $PROJECT_DIR/$PROJECT/splash/splash.png $INSTALL/splash
   else
-    cp $PLYMOUTH_PKG_DIR/splash/splash-full.png $INSTALL/splash
+    cp $PLYMOUTH_PKG_DIR/splash/splash.png $INSTALL/splash
   fi
diff --git a/packages/tools/berryboot-tools/scripts/berryboot-init b/packages/tools/berryboot-tools/scripts/berryboot-init
index f90369ec3f..87b35f7e04 100755
--- a/packages/tools/berryboot-tools/scripts/berryboot-init
+++ b/packages/tools/berryboot-tools/scripts/berryboot-init
@@ -22,7 +22,7 @@
 
 UPDATEDIR=${DATADIR}/storage/.update
 UPDATEFILE=${UPDATEDIR}/SYSTEM
-SPLASHIMAGE="/squashfs/splash/splash-full.png"
+SPLASHIMAGE="/squashfs/splash/splash.png"
 
 #
 # load splash
@@ -30,6 +30,10 @@ SPLASHIMAGE="/squashfs/splash/splash-full.png"
 #
 
 if [ -e /dev/fb0 -a -f "${SPLASHIMAGE}" ]; then
+# set framebuffer to a default resolution (1024x768-32)
+  LD_LIBRARY_PATH=/squashfs/lib /squashfs/lib/ld.so \
+    /squashfs/bin/busybox fbset -g 1024 768 1024 768 32
+
 # load splash
   LD_LIBRARY_PATH=/squashfs/lib /squashfs/lib/ld.so \
     /squashfs/bin/ply-image ${SPLASHIMAGE} > /dev/null 2>&1