Merge pull request #610 from glevand/for-merge-acpi

grub.cfg: Enable arm64 ACPI
This commit is contained in:
Michael Marineau 2016-12-06 11:46:12 -08:00 committed by GitHub
commit a2af8649c2

View File

@ -96,6 +96,11 @@ if [ -z "$linux_console" ]; then
fi
fi
set extra_options=""
if [ "$grub_cpu" = arm64 ]; then
set extra_options="acpi=force"
fi
set suf=""
# UEFI uses linuxefi/initrdefi instead of linux/initrd except for arm64
@ -106,7 +111,7 @@ if [ "$grub_platform" = efi ]; then
fi
# Assemble the options applicable to all the kernels below
set linux_cmdline="rootflags=rw mount.usrflags=ro consoleblank=0 $linux_root $linux_console $first_boot $oem $linux_append"
set linux_cmdline="rootflags=rw mount.usrflags=ro consoleblank=0 $linux_root $linux_console $first_boot $extra_options $oem $linux_append"
# Re-implement grub_abort() since no command exposes it.
function abort {