Add recovery support to u-boot

Change-Id: I9abe77d04569171cbcadf82e437e23de14322551
Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>

2 files changed, 38 insertions, 0 deletions

diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch
new file mode 100644
index 0000000..d1f5616
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch
@@ -0,0 +1,37 @@
+From 33a5a73cd846c0bbf6a507aa4e658c74815eb1d7 Mon Sep 17 00:00:00 2001
+From: Rainer Keller <Rainer.Keller@qt.io>
+Date: Wed, 4 May 2016 12:49:40 +0200
+Subject: [PATCH] Add recovery support
+
+---
+ include/configs/nitrogen6x.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
+index bbc613d..9c939e6 100644
+--- a/include/configs/nitrogen6x.h
++++ b/include/configs/nitrogen6x.h
+@@ -232,6 +232,11 @@
+        "clearenv=if sf probe || sf probe || sf probe 1 ; then " \
+                "sf erase 0xc0000 0x2000 && " \
+                "echo restored environment to factory default ; fi\0" \
++       "recovery_boot=setenv recovery true ; dtype=mmc ; setenv bootpart 3 ; " \
++               "for disk in 0 1 ; do " \
++                       "${dtype} dev ${disk} ; " \
++                       "load ${dtype} ${disk}:${bootpart} 10008000 /6x_bootscript && source 10008000 ; " \
++               "done\0" \
+        "bootcmd=for dtype in ${bootdevs}" \
+                "; do " \
+                        "if itest.s \"xusb\" == \"x${dtype}\" ; then " \
+@@ -245,6 +250,8 @@
+                                        "&& source 10008000 ; " \
+                        "done ; " \
+                "done; " \
++               "echo Startup failed, running recovery ; " \
++    "run recovery_boot ; " \
+                "setenv stdout serial,vga ; " \
+                "echo ; echo 6x_bootscript not found ; " \
+                "echo ; echo serial console at 115200, 8N1 ; echo ; " \
+-- 
+2.7.3
+
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
index 7487f7d..a012358 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend
@@ -22,4 +22,5 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-Add-support-for-KOE-tx31d200vm0baa-display.patch \
+        file://0002-Add-recovery-support.patch \
         "