From 8f1bf6c25cb7be9c7e01343f8046d23f15736afc Mon Sep 17 00:00:00 2001
From: Russ Bernhardt <retro486@outlook.com>
Date: Sun, 25 Oct 2020 16:35:33 -0700
Subject: [PATCH 1/3] Update suzu.json config to make use of new
 manual_download functionality and flash in a working order.

---
 v1/suzu.json | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/v1/suzu.json b/v1/suzu.json
index 8fe50c2f..ba75ebf4 100644
--- a/v1/suzu.json
+++ b/v1/suzu.json
@@ -3,6 +3,7 @@
   "codename": "suzu",
   "unlock": ["confirm_model", "upgrade_android"],
   "user_actions": {
+    
     "recovery": {
       "title": "Reboot to Recovery",
       "description": "With the device powered off, hold Volume Down + Power.",
@@ -60,6 +61,19 @@
       ],
       "prerequisites": [],
       "steps": [
+        {
+          "type": "manual_download",
+          "condition": {"var": "bootstrap", "value": true},
+          "group": "firmware",
+          "file": {
+            "name": "SW_binaries_for_Xperia_AOSP_N_MR1_5.7_r1_v08_loire.img",
+            "url": "https://developer.sony.com/file/download/software-binaries-for-aosp-nougat-android-7-1-kernel-4-4-loire/",
+            "checksum": {
+              "sum": "38fe0b6a72f4f2373529f29b12cba010a987cb3fa9417aebd7e3279eeea0798e",
+              "algorithm": "sha256"
+            }
+          }
+        },
         {
           "type": "download",
           "condition": {"var": "bootstrap", "value": true},
@@ -77,6 +91,23 @@
           "to_state": "bootloader",
           "fallback_user_action": "bootloader"
         },
+        {
+          "type": "fastboot:flash",
+          "condition": {"var": "bootstrap", "value": true},
+          "flash": [
+            {
+              "partition": "oem",
+              "file": "SW_binaries_for_Xperia_AOSP_N_MR1_5.7_r1_v08_loire.img",
+              "group": "firmware",
+              "raw": true
+            }
+          ]
+        },
+        {
+          "type": "fastboot:erase",
+          "condition": {"var": "bootstrap", "value": true},
+          "partition": "system"
+        },
         {
           "type": "fastboot:flash",
           "condition": {"var": "bootstrap", "value": true},

From b2f335100b7349d78a83de8a01fa0a26e67ce1b4 Mon Sep 17 00:00:00 2001
From: Russ Bernhardt <retro486@outlook.com>
Date: Sun, 25 Oct 2020 17:17:42 -0700
Subject: [PATCH 2/3] Had the wrong file open in my editor... This is the
 actual fixed copy.

---
 v1/suzu.json | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/v1/suzu.json b/v1/suzu.json
index ba75ebf4..b6a8e19c 100644
--- a/v1/suzu.json
+++ b/v1/suzu.json
@@ -92,21 +92,19 @@
           "fallback_user_action": "bootloader"
         },
         {
-          "type": "fastboot:flash",
+          "type": "fastboot:erase",
           "condition": {"var": "bootstrap", "value": true},
-          "flash": [
-            {
-              "partition": "oem",
-              "file": "SW_binaries_for_Xperia_AOSP_N_MR1_5.7_r1_v08_loire.img",
-              "group": "firmware",
-              "raw": true
-            }
-          ]
+          "partition": "system"
         },
         {
           "type": "fastboot:erase",
           "condition": {"var": "bootstrap", "value": true},
-          "partition": "system"
+          "partition": "cache"
+        },
+        {
+          "type": "fastboot:erase",
+          "condition": {"var": "wipe", "value": true},
+          "partition": "userdata"
         },
         {
           "type": "fastboot:flash",
@@ -122,19 +120,14 @@
               "partition": "recovery",
               "file": "halium-unlocked-recovery_suzu.img",
               "group": "firmware"
+            },
+            {
+              "partition": "oem",
+              "file": "SW_binaries_for_Xperia_AOSP_N_MR1_5.7_r1_v08_loire.img",
+              "group": "firmware"
             }
           ]
         },
-        {
-          "type": "fastboot:erase",
-          "condition": {"var": "bootstrap", "value": true},
-          "partition": "cache"
-        },
-        {
-          "type": "fastboot:erase",
-          "condition": {"var": "wipe", "value": true},
-          "partition": "userdata"
-        },
         {
           "type": "fastboot:reboot",
           "fallback_user_action": "boot",

From b63a3460074b6cd26675eb4f6400449cf07fc8c2 Mon Sep 17 00:00:00 2001
From: Russ Bernhardt <retro486@outlook.com>
Date: Sun, 25 Oct 2020 17:18:52 -0700
Subject: [PATCH 3/3] Remove superflous newline.

---
 v1/suzu.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/v1/suzu.json b/v1/suzu.json
index b6a8e19c..001f5696 100644
--- a/v1/suzu.json
+++ b/v1/suzu.json
@@ -3,7 +3,6 @@
   "codename": "suzu",
   "unlock": ["confirm_model", "upgrade_android"],
   "user_actions": {
-    
     "recovery": {
       "title": "Reboot to Recovery",
       "description": "With the device powered off, hold Volume Down + Power.",