From b8a59da141dddc1032eed7e0e55519b66fae0ac2 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 18 Oct 2022 19:38:06 +0200
Subject: [PATCH] add U-Boot support for aarch64 in setup script

---
 usr/lib/archboot/installer/bootloader.sh | 8 ++++++--
 usr/lib/archboot/iso.sh                  | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh
index 19b65939b..8625e2cc1 100644
--- a/usr/lib/archboot/installer/bootloader.sh
+++ b/usr/lib/archboot/installer/bootloader.sh
@@ -1000,10 +1000,12 @@ do_uboot() {
     [[ -d "${DESTDIR}/boot/extlinux" ]] || mkdir -p "${DESTDIR}/boot/extlinux"
     _KERNEL_PARAMS_COMMON_UNMOD="root=${_rootpart} rootfstype=${ROOTFS} rw ${ROOTFLAGS} ${RAIDARRAYS} ${CRYPTSETUP}"
     _KERNEL_PARAMS_COMMON_MOD="$(echo "${_KERNEL_PARAMS_COMMON_UNMOD}" | sed -e 's#   # #g' | sed -e 's#  # #g')"
+    [[ "${_RUNNING_ARCH}" == "aarch64" ]] _TITLE="ARM 64"
+    [[ "${_RUNNING_ARCH}" == "aarch64" ]] _TITLE="RISC-V 64"
     # write extlinux.conf
     DIALOG --infobox "Installing UBOOT..." 0 0
     cat << EOF >> "${DESTDIR}/boot/extlinux/extlinux.conf"
-menu title Welcome Arch Linux RISC-V 64
+menu title Welcome Arch Linux ${_TITLE}
 timeout 100
 default linux
 label linux
@@ -1313,8 +1315,10 @@ install_bootloader() {
 }
 
 install_bootloader_menu() {
-    if [[ "${RUNNING_ARCH}" == "aarch64" ]]; then
+    if [[ "${RUNNING_ARCH}" == "aarch64" && "${_DETECTED_UEFI_BOOT}" == "1" ]]; then
         ANSWER="UEFI"
+    elif [[ "${RUNNING_ARCH}" == "aarch64" && "${_DETECTED_UEFI_BOOT}" == "0" ]]; then
+            ANSWER="UBOOT"
     elif [[ "${RUNNING_ARCH}" == "riscv64" ]]; then
         ANSWER="UBOOT"
     else
diff --git a/usr/lib/archboot/iso.sh b/usr/lib/archboot/iso.sh
index 63e78b836..75f07d505 100644
--- a/usr/lib/archboot/iso.sh
+++ b/usr/lib/archboot/iso.sh
@@ -191,7 +191,7 @@ _prepare_uefi_image() {
 
 _prepare_extlinux_conf() {
     mkdir -p "${_ISODIR}"/boot/extlinux
-    [[ ${_RUNNING_ARCH} == "aarch64" ]] && _TITLE="Arch Linux ARM"
+    [[ ${_RUNNING_ARCH} == "aarch64" ]] && _TITLE="Arch Linux ARM 64"
     [[ ${_RUNNING_ARCH} == "riscv64" ]] && _TITLE="Arch Linux RISC-V 64"
     echo "Prepare extlinux.conf ..."
     cat << EOF >> "${_ISODIR}/boot/extlinux/extlinux.conf"