root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add U-Boot support for aarch64 in setup script

Browse source
This commit is contained in:
Tobias Powalowski 2022-10-18 19:38:06 +02:00
parent 100cb65bb3
commit b8a59da141
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
usr/lib/archboot/installer/bootloader.sh
View file

@ -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

2
usr/lib/archboot/iso.sh
View file

@ -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"