From 085738b9a5b46aa3d9f0e4b4340446373d697f25 Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <contact@paulk.fr>
Date: Thu, 26 Jun 2014 00:35:37 +0200
Subject: Continuous splash screen

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 boot-scr/boot.txt | 37 +++++++++----------------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

(limited to 'boot-scr/boot.txt')

diff --git a/boot-scr/boot.txt b/boot-scr/boot.txt
index f972e5c..00fb73f 100644
--- a/boot-scr/boot.txt
+++ b/boot-scr/boot.txt
@@ -1,6 +1,6 @@
 setenv kerneladdr 0x82000000
 setenv splashzipaddr 0x80400000
-setenv splashaddr 0x80800000
+setenv splashaddr 0x86000000
 setenv bootargs mpurate=${mpurate} mux=${mux}
 
 echo "Replicant GTA04"
@@ -12,9 +12,8 @@ if mmc rescan 0
 then
 	# Load splash
 
-	if fatload mmc 0 ${splashzipaddr} splash.rgb16z
+	if fatload mmc 0 ${splashaddr} splash.rgb16
 	then
-		unzip ${splashzipaddr} ${splashaddr}
 		if lcm init
 		then
 			lcm power 2
@@ -23,8 +22,10 @@ then
 			lcm backlight 255
 		fi
 	else
-		if fatload mmc 0 ${splashaddr} splash
+		if fatload mmc 0 ${splashzipaddr} splash.rgb16z
 		then
+			unzip ${splashzipaddr} ${splashaddr}
+
 			if lcm init
 			then
 				lcm power 2
@@ -44,28 +45,18 @@ then
 		if fatload mmc 0 ${kerneladdr} recovery.img
 		then
 			status set 2
-
-			lcm backlight 0
-			lcm power 0
-			lcm off
-
 			bootm ${kerneladdr}
 		else
-			echo "Loading recovery kernel failed"
 			status set 19
+			echo "Loading recovery kernel failed"
 
 			if fatload mmc 0 ${kerneladdr} boot.img
 			then
 				status set 11
-
-				lcm backlight 0
-				lcm power 0
-				lcm off
-
 				bootm ${kerneladdr}
 			else
-				echo "Loading recovery kernel failed"
 				status set 9
+				echo "Loading recovery kernel failed"
 			fi
 		fi
 	fi
@@ -75,28 +66,18 @@ then
 	if fatload mmc 0 ${kerneladdr} boot.img
 	then
 		status set 10
-
-		lcm backlight 0
-		lcm power 0
-		lcm off
-
 		bootm ${kerneladdr}
 	else
-		echo "Loading kernel failed"
 		status set B
+		echo "Loading kernel failed"
 
 		if fatload mmc 0 ${kerneladdr} recovery.img
 		then
 			status set A
-
-			lcm backlight 0
-			lcm power 0
-			lcm off
-
 			bootm ${kerneladdr}
 		else
-			echo "Loading recovery kernel failed"
 			status set 9
+			echo "Loading recovery kernel failed"
 		fi
 	fi
 else
-- 
cgit v1.1