diff --git a/README.md b/README.md index b881bb8..b346cbc 100644 --- a/README.md +++ b/README.md @@ -46,10 +46,12 @@ clear && bash manjaro-arm-installer * Khadas Vim 3 (new) * Rock Pi 4 * Pine64-LTS / Sopine +* Pine64+ ## Supported Editions / Desktops: * Minimal (no xorg, no apps) * KDE/Plasma (full plasma desktop with apps) +* XFCE (full XFCE desktop with apps) * LXQT (full LXQT desktop with some qt apps) * Mate (full mate desktop with apps) * CuboCore (base plasma desktop with CoreApps) diff --git a/manjaro-arm-installer b/manjaro-arm-installer index bceaae9..d511af2 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -217,7 +217,7 @@ create_install() { elif [[ "$DEVICE" = "vim3" ]]; then echo "LABEL=BOOT /boot vfat defaults 0 0" | tee --append $TMPDIR/root/etc/fstab 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root systemctl enable bluetooth-khadas.service 1> /dev/null 2>&1 - elif [[ "$DEVICE" = "pinebook" ]]; then + elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine"]] || [[ "$DEVICE" = "pine64" ]]; then $NSPAWN $TMPDIR/root systemctl enable pinebook-post-install.service 1> /dev/null 2>&1 else echo "No device specific setting needed for $DEVICE" @@ -335,7 +335,7 @@ prepare_card () { # For pine devices - elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]]; then + elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]] || [[ "$DEVICE" = "pine64" ]]; then # umount SD card umount ${SDCARD}${SDDEV}1 1> /dev/null 2>&1 umount ${SDCARD}${SDDEV}2 1> /dev/null 2>&1 @@ -429,7 +429,7 @@ cleanup () { partprobe $SDCARD 1> /dev/null 2>&1 # For pinebook device - elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]]; then + elif [[ "$DEVICE" = "pinebook" ]] || [[ "$DEVICE" = "sopine" ]] || [[ "$DEVICE" = "pine64" ]]; then #flash bootloader dd if=$TMPDIR/root/boot/u-boot-sunxi-with-spl-$DEVICE.bin of=${SDCARD} bs=8k seek=1 1> /dev/null 2>&1 @@ -440,7 +440,7 @@ cleanup () { # For rockpro64 device - elif [[ "$DEVICE" = "rock64" ]] || [[ "$DEVICE" = "rockpro64" ]]; then + elif [[ "$DEVICE" = "rock64" ]] || [[ "$DEVICE" = "rockpro64" ]] || [[ "$DEVICE" = "rockpi4" ]]; then #flash bootloader dd if=$TMPDIR/root/boot/idbloader.img of=${SDCARD} seek=64 conv=notrunc 1> /dev/null 2>&1 dd if=$TMPDIR/root/boot/uboot.img of=${SDCARD} seek=16384 conv=notrunc 1> /dev/null 2>&1 @@ -463,6 +463,7 @@ DEVICE=$(dialog --clear --title "Manjaro ARM Installer" \ "rock64" "ROCK64" \ "rockpro64" "ROCKPro64" \ "sopine" "SOPINE / PINE A64-LTS" \ + "pine64" "Pine64+" \ "oc2" "Odroid C2" \ "on2" "Odroid N2" \ "vim3" "Khadas Vim 3" \