mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
add U-Boot support for aarch64 in setup script
This commit is contained in:
parent
100cb65bb3
commit
b8a59da141
2 changed files with 7 additions and 3 deletions
|
@ -1000,10 +1000,12 @@ do_uboot() {
|
||||||
[[ -d "${DESTDIR}/boot/extlinux" ]] || mkdir -p "${DESTDIR}/boot/extlinux"
|
[[ -d "${DESTDIR}/boot/extlinux" ]] || mkdir -p "${DESTDIR}/boot/extlinux"
|
||||||
_KERNEL_PARAMS_COMMON_UNMOD="root=${_rootpart} rootfstype=${ROOTFS} rw ${ROOTFLAGS} ${RAIDARRAYS} ${CRYPTSETUP}"
|
_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')"
|
_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
|
# write extlinux.conf
|
||||||
DIALOG --infobox "Installing UBOOT..." 0 0
|
DIALOG --infobox "Installing UBOOT..." 0 0
|
||||||
cat << EOF >> "${DESTDIR}/boot/extlinux/extlinux.conf"
|
cat << EOF >> "${DESTDIR}/boot/extlinux/extlinux.conf"
|
||||||
menu title Welcome Arch Linux RISC-V 64
|
menu title Welcome Arch Linux ${_TITLE}
|
||||||
timeout 100
|
timeout 100
|
||||||
default linux
|
default linux
|
||||||
label linux
|
label linux
|
||||||
|
@ -1313,8 +1315,10 @@ install_bootloader() {
|
||||||
}
|
}
|
||||||
|
|
||||||
install_bootloader_menu() {
|
install_bootloader_menu() {
|
||||||
if [[ "${RUNNING_ARCH}" == "aarch64" ]]; then
|
if [[ "${RUNNING_ARCH}" == "aarch64" && "${_DETECTED_UEFI_BOOT}" == "1" ]]; then
|
||||||
ANSWER="UEFI"
|
ANSWER="UEFI"
|
||||||
|
elif [[ "${RUNNING_ARCH}" == "aarch64" && "${_DETECTED_UEFI_BOOT}" == "0" ]]; then
|
||||||
|
ANSWER="UBOOT"
|
||||||
elif [[ "${RUNNING_ARCH}" == "riscv64" ]]; then
|
elif [[ "${RUNNING_ARCH}" == "riscv64" ]]; then
|
||||||
ANSWER="UBOOT"
|
ANSWER="UBOOT"
|
||||||
else
|
else
|
||||||
|
|
|
@ -191,7 +191,7 @@ _prepare_uefi_image() {
|
||||||
|
|
||||||
_prepare_extlinux_conf() {
|
_prepare_extlinux_conf() {
|
||||||
mkdir -p "${_ISODIR}"/boot/extlinux
|
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"
|
[[ ${_RUNNING_ARCH} == "riscv64" ]] && _TITLE="Arch Linux RISC-V 64"
|
||||||
echo "Prepare extlinux.conf ..."
|
echo "Prepare extlinux.conf ..."
|
||||||
cat << EOF >> "${_ISODIR}/boot/extlinux/extlinux.conf"
|
cat << EOF >> "${_ISODIR}/boot/extlinux/extlinux.conf"
|
||||||
|
|
Loading…
Reference in a new issue