From acd05663526dee1ea3bc106068215536b2ff59f8 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 1 Dec 2016 10:09:51 -0800 Subject: [PATCH] grub.cfg: Enable arm64 ACPI Add a new grub variable extra_options, the contents of which is added to the linux command line. Use extra_options to set the ACPI options needed for arm64. Signed-off-by: Geoff Levand --- build_library/grub.cfg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build_library/grub.cfg b/build_library/grub.cfg index 2223dd1a9d..38fd617600 100644 --- a/build_library/grub.cfg +++ b/build_library/grub.cfg @@ -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 {