From 851bebf4c3c708222dc4dc3598aaddd37efe9c35 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 3 May 2012 22:58:23 +0200
Subject: [PATCH] busybox-initramfs: readd support for oemsplash and project
 based splash

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../initramfs/sysutils/busybox-initramfs/scripts/init | 11 ++++++++++-
 packages/initramfs/sysutils/plymouth-lite/install     |  5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
index 96363f806e..972bc38aa3 100755
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@@ -317,11 +317,20 @@ NBD_DEVS="0"
     progress "Loading bootsplash"
 
     if [ -e /dev/fb0 -a ! "$SPLASH" = "no" ]; then
+
       # set framebuffer to a default resolution (1024x768-32)
         fbset -xres 1024 -yres 768 -depth 32
 
       # load splash
-        ply-image /splash/splash.png > /dev/null 2>&1 &
+        if [ -f /flash/oemsplash.png ]; then
+          SPLASHIMAGE="/flash/oemsplash.png"
+        elif [ -f /splash/splash.conf ]; then
+          . /splash/splash.conf
+        else
+          SPLASHIMAGE="/splash/splash.png"
+        fi
+
+        ply-image $SPLASHIMAGE > /dev/null 2>&1 &
     fi
   }
 
diff --git a/packages/initramfs/sysutils/plymouth-lite/install b/packages/initramfs/sysutils/plymouth-lite/install
index 19b4087f67..92f4c5b3a6 100755
--- a/packages/initramfs/sysutils/plymouth-lite/install
+++ b/packages/initramfs/sysutils/plymouth-lite/install
@@ -26,7 +26,10 @@ mkdir -p $INSTALL/bin
   cp $PKG_BUILD/ply-image $INSTALL/bin
 
 mkdir -p $INSTALL/splash
-  if [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then
+  if [ -f $PROJECT_DIR/$PROJECT/splash/splash.conf ]; then
+    cp $PROJECT_DIR/$PROJECT/splash/splash.conf $INSTALL/splash
+    cp $PROJECT_DIR/$PROJECT/splash/*.png $INSTALL/splash
+  elif [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then
     cp $PROJECT_DIR/$PROJECT/splash/splash.png $INSTALL/splash
   else
     cp $PKG_DIR/splash/splash.png $INSTALL/splash