From 2c00e3fcf276ad20f631bcfbb5c1cfa8998a652a Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Mon, 29 Jun 2020 08:16:15 +0200
Subject: [PATCH] move rock64 and roc-cc to regular rockchip uboot flashing
 method, tag 1.3.4

---
 README.md             | 4 +---
 manjaro-arm-installer | 9 ++-------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 67f35d1..1e00e62 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ sudo bash ./manjaro-arm-installer
 * Pine64+
 * Pine H64 (new)
 * Rock64
-* LibreComputer Renegade
+* LibreComputer Renegade (Roc-CC)
 * NanoPC T4 (new)
 * Khadas Vim 3
 * Khadas Vim 2
@@ -90,6 +90,4 @@ sudo bash ./manjaro-arm-installer
 ## Other notes:
 This script is available in the **Manjaro** repository and can be installed with `sudo pacman -S manjaro-arm-installer`.
 
-This script is also available as an **Arch** (*pkg.tar.xz*) package in my **Manjaro Strit** repo, called `manjaro-arm-installer`.
-
 This script **should** be distro-agnostic, which means you can install *Manjaro ARM* from **any** distro, as long as the dependencies are met.
diff --git a/manjaro-arm-installer b/manjaro-arm-installer
index 8495396..0055145 100755
--- a/manjaro-arm-installer
+++ b/manjaro-arm-installer
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # *****************************
-#       Version 1.3.3
+#       Version 1.3.4
 # *****************************
 
 # Set globals
@@ -284,15 +284,10 @@ cleanup () {
     pinebook|pine64-lts|pine64|pinephone|pinetab|pine-h64)
         dd if=$TMPDIR/boot/u-boot-sunxi-with-spl-$DEVICE.bin of=${SDCARD} bs=8k seek=1 1> /dev/null 2>&1
         ;;
-    pbpro|rockpro64|rockpi4|nanopc-t4)
+    pbpro|rockpro64|rockpi4|nanopc-t4|rock64|roc-cc)
         dd if=$TMPDIR/boot/idbloader.img of=${SDCARD} seek=64 conv=notrunc 1> /dev/null 2>&1
         dd if=$TMPDIR/boot/u-boot.itb of=${SDCARD} seek=16384 conv=notrunc 1> /dev/null 2>&1
         ;;
-    rock64|roc-cc)
-        dd if=$TMPDIR/boot/idbloader.img of=${SDCARD} seek=64 conv=notrunc 1> /dev/null 2>&1
-        dd if=$TMPDIR/boot/uboot.img of=${SDCARD} seek=16384 conv=notrunc 1> /dev/null 2>&1
-        dd if=$TMPDIR/boot/trust.img of=${SDCARD} seek=24576 conv=notrunc 1> /dev/null 2>&1
-        ;;
     esac
 
 	[ ! -z "$CRYPT" ] && post_crypt