diff options
| author | Miao Yan <yanmiaobest@gmail.com> | 2016-05-22 19:37:14 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2016-05-23 15:18:00 +0800 |
| commit | fcf5c04193b48c3f5e2d337a85d28c4026f90ac3 (patch) | |
| tree | e12caae1c4b0c8be7b91e45af6470b69910afec8 /arch/x86/cpu/qemu | |
| parent | d3ad06239291d89c1c598248d577cde5470ac1ee (diff) | |
x86: qemu: split qfw command interface and qfw core
This patch splits qfw command interface and qfw core function into two
files, and introduces a new Kconfig option (CONFIG_QFW) for qfw core.
Now when qfw command interface is enabled, it will automatically select
qfw core. This patch also makes the ACPI table generation select
CONFIG_QFW.
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 | 3 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/qemu.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile index 43ee4bde19..7c08c3d79f 100644 --- a/arch/x86/cpu/qemu/Makefile +++ b/arch/x86/cpu/qemu/Makefile @@ -7,5 +7,6 @@ ifndef CONFIG_EFI_STUB obj-y += car.o dram.o endif -obj-y += cpu.o qemu.o +obj-y += qemu.o +obj-$(CONFIG_QFW) += cpu.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index b41e4ecbec..32a4351874 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -88,7 +88,9 @@ static void qemu_chipset_init(void) enable_pm_ich9(); } +#ifdef CONFIG_QFW qemu_fwcfg_init(); +#endif } int arch_cpu_init(void) |