make virt code configurable and the new CONFIG_VIRT definitions added to the default-configs/arm-softmmu.mak to replace CONFIG_ACPI in arm board.
Signed-off-by: Yang Zhong <yang.zh...@intel.com> --- default-configs/arm-softmmu.mak | 2 +- hw/arm/Makefile.objs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 2420491aac..3903d1ada3 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -147,7 +147,7 @@ CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y -CONFIG_ACPI=y +CONFIG_VIRT=y CONFIG_SMBIOS=y CONFIG_ASPEED_SOC=y CONFIG_GPIO_KEY=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 50c7b4a927..25ff98fdbc 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,5 +1,5 @@ -obj-y += boot.o virt.o sysbus-fdt.o -obj-$(CONFIG_ACPI) += virt-acpi-build.o +obj-y += boot.o sysbus-fdt.o +obj-$(CONFIG_VIRT) += virt.o virt-acpi-build.o obj-$(CONFIG_DIGIC) += digic_boards.o obj-$(CONFIG_EXYNOS4) += exynos4_boards.o obj-$(CONFIG_HIGHBANK) += highbank.o -- 2.17.1
