jess
/
manjaro-arm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'mobile-support' 

# Conflicts:
#   README.md
#   manjaro-arm-installer
This commit is contained in:
Dan Johansen 2022-04-06 10:33:12 +00:00
parent d4b1fdcc3b 460e51743f
commit a8daa10a12
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -66,6 +66,7 @@ sudo bash ./manjaro-arm-installer
* Odroid N2+ * Odroid N2+
* Odroid C4 * Odroid C4
* Odroid C2 * Odroid C2
* Odroid HC4
* Pinebook * Pinebook
* Pine64-LTS / Sopine * Pine64-LTS / Sopine
* Pine64+ * Pine64+

5
manjaro-arm-installer
View File

@ -379,7 +379,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/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 dd if=$TMPDIR/boot/u-boot.gxbb of=${SDCARD} conv=fsync bs=512 seek=97 1> /dev/null 2>&1
;; ;;
on2|on2-plus|oc4) on2|on2-plus|oc4|ohc4)
dd if=$TMPDIR/boot/u-boot.bin of=${SDCARD} conv=fsync,notrunc bs=512 seek=1 1> /dev/null 2>&1 dd if=$TMPDIR/boot/u-boot.bin of=${SDCARD} conv=fsync,notrunc bs=512 seek=1 1> /dev/null 2>&1
;; ;;
vim1|vim2|vim3) vim1|vim2|vim3)
@ -523,6 +523,7 @@ DEVICE=$(dialog --clear --title "Manjaro ARM Installer v${VERSION}" \
"on2-plus" "Odroid N2+" \ "on2-plus" "Odroid N2+" \
"oc4" "Odroid C4" \ "oc4" "Odroid C4" \
"oc2" "Odroid C2" \ "oc2" "Odroid C2" \
"ohc4" "Odroid HC4" \
"pinebook" "Pinebook" \ "pinebook" "Pinebook" \
"pine64-lts" "Pine64-LTS / Sopine" \ "pine64-lts" "Pine64-LTS / Sopine" \
"pine64" "Pine64+" \ "pine64" "Pine64+" \
@ -533,7 +534,7 @@ DEVICE=$(dialog --clear --title "Manjaro ARM Installer v${VERSION}" \
"roc-cc" "LibreComputer Renegade" \ "roc-cc" "LibreComputer Renegade" \
"nanopc-t4" "NanoPC T4" \ "nanopc-t4" "NanoPC T4" \
"clockworkpi-a06" "ClockworkPi DevTerm" \ "clockworkpi-a06" "ClockworkPi DevTerm" \
"quartz64-a" "Quartz64 Model A" \ "quartz64-a" "Quartz64 Model A" \
"vim3" "Khadas Vim 3" \ "vim3" "Khadas Vim 3" \
"vim2" "Khadas Vim 2" \ "vim2" "Khadas Vim 2" \
"vim1" "Khadas Vim 1" \ "vim1" "Khadas Vim 1" \