[Qemu-devel] [PATCH v3 4/7] hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile variable

[Philippe Mathieu-Daudé]

The Inter-Thread Communication Unit (ITU, introduced in commit
34fa7e83e11) is part of the Coherent Processing System (CPS),
as describe in commit 408294352ad:

    Make ITU available in the system if CPU supports multithreading
    and is part of CPS.

Replate the CONFIG_MIPS_ITU variable by the CONFIG_MIPS_CPS one.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
 default-configs/mips-softmmu-common.mak | 1 -
 hw/misc/Kconfig                         | 3 ---
 hw/misc/Makefile.objs                   | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/default-configs/mips-softmmu-common.mak 
b/default-configs/mips-softmmu-common.mak
index 2ca57bfee1..c5b148b1c6 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -29,7 +29,6 @@ CONFIG_I8259=y
 CONFIG_MC146818RTC=y
 CONFIG_EMPTY_SLOT=y
 CONFIG_MIPS_CPS=y
-CONFIG_MIPS_ITU=y
 CONFIG_R4K=y
 CONFIG_MALTA=y
 CONFIG_MIPSSIM=y
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 2c60be99bc..3125cf86f2 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -80,9 +80,6 @@ config IMX
 config STM32F2XX_SYSCFG
     bool
 
-config MIPS_ITU
-    bool
-
 config MPS2_FPGAIO
     bool
 
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index c71e07ae35..22565d72af 100644
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -59,7 +59,7 @@ obj-$(CONFIG_ZYNQ) += zynq-xadc.o
 obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o
 obj-$(CONFIG_MIPS_CPS) += mips_cmgcr.o
 obj-$(CONFIG_MIPS_CPS) += mips_cpc.o
-obj-$(CONFIG_MIPS_ITU) += mips_itu.o
+obj-$(CONFIG_MIPS_CPS) += mips_itu.o
 obj-$(CONFIG_MPS2_FPGAIO) += mps2-fpgaio.o
 obj-$(CONFIG_MPS2_SCC) += mps2-scc.o
 
-- 
2.20.1