diff --git a/projects/ROCKNIX/config.xml b/projects/ROCKNIX/config.xml index 45cc338958c..5b9f451e3f3 100644 --- a/projects/ROCKNIX/config.xml +++ b/projects/ROCKNIX/config.xml @@ -106,7 +106,7 @@ sm6115-mangmi-air-x-mq66b sm6115-mangmi-air-x-mq65 - + sm8250-retroidpocket-rp5 sm8250-retroidpocket-flip2 sm8250-retroidpocket-rpmini diff --git a/projects/ROCKNIX/devices/SM8250/bootloader/update.sh b/projects/ROCKNIX/devices/SM8250/bootloader/update.sh index e2b33ef378f..8e11e637ee8 100755 --- a/projects/ROCKNIX/devices/SM8250/bootloader/update.sh +++ b/projects/ROCKNIX/devices/SM8250/bootloader/update.sh @@ -22,43 +22,13 @@ if [ -d "$SYSTEM_ROOT/usr/share/bootloader/rocknix_abl" ]; then cp $SYSTEM_ROOT/usr/share/bootloader/rocknix_abl/* $BOOT_ROOT/rocknix_abl fi -if [ -f "$SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi" ]; then - if [ ! -f "$BOOT_ROOT/EFI/BOOT/bootaa64.efi" ]; then - mkdir -p $BOOT_ROOT/EFI/BOOT - echo "Installing GRUB..." - cp $SYSTEM_ROOT/usr/share/bootloader/EFI/BOOT/bootaa64.efi $BOOT_ROOT/EFI/BOOT - fi -fi - -if [ -d "$SYSTEM_ROOT/usr/share/bootloader/boot/grub" ]; then - mkdir -p $BOOT_ROOT/boot/grub - echo "Updating grub dtbs..." - cp $SYSTEM_ROOT/usr/share/bootloader/boot/grub/*.dtb $BOOT_ROOT/boot/grub -fi - -if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg" ]; then - mkdir -p $BOOT_ROOT/boot/grub - echo "Updating grub.cfg..." - cp $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg $BOOT_ROOT/boot/grub - # Old GRUB installations - if [ -f "$BOOT_ROOT/EFI/BOOT/grub.cfg" ]; then - cp $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grub.cfg $BOOT_ROOT/EFI/BOOT - fi -fi - -if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2" ]; then - mkdir -p $BOOT_ROOT/boot/grub - echo "Updating dejavu-mono.pf2..." - cp $SYSTEM_ROOT/usr/share/bootloader/boot/grub/dejavu-mono.pf2 $BOOT_ROOT/boot/grub -fi +$SYSTEM_ROOT/usr/bin/updateabl -if [ -f "$SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv" ]; then - if [ ! -f "$BOOT_ROOT/boot/grub/grubenv" ]; then - mkdir -p $BOOT_ROOT/boot/grub - echo "Installing grubenv..." - cp $SYSTEM_ROOT/usr/share/bootloader/boot/grub/grubenv $BOOT_ROOT/boot/grub - fi -fi +### REMOVE IN THE FUTURE ### +# cleanup old boot files +[ -d "$BOOT_ROOT/boot" ] && rm -rf "$BOOT_ROOT/boot" +[ -d "$BOOT_ROOT/EFI" ] && rm -rf "$BOOT_ROOT/EFI" +# end # mount $BOOT_ROOT ro sync diff --git a/projects/ROCKNIX/devices/SM8250/options b/projects/ROCKNIX/devices/SM8250/options index 28f21fb1b4e..9dc91ee03f9 100644 --- a/projects/ROCKNIX/devices/SM8250/options +++ b/projects/ROCKNIX/devices/SM8250/options @@ -31,7 +31,7 @@ EXTRA_CMDLINE="quiet rootwait console=tty0 video=efifb:off gpt" # Bootloader to use (syslinux / u-boot) - BOOTLOADER="arm-efi" + BOOTLOADER="qcom-abl" # Adreno GPU family GRAPHIC_DRIVERS="freedreno"