On 2019-01-25 11:06, Paolo Bonzini wrote: > Create separate variables for these components, they are used in many boards > but not all. This allows finer-grain selection of the included code with > default-configs/*.mak. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > Message-Id: <20190123065618.3520-10-yang.zh...@intel.com> > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > default-configs/arm-softmmu.mak | 1 + > default-configs/i386-softmmu.mak | 2 ++ > default-configs/mips-softmmu-common.mak | 2 ++ > default-configs/ppc-softmmu.mak | 1 + > hw/i2c/Makefile.objs | 5 +++-- > 5 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 68deb1c..caf7d7e 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -150,6 +150,7 @@ CONFIG_ACPI=y > CONFIG_VIRT=y > CONFIG_SMBIOS=y > CONFIG_ASPEED_SOC=y > +CONFIG_SMBUS_EEPROM=y > CONFIG_GPIO_KEY=y > CONFIG_MSF2=y > CONFIG_FW_CFG_DMA=y > diff --git a/default-configs/i386-softmmu.mak > b/default-configs/i386-softmmu.mak > index 71c9f6f..15b6287 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -62,6 +62,8 @@ CONFIG_I82801B11=y > CONFIG_SMBIOS=y > CONFIG_PXB=y > CONFIG_ACPI_VMGENID=y > +CONFIG_ACPI_SMBUS=y > +CONFIG_SMBUS_EEPROM=y > CONFIG_FW_CFG_DMA=y > CONFIG_I2C=y > CONFIG_SEV=$(CONFIG_KVM) > diff --git a/default-configs/mips-softmmu-common.mak > b/default-configs/mips-softmmu-common.mak > index 479fb4d..ded7498 100644 > --- a/default-configs/mips-softmmu-common.mak > +++ b/default-configs/mips-softmmu-common.mak > @@ -39,3 +39,5 @@ CONFIG_I2C=y > CONFIG_R4K=y > CONFIG_MALTA=y > CONFIG_MIPSSIM=y > +CONFIG_ACPI_SMBUS=y > +CONFIG_SMBUS_EEPROM=y > diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak > index 7f80f0c..52acb7c 100644 > --- a/default-configs/ppc-softmmu.mak > +++ b/default-configs/ppc-softmmu.mak > @@ -36,6 +36,7 @@ CONFIG_AT24C=y > CONFIG_BITBANG_I2C=y > CONFIG_M41T80=y > CONFIG_VGA_CIRRUS=y > +CONFIG_SMBUS_EEPROM=y > > # For Macs > CONFIG_ESCC=y > diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs > index 37cacde..61ac50a 100644 > --- a/hw/i2c/Makefile.objs > +++ b/hw/i2c/Makefile.objs > @@ -1,8 +1,9 @@ > -common-obj-$(CONFIG_I2C) += core.o smbus.o smbus_eeprom.o > +common-obj-$(CONFIG_I2C) += core.o smbus.o > +common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o > common-obj-$(CONFIG_DDC) += i2c-ddc.o > common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o > common-obj-$(CONFIG_ACPI_X86) += smbus_ich9.o > -common-obj-$(CONFIG_APM) += pm_smbus.o > +common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o > common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o > common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o > common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o
smbus_eeprom.o is now not linked into the sh4 executables anymore. But as far as I can see, this should be ok, since they don't use this device. Reviewed-by: Thomas Huth <th...@redhat.com>
