GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-23 23:22:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Remove acpi=off boot parameter when ACPI is on

Browse source 
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>
This commit is contained in:
Bin Meng 2016-05-07 07:46:35 -07:00
parent 7a47a0827d
commit 030b9e34c9
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/configs/x86-common.h
View file

@ -194,13 +194,18 @@
#define CONFIG_BOOTFILE "bzImage" #define CONFIG_BOOTFILE "bzImage"
#define CONFIG_LOADADDR 0x1000000 #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 \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_STD_DEVICES_SETTINGS \ CONFIG_STD_DEVICES_SETTINGS \
"pciconfighost=1\0" \ "pciconfighost=1\0" \
"netdev=eth0\0" \ "netdev=eth0\0" \
"consoledev=ttyS0\0" \ "consoledev=ttyS0\0" \
"othbootargs=acpi=off\0" \ CONFIG_OTHBOOTARGS \
"ramdiskaddr=0x4000000\0" \ "ramdiskaddr=0x4000000\0" \
"ramdiskfile=initramfs.gz\0" "ramdiskfile=initramfs.gz\0"