From c8f8ed883906229e48b147fce10bf452ab1ae874 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 10 Aug 2015 15:09:15 +0200
Subject: [PATCH] add cfgresetusb uboot script

---
 Makefile                         |   7 ++++++-
 dist/README                      |   5 ++++-
 dist/idl4k.cfgresetusb           | Bin 0 -> 203 bytes
 patches/uboot-cfgresetusb.script |   3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 dist/idl4k.cfgresetusb
 create mode 100644 patches/uboot-cfgresetusb.script

diff --git a/Makefile b/Makefile
index 79063977..a71686c6 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ endef
 all: kernel-axe-modules kernel
 
 .PHONY: release
-release: kernel-axe-modules out/idl4k.scr out/idl4k.cfgreset out/idl4k.recovery
+release: kernel-axe-modules out/idl4k.scr out/idl4k.cfgreset out/idl4k.cfgresetusb out/idl4k.recovery
 	-ls -la out
 
 .PHONY: dist
@@ -151,6 +151,11 @@ out/idl4k.cfgreset: patches/uboot-cfgreset.script
 	  -n 'Reset satip-axe fw configuration' \
 	  -d patches/uboot-cfgreset.script out/idl4k.cfgreset
 
+out/idl4k.cfgresetusb: patches/uboot-cfgresetusb.script
+	$(TOOLPATH)/mkimage -T script -C none \
+	  -n 'Reset satip-axe fw configuration (USB)' \
+	  -d patches/uboot-cfgresetusb.script out/idl4k.cfgresetusb
+
 out/idl4k.recovery: patches/uboot-recovery.script
 	$(TOOLPATH)/mkimage -T script -C none \
 	  -n 'Restore original idl4k fw' \
diff --git a/dist/README b/dist/README
index 704e7571..3b8aa6c6 100644
--- a/dist/README
+++ b/dist/README
@@ -102,7 +102,10 @@ Misc:
 Recovery from the wrong configuration:
 
   - it works with firmware build 10 and later
-  - copy idl4k.cfgreset file as idl4k.scr file to the root directory on the USB stick
+  - for flashed firmware:
+    - copy idl4k.cfgreset file as idl4k.scr file to the root directory on the USB stick
+  - for firmare on the USB stick:
+    - copy idl4k.cfgresetusb file as idl4k.scr file to the root directory on the USB stick
   - plug the USB stick to the upper USB port in box
   - turn on the box
   - the old configuration file is moved to /etc/sysconfig/config.old
diff --git a/dist/idl4k.cfgresetusb b/dist/idl4k.cfgresetusb
new file mode 100644
index 0000000000000000000000000000000000000000..20a92e1dd98cc31de5514bad3ee27151e7337432
GIT binary patch
literal 203
zcmY#ql??mnbhjb&#KP|k3=G{s3<m5v!IrG-Yz#rE#i=C<#fc@E1-gk9sS0W33d#9-
zX_@JzML@CqJfPxckcPCxlAQd+6ot~_Bn1Nn6%ac<F(su4p;gx*%rz+3)8EfQFRh#l
zWNK1=eo10cdNIhv;{2Rc+mez>$6x~;Lqk&|0|SMm%=Chc%HqVL)I?h#A1DHJKyq5T
QZ4t;#Tp-=KNH%c+0JH}{fdBvi

literal 0
HcmV?d00001

diff --git a/patches/uboot-cfgresetusb.script b/patches/uboot-cfgresetusb.script
new file mode 100644
index 00000000..8f68242b
--- /dev/null
+++ b/patches/uboot-cfgresetusb.script
@@ -0,0 +1,3 @@
+fatload usb 0 $load_addr satip-axe-@VERSION@.fw
+set bootargs console=ttyAS0,115200 bigphysarea=20000 axecfg=reset
+bootm $load_addr