V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

x86: qemu: fix ACPI Kconfig options 

CONFIG_GENENRATE_ACPI_TABLE controls the generation of ACPI table which
uses U-Boot's built-in methods and CONFIG_QEMU_ACPI_TABLE controls whether
to load ACPI table from QEMU's fw_cfg interface.

But with commit "697ec431469ce0a4c2fc2c02d8685d907491af84 x86: qemu: Drop
our own ACPI implementation", there is only one way to support ACPI table
for QEMU targets which is the fw_cfg interface. Having two Kconfig options
for this purpose is not necessary any more, so this patch consolidates
the two.

Signed-off-by: Miao Yan <yanmiaobest@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Miao Yan 2016-05-22 19:37:10 -07:00 committed by Bin Meng
parent dd6f3abbb8
commit 34865a65c4
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/Kconfig
View File

@ -439,21 +439,13 @@ config GENERATE_MP_TABLE
config GENERATE_ACPI_TABLE config GENERATE_ACPI_TABLE
bool "Generate an ACPI (Advanced Configuration and Power Interface) table" bool "Generate an ACPI (Advanced Configuration and Power Interface) table"
default n default n
select CMD_QEMU_FW_CFG if QEMU
help help
The Advanced Configuration and Power Interface (ACPI) specification The Advanced Configuration and Power Interface (ACPI) specification
provides an open standard for device configuration and management provides an open standard for device configuration and management
by the operating system. It defines platform-independent interfaces by the operating system. It defines platform-independent interfaces
for configuration and power management monitoring. for configuration and power management monitoring.
config QEMU_ACPI_TABLE
bool "Load ACPI table from QEMU fw_cfg interface"
depends on GENERATE_ACPI_TABLE && QEMU
default y
help
By default, U-Boot generates its own ACPI tables. This option, if
enabled, disables U-Boot's version and loads ACPI tables generated
by QEMU.
config GENERATE_SMBIOS_TABLE config GENERATE_SMBIOS_TABLE
bool "Generate an SMBIOS (System Management BIOS) table" bool "Generate an SMBIOS (System Management BIOS) table"
default y default y

2
arch/x86/cpu/qemu/Makefile
View File

@ -8,4 +8,4 @@ ifndef CONFIG_EFI_STUB
obj-y += car.o dram.o obj-y += car.o dram.o
endif endif
obj-y += cpu.o qemu.o obj-y += cpu.o qemu.o
obj-$(CONFIG_QEMU_ACPI_TABLE) += acpi_table.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o

2
arch/x86/lib/Makefile
View File

@ -31,7 +31,7 @@ obj-$(CONFIG_X86_RAMTEST) += ramtest.o
obj-y += sfi.o obj-y += sfi.o
obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o
obj-y += string.o obj-y += string.o
ifndef CONFIG_QEMU_ACPI_TABLE ifndef CONFIG_QEMU
obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o
endif endif
obj-y += tables.o obj-y += tables.o