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

Update for pi5 

Added testing/unstable usage thanks to @linux-aarhus
This commit is contained in:
Ray Sherwin 2023-11-12 06:50:37 -06:00
parent 40543f9fcf
commit 42a02a813d
2 changed files with 68 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -51,7 +51,9 @@ Then use this to get it:
git clone https://gitlab.manjaro.org/manjaro-arm/applications/manjaro-arm-installer
cd manjaro-arm-installer
chmod +x manjaro-arm-installer
sudo bash ./manjaro-arm-installer
sudo bash ./manjaro-arm-installer (Use Default stable branch)
sudo bash ./manjaro-arm-installer arm-testing (Use testing branch)
sudo bash ./manjaro-arm-installer arm-unstable (Use unstable branch)
```
## Known Issues:
@ -78,7 +80,7 @@ sudo bash ./manjaro-arm-installer
* Pinebook Pro
* PineTab
* Radxa Zero
* Raspberry Pi 4/400/3+/3
* Raspberry Pi 5/4's/3's/zero2w
* Rock 3A (new)
* Rock64
* Rock Pi 4B

82
manjaro-arm-installer
View File

@ -17,6 +17,10 @@ else
export DIALOGRC="/etc/manjaro-arm-installer/dialogrc_gui"
fi
BRANCH="arm-stable"
if [[ -n $1 ]]; then
BRANCH=$1
fi
# clearing variables
DEVICE=""
EDITION=""
@ -140,6 +144,8 @@ create_install() {
$NSPAWN $TMPDIR/root pacman-key --init 1> /dev/null 2>&1
$NSPAWN $TMPDIR/root pacman-key --populate archlinuxarm manjaro manjaro-arm 1> /dev/null 2>&1
info "Setting target branch ${BRANCH}..."
sed -i 's|^Branch.*|Branch = '${BRANCH}'|' $TMPDIR/root/etc/pacman-mirrors.conf
info "Generating mirrorlist..."
$NSPAWN $TMPDIR/root pacman-mirrors -f10 1> /dev/null 2>&1
@ -511,23 +517,63 @@ cleanup () {
echo "root=PARTUUID=$ROOT_PARTUUID rw rootwait console=serial0,115200 console=tty3 selinux=0 quiet splash plymouth.ignore-serial-consoles smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 kgdboc=serial0,115200 usbhid.mousepoll=8 audit=0" > $TMPDIR/boot/cmdline.txt
fi
if [[ "$DEVICE" = "rpi4" ]]; then
echo "===> Installing default config.txt file to /boot/..."
echo "# See /boot/overlays/README for all available options" > $TMPDIR/boot/config.txt
echo "" >> $TMPDIR/boot/config.txt
echo "#gpu_mem=64" >> $TMPDIR/boot/config.txt
echo "initramfs initramfs-linux.img followkernel" >> $TMPDIR/boot/config.txt
echo "kernel=kernel8.img" >> $TMPDIR/boot/config.txt
echo "arm_64bit=1" >> $TMPDIR/boot/config.txt
echo "disable_overscan=1" >> $TMPDIR/boot/config.txt
echo "" >> $TMPDIR/boot/config.txt
echo "#enable sound" >> $TMPDIR/boot/config.txt
echo "dtparam=audio=on" >> $TMPDIR/boot/config.txt
echo "#hdmi_drive=2" >> $TMPDIR/boot/config.txt
echo "" >> $TMPDIR/boot/config.txt
echo "#enable vc4" >> $TMPDIR/boot/config.txt
echo "dtoverlay=vc4-kms-v3d" >> $TMPDIR/boot/config.txt
echo "max_framebuffers=2" >> $TMPDIR/boot/config.txt
echo "disable_splash=1" >> $TMPDIR/boot/config.txt
echo "===> Installing default /boot/config.txt file..."
echo "# See /boot/overlays/README for all available options
# Uncomment some or all of these to enable optional Hardware interfaces
#dtparam=i2c_arm=on
#dtparam=i2s=on
#dtparam=spi=on
# Run in 64bit mode
arm_64bit=1
# Auto load correct initramfs files if found
auto_initramfs=1
# Run as fast as the firmware/board allows
arm_boost=1
# Disable compensation for displays with overscan
disable_overscan=1
# Enable sound
dtparam=audio=on
# Uncomment if no sound thru hdmi
#hdmi_drive=2
# Auto load overlays for detected cameras
camera_auto_detect=1
# Auto load overlays for detected DSI displays
display_auto_detect=1
# Enable DRM VC4 V3D driver
dtoverlay=vc4-kms-v3d
# For pi4's and above boards uncomment next line & Comment out above line
#dtoverlay=vc4-kms-v3d,cma-512
max_framebuffers=2
# Don't have the firmware create an initial video= setting in cmdline.txt
# Use the kernel default instead
#disable_fw_kms_setup=1
# Disable rainbow screen at boot
disable_splash=1
# RPi 5B/4B/400 ONLY
# For 4k content @ 60 Hz refresh rate, uncomment hdmi_enable_4kp60=1
#hdmi_enable_4kp60=1
# If video breaks with hdmi_enable_4kp60=1 uncomment
#force_turbo=1
[cm4]
# Enable host mode on the 2711 built-in XHCI USB controller
# This line should be remoed if the legacy DWC2 controller is required
otg_mode=1
[all]" > $TMPDIR/boot/config.txt
fi
case "$FSTYPE" in
@ -733,7 +779,7 @@ DEVICE=$(dialog --clear --title "Manjaro ARM Installer v${VERSION}" \
"pbpro" "Pinebook Pro" \
"pinetab" "PineTab" \
"radxa-zero" "Radxa Zero" \
"rpi4" "Raspberry Pi 4/400/3+/3" \
"rpi4" "Raspberry Pi 5/4's/3's/zero2w" \
"rock3a" "Rock 3A" \
"rock64" "Rock64" \
"rockpi4b" "Rock Pi 4B" \