From f12a7498d9cdc48bf4fff7f57e226c9f98b0805a Mon Sep 17 00:00:00 2001
From: Joo Aun Saw <jasaw@dius.com.au>
Date: Fri, 4 Jan 2019 15:49:08 +1100
Subject: [PATCH 1/3] fwupdate: upgrade from local file first if exists

---
 board/common/overlay/sbin/fwupdate | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/board/common/overlay/sbin/fwupdate b/board/common/overlay/sbin/fwupdate
index 0a07aac2ce..7e44a7f642 100755
--- a/board/common/overlay/sbin/fwupdate
+++ b/board/common/overlay/sbin/fwupdate
@@ -112,6 +112,26 @@ function do_download() {
     rm -f $FW_DIR/$FW_FILE_GZ $FW_DIR/$FW_FILE_XZ
     rm -f $FW_DIR/$FW_FILE_EXTR
     rm -f $FW_DIR/$BOOT_READY_FILE
+    rm -rf $FW_DIR/*
+    mkdir -p $FW_DIR
+
+	# Look for local file first
+    if [ -f "$1" ]; then
+        version="custom"
+        FNAME=`basename $1`
+        FILEEXT=${FNAME##*.}
+		DST_FNAME=""
+        if [ "$FILEEXT" == "xz" ]; then
+            DST_FNAME="$FW_DIR/$FW_FILE_XZ"
+        elif [ "$FILEEXT" == "gz" ]; then
+            DST_FNAME="$FW_DIR/$FW_FILE_GZ"
+        fi
+		if [ -n "$DST_FNAME" ]; then
+            cp -f $1 $DST_FNAME
+			echo $version > $FW_DIR/$VER_FILE
+			return
+		fi
+    fi
 
     source $OS_CONF
     board=$(cat $SYS_BOARD_FILE)
@@ -141,8 +161,6 @@ function do_download() {
         outfile=$FW_DIR/$FW_FILE_XZ
     fi
 
-    rm -rf $FW_DIR/*
-    mkdir -p $FW_DIR
     echo $version > $FW_DIR/$VER_FILE
 
     curl_opts="-S -f -L"

From 353bfd21a54ba7872179360024fce92a735b888b Mon Sep 17 00:00:00 2001
From: Joo Aun Saw <jasaw@dius.com.au>
Date: Fri, 4 Jan 2019 16:42:29 +1100
Subject: [PATCH 2/3] fwupdate: fixed indentation

---
 board/common/overlay/sbin/fwupdate | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/board/common/overlay/sbin/fwupdate b/board/common/overlay/sbin/fwupdate
index 7e44a7f642..c3a2f0dcde 100755
--- a/board/common/overlay/sbin/fwupdate
+++ b/board/common/overlay/sbin/fwupdate
@@ -115,22 +115,22 @@ function do_download() {
     rm -rf $FW_DIR/*
     mkdir -p $FW_DIR
 
-	# Look for local file first
+    # Look for local file first
     if [ -f "$1" ]; then
         version="custom"
         FNAME=`basename $1`
         FILEEXT=${FNAME##*.}
-		DST_FNAME=""
+        DST_FNAME=""
         if [ "$FILEEXT" == "xz" ]; then
             DST_FNAME="$FW_DIR/$FW_FILE_XZ"
         elif [ "$FILEEXT" == "gz" ]; then
             DST_FNAME="$FW_DIR/$FW_FILE_GZ"
         fi
-		if [ -n "$DST_FNAME" ]; then
+        if [ -n "$DST_FNAME" ]; then
             cp -f $1 $DST_FNAME
-			echo $version > $FW_DIR/$VER_FILE
-			return
-		fi
+            echo $version > $FW_DIR/$VER_FILE
+            return
+        fi
     fi
 
     source $OS_CONF

From 6945f998a57bb62ed9e28c441ebb2252d9b02822 Mon Sep 17 00:00:00 2001
From: Joo Aun Saw <jasaw@dius.com.au>
Date: Tue, 8 Jan 2019 00:10:19 +1100
Subject: [PATCH 3/3] fwupdate: remove redundant rm commands

---
 board/common/overlay/sbin/fwupdate | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/board/common/overlay/sbin/fwupdate b/board/common/overlay/sbin/fwupdate
index c3a2f0dcde..51c8c531aa 100755
--- a/board/common/overlay/sbin/fwupdate
+++ b/board/common/overlay/sbin/fwupdate
@@ -109,9 +109,6 @@ function show_current() {
 function do_download() {
     echo "downloading..."
 
-    rm -f $FW_DIR/$FW_FILE_GZ $FW_DIR/$FW_FILE_XZ
-    rm -f $FW_DIR/$FW_FILE_EXTR
-    rm -f $FW_DIR/$BOOT_READY_FILE
     rm -rf $FW_DIR/*
     mkdir -p $FW_DIR