On Thu, May 14, 2015 at 05:19:41PM +0800, Shannon Zhao wrote: > From: Shannon Zhao <shannon.z...@linaro.org> > > As core.c, piix4.c, ich9.c and pcihp.c are for x86, add CONFIG_ACPI_X86 > to make it only for x86. ARM doesn't support cpu and memory hotplug, add > CONFIG_ACPI_CPU_HOTPLUG and CONFIG_ACPI_MEMORY_HOTPLUG to make them > exclusive for target-arm.
You mean to exclude them I think. > > Signed-off-by: Shannon Zhao <zhaoshengl...@huawei.com> > Signed-off-by: Shannon Zhao <shannon.z...@linaro.org> > --- > default-configs/arm-softmmu.mak | 1 + > default-configs/i386-softmmu.mak | 3 +++ > default-configs/mips-softmmu.mak | 3 +++ > default-configs/mips64-softmmu.mak | 3 +++ > default-configs/mips64el-softmmu.mak | 3 +++ > default-configs/mipsel-softmmu.mak | 3 +++ > default-configs/x86_64-softmmu.mak | 3 +++ > hw/acpi/Makefile.objs | 5 +++-- > hw/i2c/Makefile.objs | 2 +- > 9 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index a767e4b..74f1db3 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -101,3 +101,4 @@ CONFIG_ALLWINNER_A10=y > CONFIG_XIO3130=y > CONFIG_IOH3420=y > CONFIG_I82801B11=y > +CONFIG_ACPI=y > diff --git a/default-configs/i386-softmmu.mak > b/default-configs/i386-softmmu.mak > index 6a74e00..91d602c 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_IDE_ISA=y > diff --git a/default-configs/mips-softmmu.mak > b/default-configs/mips-softmmu.mak > index cce2c81..fd0607d 100644 > --- a/default-configs/mips-softmmu.mak > +++ b/default-configs/mips-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/mips64-softmmu.mak > b/default-configs/mips64-softmmu.mak > index 7a88a08..b8c7910 100644 > --- a/default-configs/mips64-softmmu.mak > +++ b/default-configs/mips64-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/mips64el-softmmu.mak > b/default-configs/mips64el-softmmu.mak > index 095de43..ae4274b 100644 > --- a/default-configs/mips64el-softmmu.mak > +++ b/default-configs/mips64el-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/mipsel-softmmu.mak > b/default-configs/mipsel-softmmu.mak > index 0e25108..1e2374b 100644 > --- a/default-configs/mipsel-softmmu.mak > +++ b/default-configs/mipsel-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_PIIX4=y > diff --git a/default-configs/x86_64-softmmu.mak > b/default-configs/x86_64-softmmu.mak > index 46b87dd..2f2955b 100644 > --- a/default-configs/x86_64-softmmu.mak > +++ b/default-configs/x86_64-softmmu.mak > @@ -15,6 +15,9 @@ CONFIG_PCSPK=y > CONFIG_PCKBD=y > CONFIG_FDC=y > CONFIG_ACPI=y > +CONFIG_ACPI_X86=y > +CONFIG_ACPI_MEMORY_HOTPLUG=y > +CONFIG_ACPI_CPU_HOTPLUG=y > CONFIG_APM=y > CONFIG_I8257=y > CONFIG_IDE_ISA=y > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index b9fefa7..29d46d8 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -1,5 +1,6 @@ > -common-obj-$(CONFIG_ACPI) += core.o piix4.o ich9.o pcihp.o cpu_hotplug.o > -common-obj-$(CONFIG_ACPI) += memory_hotplug.o > +common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o ich9.o pcihp.o > +common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o > +common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o > common-obj-$(CONFIG_ACPI) += acpi_interface.o > common-obj-$(CONFIG_ACPI) += bios-linker-loader.o > common-obj-$(CONFIG_ACPI) += aml-build.o > diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs > index 648278e..0f13060 100644 > --- a/hw/i2c/Makefile.objs > +++ b/hw/i2c/Makefile.objs > @@ -1,6 +1,6 @@ > common-obj-y += core.o smbus.o smbus_eeprom.o > common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o > -common-obj-$(CONFIG_ACPI) += smbus_ich9.o > +common-obj-$(CONFIG_ACPI_X86) += smbus_ich9.o > common-obj-$(CONFIG_APM) += pm_smbus.o > common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o > common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o > -- > 2.1.0 >
