diff options
| author | Miao Yan <yanmiaobest@gmail.com> | 2016-05-23 05:37:10 +0300 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2016-05-23 10:18:00 +0300 |
| commit | 34865a65c44d9c0dffb9b5346e66ea9b7757b880 (patch) | |
| tree | 2fdde4ad934f5a4501fdcfcc282a862fb8b7dd45 /arch/x86/cpu/qemu | |
| parent | dd6f3abbb81d4d0f8883a523e26fd45833a6b0d3 (diff) | |
| download | u-boot-34865a65c44d9c0dffb9b5346e66ea9b7757b880.tar.xz | |
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>
Diffstat (limited to 'arch/x86/cpu/qemu')
| -rw-r--r-- | arch/x86/cpu/qemu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile index 97b965c3de..43ee4bde19 100644 --- a/arch/x86/cpu/qemu/Makefile +++ b/arch/x86/cpu/qemu/Makefile @@ -8,4 +8,4 @@ ifndef CONFIG_EFI_STUB obj-y += car.o dram.o endif obj-y += cpu.o qemu.o -obj-$(CONFIG_QEMU_ACPI_TABLE) += acpi_table.o +obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o |