On Sun, 17 Mar 2019 01:22:55 +0100 Philippe Mathieu-Daudé <phi...@redhat.com> wrote:
> The ICH9 chipset is a generic southbridge and can be used by > non-X86 hardware. Rename it to make this more obvious. Is it actually used by anything else in QEMU beside Q35 board? > > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > hw/acpi/Kconfig | 2 +- > hw/acpi/Makefile.objs | 2 +- > hw/i2c/Makefile.objs | 2 +- > hw/isa/Kconfig | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig > index eca3beed75..e24c895772 100644 > --- a/hw/acpi/Kconfig > +++ b/hw/acpi/Kconfig > @@ -8,7 +8,7 @@ config ACPI_X86 > select ACPI_CPU_HOTPLUG > select ACPI_MEMORY_HOTPLUG > > -config ACPI_X86_ICH > +config ACPI_ICH9 > bool > select ACPI_X86 > > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index c86edfbed9..dff94d35e7 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -1,5 +1,5 @@ > common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o > -common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o > +common-obj-$(CONFIG_ACPI_ICH9) += ich9.o tco.o > common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o > common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o > common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o > diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs > index a98c786918..b632461513 100644 > --- a/hw/i2c/Makefile.objs > +++ b/hw/i2c/Makefile.objs > @@ -3,7 +3,7 @@ common-obj-$(CONFIG_SMBUS) += smbus_slave.o smbus_master.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_ICH) += smbus_ich9.o > +common-obj-$(CONFIG_ACPI_ICH9) += smbus_ich9.o > common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o > common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o > common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o > diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig > index 57e09a0cb8..19101d349f 100644 > --- a/hw/isa/Kconfig > +++ b/hw/isa/Kconfig > @@ -50,4 +50,4 @@ config LPC_ICH9 > # for ICH9. > select ISA_BUS > select ACPI_SMBUS > - select ACPI_X86_ICH > + select ACPI_ICH9