From 163e811dd7a4de42fa2b6cb5197cb5bbf46f7a6a Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Tue, 24 Aug 2021 21:28:00 +0800
Subject: [PATCH 1/2] cleanup build script

---
 buildpush.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/buildpush.sh b/buildpush.sh
index 34605f605..416f50c68 100755
--- a/buildpush.sh
+++ b/buildpush.sh
@@ -107,22 +107,21 @@ fi
 # case of no private key specified
 if [ $USE_USB -eq 1 ]
 then
-    if [ $UPDATE_FPGA -eq 1 ]
-    then
-      echo "Burning FPGA image"
-      sudo wishbone-tool $CSR_CSV --load-name $FPGA_IMAGE --load-address 0x0 --load-flash
-      echo "*** Manual power cycle required to reload SoC FPGA configuration ***"
-      echo " -> Either issue a power cycle command, or insert paper clip in the hole on the right hand side!"
-    fi
     if [ $UPDATE_LOADER -eq 1 ]
     then
       echo "Burning loader"
-      sudo wishbone-tool $CSR_CSV --load-name $LOADER_IMAGE --load-address 0x500000 --load-flash
+      cd tools && ./usb_update.py -l
     fi
     if [ $UPDATE_KERNEL -eq 1 ]
     then
       echo "Burning kernel"
-      sudo wishbone-tool $CSR_CSV --load-name $KERNEL_IMAGE --load-address 0x980000 --load-flash
+      cd tools && ./usb_update.py -k
+    fi
+    if [ $UPDATE_FPGA -eq 1 ]
+    then
+	echo "Burning FPGA image"
+	cd tools && ./usb_update.py -s
+	echo "*** Select 'Install gateware update' from the main menu to apply the update with your root keys ***"
     fi
 else
 

From 99ff36f5293e3766a3451682aa8ac9dd114db17e Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Tue, 24 Aug 2021 22:37:31 +0800
Subject: [PATCH 2/2] add a quick CI update script

---
 tools/update_ci.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100755 tools/update_ci.sh

diff --git a/tools/update_ci.sh b/tools/update_ci.sh
new file mode 100755
index 000000000..37681fa22
--- /dev/null
+++ b/tools/update_ci.sh
@@ -0,0 +1,14 @@
+#!/bin/bash set -e
+
+wget https://ci.betrusted.io/latest-ci/loader.bin -O /tmp/loader.bin
+./usb_update.py -s /tmp/loader.bin
+rm /tmp/loader.bin
+
+wget https://ci.betrusted.io/latest-ci/xous.img -O /tmp/xous.img
+./usb_update.py -k /tmp/xous.img
+rm /tmp/xous.img
+
+wget https://ci.betrusted.io/latest-ci/soc_csr.bin -O /tmp/soc_csr.bin
+./usb_update.py -s /tmp/soc_csr.bin
+rm /tmp/soc_csr.bin
+