From dd9c6a9398ad5cbc67983c3356f834da5f61dcb8 Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <contact@paulk.fr>
Date: Tue, 24 Jun 2014 14:46:45 +0200
Subject: Separate light indications for kernel and recovery kernel booting

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 boot-scr/boot.txt | 35 +++++++++++++++++++++++++----------
 x-loader          |  1 +
 2 files changed, 26 insertions(+), 10 deletions(-)
 create mode 160000 x-loader

diff --git a/boot-scr/boot.txt b/boot-scr/boot.txt
index 9cdaf10..f972e5c 100644
--- a/boot-scr/boot.txt
+++ b/boot-scr/boot.txt
@@ -1,15 +1,12 @@
 setenv kerneladdr 0x82000000
 setenv splashzipaddr 0x80400000
 setenv splashaddr 0x80800000
-setenv status_loading 'status set 18'
-setenv status_load_success 'status set 10'
-setenv status_load_error 'status set 8'
 setenv bootargs mpurate=${mpurate} mux=${mux}
 
 echo "Replicant GTA04"
-run status_loading
 
 i2c dev 0
+status init
 
 if mmc rescan 0
 then
@@ -42,9 +39,11 @@ then
 
 	if status check 1 || ext4load mmc 0:3 ${kerneladdr} .startrecovery
 	then
+		status set 3
+
 		if fatload mmc 0 ${kerneladdr} recovery.img
 		then
-			run status_load_success
+			status set 2
 
 			lcm backlight 0
 			lcm power 0
@@ -53,13 +52,29 @@ then
 			bootm ${kerneladdr}
 		else
 			echo "Loading recovery kernel failed"
-			run status_load_error
+			status set 19
+
+			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
+			fi
 		fi
 	fi
 
+	status set 18
+
 	if fatload mmc 0 ${kerneladdr} boot.img
 	then
-		run status_load_success
+		status set 10
 
 		lcm backlight 0
 		lcm power 0
@@ -68,11 +83,11 @@ then
 		bootm ${kerneladdr}
 	else
 		echo "Loading kernel failed"
-		run status_load_error
+		status set B
 
 		if fatload mmc 0 ${kerneladdr} recovery.img
 		then
-			run status_load_success
+			status set A
 
 			lcm backlight 0
 			lcm power 0
@@ -81,7 +96,7 @@ then
 			bootm ${kerneladdr}
 		else
 			echo "Loading recovery kernel failed"
-			run status_load_error
+			status set 9
 		fi
 	fi
 else
diff --git a/x-loader b/x-loader
new file mode 160000
index 0000000..d77b483
--- /dev/null
+++ b/x-loader
@@ -0,0 +1 @@
+Subproject commit d77b483ab5bbd79ebf5e39ed0ee297e68145a297
-- 
cgit v1.1