Hi Miao, On Fri, May 13, 2016 at 2:29 PM, Miao Yan <yanmiaob...@gmail.com> wrote: > 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 <yanmiaob...@gmail.com> > --- > arch/x86/Kconfig | 10 +--------- > arch/x86/cpu/qemu/Makefile | 2 +- > arch/x86/lib/Makefile | 2 +- > 3 files changed, 3 insertions(+), 11 deletions(-) > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 4ef27dc..a60e0da 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -436,21 +436,13 @@ config GENERATE_MP_TABLE > config GENERATE_ACPI_TABLE > bool "Generate an ACPI (Advanced Configuration and Power Interface) > table" > default n > + select QEMU_FW_CFG if QEMU
I think this should be CMD_QEMU_FW_CFG > help > The Advanced Configuration and Power Interface (ACPI) specification > provides an open standard for device configuration and management > by the operating system. It defines platform-independent interfaces > 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 > bool "Generate an SMBIOS (System Management BIOS) table" > default y > diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile > index 97b965c..43ee4bd 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 > diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile > index dc90df2..ce5eb82 100644 > --- a/arch/x86/lib/Makefile > +++ b/arch/x86/lib/Makefile > @@ -31,7 +31,7 @@ obj-$(CONFIG_X86_RAMTEST) += ramtest.o > obj-y += sfi.o > obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o > obj-y += string.o > -ifndef CONFIG_QEMU_ACPI_TABLE > +ifndef CONFIG_QEMU > obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o > endif > obj-y += tables.o > -- Regards, Bin _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot