From: Bin Meng <bmeng.cn@gmail.com>
Date: Thu, 23 Aug 2018 15:24:11 +0000 (-0700)
Subject: x86: efi: payload: Turn on acpi in the kernel command line
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a0913cdf7b7ef1a9f622294cf7a9e97ea9eb72f2;p=u-boot.git

x86: efi: payload: Turn on acpi in the kernel command line

Now that we have full Linux kernel boot support on EFI payload,
avoid pass "acpi=off" to the kernel command line.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index cc621cb942..f0b027e69c 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -107,7 +107,7 @@
 #define CONFIG_BOOTFILE		"bzImage"
 #define CONFIG_LOADADDR		0x1000000
 #define CONFIG_RAMDISK_ADDR	0x4000000
-#ifdef CONFIG_GENERATE_ACPI_TABLE
+#if defined(CONFIG_GENERATE_ACPI_TABLE) || defined(CONFIG_EFI_STUB)
 #define CONFIG_OTHBOOTARGS	"othbootargs=\0"
 #else
 #define CONFIG_OTHBOOTARGS	"othbootargs=acpi=off\0"