[U-Boot] [PATCH] 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 --- arch/x86/Kconfig | 9 --------- arch/x86/cpu/qemu/fw_cfg.c | 2 +- arch/x86/lib/Makefile | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4ef27dc..f12cb9d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -442,15 +442,6 @@ config GENERATE_ACPI_TABLE 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/fw_cfg.c b/arch/x86/cpu/qemu/fw_cfg.c index 2e2794e..63d3077 100644 --- a/arch/x86/cpu/qemu/fw_cfg.c +++ b/arch/x86/cpu/qemu/fw_cfg.c @@ -207,7 +207,7 @@ err: return -ENOMEM; }
-#ifdef CONFIG_QEMU_ACPI_TABLE +#ifdef CONFIG_GENERATE_ACPI_TABLE static struct fw_file *qemu_fwcfg_find_file(const char *name) { struct list_head *entry; 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
On Mon, May 9, 2016 at 3:27 PM, Miao Yan yanmiaobest@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 yanmiaobest@gmail.com
arch/x86/Kconfig | 9 --------- arch/x86/cpu/qemu/fw_cfg.c | 2 +- arch/x86/lib/Makefile | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Mon, May 9, 2016 at 8:57 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Mon, May 9, 2016 at 3:27 PM, Miao Yan yanmiaobest@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 yanmiaobest@gmail.com
arch/x86/Kconfig | 9 --------- arch/x86/cpu/qemu/fw_cfg.c | 2 +- arch/x86/lib/Makefile | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Miao, please rebase this patch on top of u-boot-x86/next since Tom's patch was applied first.
Regards, Bin
Hi Bin,
2016-05-10 11:11 GMT+08:00 Bin Meng bmeng.cn@gmail.com:
On Mon, May 9, 2016 at 8:57 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Mon, May 9, 2016 at 3:27 PM, Miao Yan yanmiaobest@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 yanmiaobest@gmail.com
arch/x86/Kconfig | 9 --------- arch/x86/cpu/qemu/fw_cfg.c | 2 +- arch/x86/lib/Makefile | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Miao, please rebase this patch on top of u-boot-x86/next since Tom's patch was applied first.
Sure, I'll send v2.
Thanks, Miao
Hi Miao,
On Wed, May 11, 2016 at 10:02 AM, Miao Yan yanmiaobest@gmail.com wrote:
Hi Bin,
2016-05-10 11:11 GMT+08:00 Bin Meng bmeng.cn@gmail.com:
On Mon, May 9, 2016 at 8:57 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Mon, May 9, 2016 at 3:27 PM, Miao Yan yanmiaobest@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 yanmiaobest@gmail.com
arch/x86/Kconfig | 9 --------- arch/x86/cpu/qemu/fw_cfg.c | 2 +- arch/x86/lib/Makefile | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Miao, please rebase this patch on top of u-boot-x86/next since Tom's patch was applied first.
Sure, I'll send v2.
When you rework the v2, could you please submit changes in addition to Tom's patch to make sure there is no build errors as the workflow you described. And maybe split the qfw command into two pieces? Sorry for asking for a lot.
Regards, Bin
Hi Bin,
2016-05-11 10:13 GMT+08:00 Bin Meng bmeng.cn@gmail.com:
Hi Miao,
On Wed, May 11, 2016 at 10:02 AM, Miao Yan yanmiaobest@gmail.com wrote:
Hi Bin,
2016-05-10 11:11 GMT+08:00 Bin Meng bmeng.cn@gmail.com:
On Mon, May 9, 2016 at 8:57 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Mon, May 9, 2016 at 3:27 PM, Miao Yan yanmiaobest@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 yanmiaobest@gmail.com
arch/x86/Kconfig | 9 --------- arch/x86/cpu/qemu/fw_cfg.c | 2 +- arch/x86/lib/Makefile | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Miao, please rebase this patch on top of u-boot-x86/next since Tom's patch was applied first.
Sure, I'll send v2.
When you rework the v2, could you please submit changes in addition to Tom's patch to make sure there is no build errors as the workflow you described. And maybe split the qfw command into two pieces? Sorry for asking for a lot.
OK, I'll think about it and send some patches.
Miao
Regards, Bin
participants (2)
-
Bin Meng -
Miao Yan