diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2016-05-07 07:46:35 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2016-05-23 15:18:00 +0800 |
| commit | 030b9e34c97e94c0a1a30ed391058b130ba6d314 (patch) | |
| tree | 31bde027ac741b21697b1d0dcab52d67106c8210 | |
| parent | 7a47a0827ddc047ec6c722ac4567b4c19e699412 (diff) | |
| download | u-boot-imx-030b9e34c97e94c0a1a30ed391058b130ba6d314.zip u-boot-imx-030b9e34c97e94c0a1a30ed391058b130ba6d314.tar.gz u-boot-imx-030b9e34c97e94c0a1a30ed391058b130ba6d314.tar.bz2 | |
x86: Remove acpi=off boot parameter when ACPI is on
Remove the kernel boot parameter acpi=off so that kernel can turn on
ACPI support.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | include/configs/x86-common.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index b79f47b..b4aad6c 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -193,14 +193,19 @@ #define CONFIG_HOSTNAME x86 #define CONFIG_BOOTFILE "bzImage" #define CONFIG_LOADADDR 0x1000000 -#define CONFIG_RAMDISK_ADDR 0x4000000 +#define CONFIG_RAMDISK_ADDR 0x4000000 +#ifdef CONFIG_GENERATE_ACPI_TABLE +#define CONFIG_OTHBOOTARGS "othbootargs=\0" +#else +#define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0" +#endif #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_STD_DEVICES_SETTINGS \ "pciconfighost=1\0" \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ - "othbootargs=acpi=off\0" \ + CONFIG_OTHBOOTARGS \ "ramdiskaddr=0x4000000\0" \ "ramdiskfile=initramfs.gz\0" |