From d8c56988abed466958564c0f365856f69f807f5f Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Thu, 13 Aug 2020 13:29:58 +0200
Subject: [PATCH] add support for Rock Pi 4C and Odroid N2+

---
 README.md             |  8 +++---
 manjaro-arm-installer | 58 ++++++++++++++++++++++---------------------
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 2e29f57..e0473b1 100644
--- a/README.md
+++ b/README.md
@@ -61,17 +61,19 @@ sudo bash ./manjaro-arm-installer
 * Raspberry Pi 4 (and 3)
 * Pinebook Pro
 * RockPro64
-* Rock Pi 4 (model B)
+* Rock Pi 4B
+* Rock Pi 4C (new)
 * Odroid N2
+* Odroid N2+ (new)
 * Odroid C4
 * Odroid C2
 * Pinebook
 * Pine64-LTS / Sopine
 * Pine64+
-* Pine H64 (new)
+* Pine H64
 * Rock64
 * LibreComputer Renegade (Roc-CC)
-* NanoPC T4 (new)
+* NanoPC T4
 * Khadas Vim 3
 * Khadas Vim 2
 * Khadas Vim 1
diff --git a/manjaro-arm-installer b/manjaro-arm-installer
index b04f658..c2a173a 100755
--- a/manjaro-arm-installer
+++ b/manjaro-arm-installer
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # *****************************
-#       Version 1.3.4
+#       Version 1.3.5
 # *****************************
 
 # Set globals
@@ -274,7 +274,7 @@ cleanup () {
         dd if=$TMPDIR/boot/bl1.bin.hardkernel of=${SDCARD} conv=fsync bs=512 skip=1 seek=1 1> /dev/null 2>&1
         dd if=$TMPDIR/boot/u-boot.gxbb of=${SDCARD} conv=fsync bs=512 seek=97 1> /dev/null 2>&1
         ;;
-    on2|oc4)
+    on2|on2-plus|oc4)
         dd if=$TMPDIR/boot/u-boot.bin of=${SDCARD} conv=fsync,notrunc bs=512 seek=1 1> /dev/null 2>&1
         ;;
     vim1|vim2|vim3)
@@ -284,7 +284,7 @@ cleanup () {
     pinebook|pine64-lts|pine64|pinephone|pinetab|pine-h64)
         dd if=$TMPDIR/boot/u-boot-sunxi-with-spl-$DEVICE.bin of=${SDCARD} conv=fsync bs=8k seek=1 1> /dev/null 2>&1
         ;;
-    pbpro|rockpro64|rockpi4|nanopc-t4|rock64|roc-cc)
+    pbpro|rockpro64|rockpi4b|rockpi4c|nanopc-t4|rock64|roc-cc)
         dd if=$TMPDIR/boot/idbloader.img of=${SDCARD} seek=64 conv=notrunc,fsync 1> /dev/null 2>&1
         dd if=$TMPDIR/boot/u-boot.itb of=${SDCARD} seek=16384 conv=notrunc,fsync 1> /dev/null 2>&1
         ;;
@@ -339,23 +339,25 @@ post_crypt () {
 # Using Dialog to ask for user input for variables
 DEVICE=$(dialog --clear --title "Manjaro ARM Installer" \
         --menu "Choose a device:" 20 75 10 \
-        "rpi4"      "Raspberry Pi 4 (and 3)" \
-        "pbpro"     "Pinebook Pro" \
-		"rockpro64" "RockPro64" \
-		"rockpi4"   "Rock Pi 4" \
-		"on2"       "Odroid N2" \
-		"oc4"		"Odroid C4" \
-		"oc2"       "Odroid C2" \
-		"pinebook"  "Pinebook" \
-		"pine64-lts"    "Pine64-LTS / Sopine" \
-		"pine64"    "Pine64+" \
-		"pine-h64"	"Pine H64" \
-		"rock64"    "Rock64" \
-		"roc-cc"	"LibreComputer Renegade" \
-		"nanopc-t4"	"NanoPC T4" \
-		"vim3"      "Khadas Vim 3" \
-		"vim2"		"Khadas Vim 2" \
-		"vim1"      "Khadas Vim 1" \
+        "rpi4"       "Raspberry Pi 4 (and 3)" \
+        "pbpro"      "Pinebook Pro" \
+		"rockpro64"  "RockPro64" \
+		"rockpi4b"   "Rock Pi 4B" \
+		"rockpi4c"   "Rock Pi 4C" \
+		"on2"        "Odroid N2" \
+		"on2-plus"   "Odroid N2+" \
+		"oc4"		 "Odroid C4" \
+		"oc2"        "Odroid C2" \
+		"pinebook"   "Pinebook" \
+		"pine64-lts" "Pine64-LTS / Sopine" \
+		"pine64"     "Pine64+" \
+		"pine-h64"	 "Pine H64" \
+		"rock64"     "Rock64" \
+		"roc-cc"	 "LibreComputer Renegade" \
+		"nanopc-t4"	 "NanoPC T4" \
+		"vim3"       "Khadas Vim 3" \
+		"vim2"		 "Khadas Vim 2" \
+		"vim1"       "Khadas Vim 1" \
 		3>&1 1>&2 2>&3 3>&-)
 
 
@@ -363,15 +365,15 @@ DEVICE=$(dialog --clear --title "Manjaro ARM Installer" \
 if [ ! -z "$DEVICE" ]; then
 	EDITION=$(dialog --clear --title "Manjaro ARM Installer" \
 		--menu "Choose an edition:" 20 75 10 \
-		"minimal"   "Minimal Edition            (only CLI)" \
+		"minimal"    "Minimal Edition            (only CLI)" \
 		"kde-plasma" "Full KDE/Plasma Desktop    (full featured)" \
-		"xfce"      "Full XFCE desktop and apps (full featured)" \
-		"mate"      "Full MATE desktop and apps (lightweight)" \
-		"lxqt"      "Full LXQT Desktop and apps (lightweight)" \
-		"i3"        "Mininal i3 WM with apps    (very light)" \
-		"sway"		"Minimal Sway WM with apps  (very light)" \
-		"cubocore"  "QT based Desktop           (lightweight)" \
-		"gnome"     "Full Gnome desktop and apps (EXPERIMANTAL)" \
+		"xfce"       "Full XFCE desktop and apps (full featured)" \
+		"mate"       "Full MATE desktop and apps (lightweight)" \
+		"lxqt"       "Full LXQT Desktop and apps (lightweight)" \
+		"i3"         "Mininal i3 WM with apps    (very light)" \
+		"sway"		 "Minimal Sway WM with apps  (very light)" \
+		"cubocore"   "QT based Desktop           (lightweight)" \
+		"gnome"      "Full Gnome desktop and apps (EXPERIMANTAL)" \
 		3>&1 1>&2 2>&3 3>&-) 
 
 else