@@ -16,6 +16,7 @@ CONFIG_TWL92230=y
CONFIG_TSC2005=y
CONFIG_LM832X=y
CONFIG_TMP105=y
+CONFIG_STELLARIS=y
CONFIG_STELLARIS_INPUT=y
CONFIG_STELLARIS_ENET=y
CONFIG_SSD0303=y
@@ -33,6 +34,8 @@ CONFIG_PFLASH_CFI02=y
CONFIG_MICRODRIVE=y
CONFIG_USB_MUSB=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
CONFIG_ARM_TIMER=y
CONFIG_ARM_MPTIMER=y
CONFIG_PL011=y
@@ -62,6 +65,7 @@ CONFIG_BLIZZARD=y
CONFIG_ONENAND=y
CONFIG_TUSB6010=y
CONFIG_IMX=y
+CONFIG_REALVIEW=y
CONFIG_ZAURUS=y
CONFIG_VERSATILE_PCI=y
@@ -40,3 +40,5 @@ CONFIG_XEN_I386=$(CONFIG_XEN)
CONFIG_ISA_DEBUG=y
CONFIG_LPC_ICH9=y
CONFIG_Q35=y
+CONFIG_APIC=y
+CONFIG_IOAPIC=y
@@ -41,6 +41,7 @@ CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_XILINX_ETHLITE=y
+CONFIG_OPENPIC=y
CONFIG_E500=$(CONFIG_FDT)
# For PReP
CONFIG_MC146818RTC=y
@@ -41,6 +41,7 @@ CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_XILINX_ETHLITE=y
+CONFIG_OPENPIC=y
CONFIG_PSERIES=$(CONFIG_FDT)
CONFIG_E500=$(CONFIG_FDT)
# For pSeries
@@ -36,6 +36,7 @@ CONFIG_PTIMER=y
CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_XILINX_ETHLITE=y
+CONFIG_OPENPIC=y
CONFIG_E500=$(CONFIG_FDT)
# For PReP
CONFIG_MC146818RTC=y
@@ -40,3 +40,5 @@ CONFIG_XEN_I386=$(CONFIG_XEN)
CONFIG_ISA_DEBUG=y
CONFIG_LPC_ICH9=y
CONFIG_Q35=y
+CONFIG_APIC=y
+CONFIG_IOAPIC=y
@@ -1,20 +1,16 @@
obj-y += zynq_slcr.o
-obj-y += arm_gic.o arm_gic_common.o
obj-y += a9scu.o
-obj-y += realview_gic.o arm_sysctl.o arm11mpcore.o a9mpcore.o
-obj-y += exynos4210_gic.o exynos4210_combiner.o
+obj-y += arm_sysctl.o arm11mpcore.o a9mpcore.o
obj-y += exynos4210_pmu.o
obj-y += a15mpcore.o
-obj-y += armv7m_nvic.o
obj-y += pxa2xx_pcmcia.o
obj-y += zaurus.o
-obj-y += omap_clk.o omap_gpio.o omap_intc.o
+obj-y += omap_clk.o omap_gpio.o
obj-y += omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o
obj-y += cbus.o
obj-y += mst_fpga.o
obj-y += strongarm.o
-obj-y += imx_ccm.o imx_avic.o
-obj-$(CONFIG_KVM) += kvm/arm_gic.o
+obj-y += imx_ccm.o
obj-y := $(addprefix ../,$(obj-y))
@@ -1,9 +1,3 @@
-# IO blocks
-obj-y += etraxfs_pic.o
-
-obj-y := $(addprefix ../,$(obj-y))
-
-# Boards
obj-y += pic_cpu.o
obj-y += boot.o
obj-y += axis_dev88.o
@@ -1,5 +1,4 @@
-obj-y += apic_common.o apic.o
-obj-y += sga.o ioapic_common.o ioapic.o
+obj-y += sga.o
obj-y += vmport.o
obj-y += debugexit.o
obj-y += kvm/
@@ -3,3 +3,21 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
common-obj-$(CONFIG_PL190) += pl190.o
common-obj-$(CONFIG_PUV3) += puv3_intc.o
common-obj-$(CONFIG_XILINX) += xilinx_intc.o
+common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o
+common-obj-$(CONFIG_IMX) += imx_avic.o
+common-obj-$(CONFIG_LM32) += lm32_pic.o
+common-obj-$(CONFIG_REALVIEW) += realview_gic.o
+common-obj-$(CONFIG_SLAVIO) += sbi.o slavio_intctl.o sun4c_intctl.o
+common-obj-$(CONFIG_IOAPIC) += ioapic_common.o
+common-obj-$(CONFIG_ARM_GIC) += arm_gic_common.o
+
+obj-$(CONFIG_APIC) += apic.o apic_common.o
+obj-$(CONFIG_ARM_GIC) += arm_gic.o
+obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o
+obj-$(CONFIG_STELLARIS) += armv7m_nvic.o
+obj-$(CONFIG_EXYNOS4) += exynos4210_gic.o exynos4210_combiner.o
+obj-$(CONFIG_GRLIB) += grlib_irqmp.o
+obj-$(CONFIG_IOAPIC) += ioapic.o
+obj-$(CONFIG_OMAP) += omap_intc.o
+obj-$(CONFIG_OPENPIC) += openpic.o
+obj-$(CONFIG_SH4) += sh_intc.o
similarity index 100%
rename from hw/apic.c
rename to hw/intc/apic.c
similarity index 100%
rename from hw/apic_common.c
rename to hw/intc/apic_common.c
similarity index 100%
rename from hw/arm_gic.c
rename to hw/intc/arm_gic.c
similarity index 100%
rename from hw/arm_gic_common.c
rename to hw/intc/arm_gic_common.c
similarity index 100%
rename from hw/kvm/arm_gic.c
rename to hw/intc/arm_gic_kvm.c
similarity index 100%
rename from hw/armv7m_nvic.c
rename to hw/intc/armv7m_nvic.c
similarity index 100%
rename from hw/etraxfs_pic.c
rename to hw/intc/etraxfs_pic.c
similarity index 100%
rename from hw/exynos4210_combiner.c
rename to hw/intc/exynos4210_combiner.c
similarity index 100%
rename from hw/exynos4210_gic.c
rename to hw/intc/exynos4210_gic.c
similarity index 100%
rename from hw/grlib_irqmp.c
rename to hw/intc/grlib_irqmp.c
similarity index 100%
rename from hw/imx_avic.c
rename to hw/intc/imx_avic.c
similarity index 99%
rename from hw/ioapic.c
rename to hw/intc/ioapic.c
@@ -22,7 +22,6 @@
#include "hw/hw.h"
#include "hw/i386/pc.h"
-#include "hw/i386/apic.h"
#include "hw/i386/ioapic.h"
#include "hw/i386/ioapic_internal.h"
similarity index 100%
rename from hw/ioapic_common.c
rename to hw/intc/ioapic_common.c
similarity index 100%
rename from hw/lm32_pic.c
rename to hw/intc/lm32_pic.c
similarity index 100%
rename from hw/omap_intc.c
rename to hw/intc/omap_intc.c
similarity index 100%
rename from hw/openpic.c
rename to hw/intc/openpic.c
similarity index 100%
rename from hw/realview_gic.c
rename to hw/intc/realview_gic.c
similarity index 100%
rename from hw/sbi.c
rename to hw/intc/sbi.c
similarity index 100%
rename from hw/sh_intc.c
rename to hw/intc/sh_intc.c
similarity index 100%
rename from hw/slavio_intctl.c
rename to hw/intc/slavio_intctl.c
similarity index 100%
rename from hw/sun4c_intctl.c
rename to hw/intc/sun4c_intctl.c
@@ -1,5 +1,4 @@
# LM32 peripherals
-obj-y += lm32_pic.o
obj-y += lm32_sys.o
obj-y += milkymist-hpdmc.o
obj-y += milkymist-pfpu.o
@@ -1,7 +1,5 @@
# IBM pSeries (sPAPR)
obj-$(CONFIG_PSERIES) += spapr_nvram.o
-# PowerPC OpenPIC
-obj-y += openpic.o
obj-y := $(addprefix ../,$(obj-y))
@@ -1,7 +1,3 @@
-obj-y += sh_intc.o
-
-obj-y := $(addprefix ../,$(obj-y))
-
obj-y += shix.o r2d.o
obj-y += sh7750.o sh7750_regnames.o
@@ -1,9 +1,5 @@
-obj-y = slavio_intctl.o
obj-y += slavio_misc.o
-obj-y += eccmemctl.o sbi.o sun4c_intctl.o
-
-# GRLIB
-obj-y += grlib_irqmp.o
+obj-y += eccmemctl.o
obj-y := $(addprefix ../,$(obj-y))
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- default-configs/arm-softmmu.mak | 4 ++++ default-configs/i386-softmmu.mak | 2 ++ default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 2 ++ hw/arm/Makefile.objs | 10 +++------- hw/cris/Makefile.objs | 6 ------ hw/i386/Makefile.objs | 3 +-- hw/intc/Makefile.objs | 18 ++++++++++++++++++ hw/{ => intc}/apic.c | 0 hw/{ => intc}/apic_common.c | 0 hw/{ => intc}/arm_gic.c | 0 hw/{ => intc}/arm_gic_common.c | 0 hw/{kvm/arm_gic.c => intc/arm_gic_kvm.c} | 0 hw/{ => intc}/armv7m_nvic.c | 0 hw/{ => intc}/etraxfs_pic.c | 0 hw/{ => intc}/exynos4210_combiner.c | 0 hw/{ => intc}/exynos4210_gic.c | 0 hw/{ => intc}/grlib_irqmp.c | 0 hw/{ => intc}/imx_avic.c | 0 hw/{ => intc}/ioapic.c | 1 - hw/{ => intc}/ioapic_common.c | 0 hw/{ => intc}/lm32_pic.c | 0 hw/{ => intc}/omap_intc.c | 0 hw/{ => intc}/openpic.c | 0 hw/{ => intc}/realview_gic.c | 0 hw/{ => intc}/sbi.c | 0 hw/{ => intc}/sh_intc.c | 0 hw/{ => intc}/slavio_intctl.c | 0 hw/{ => intc}/sun4c_intctl.c | 0 hw/lm32/Makefile.objs | 1 - hw/ppc/Makefile.objs | 2 -- hw/sh4/Makefile.objs | 4 ---- hw/sparc/Makefile.objs | 6 +----- 35 files changed, 34 insertions(+), 28 deletions(-) rename hw/{ => intc}/apic.c (100%) rename hw/{ => intc}/apic_common.c (100%) rename hw/{ => intc}/arm_gic.c (100%) rename hw/{ => intc}/arm_gic_common.c (100%) rename hw/{kvm/arm_gic.c => intc/arm_gic_kvm.c} (100%) rename hw/{ => intc}/armv7m_nvic.c (100%) rename hw/{ => intc}/etraxfs_pic.c (100%) rename hw/{ => intc}/exynos4210_combiner.c (100%) rename hw/{ => intc}/exynos4210_gic.c (100%) rename hw/{ => intc}/grlib_irqmp.c (100%) rename hw/{ => intc}/imx_avic.c (100%) rename hw/{ => intc}/ioapic.c (99%) rename hw/{ => intc}/ioapic_common.c (100%) rename hw/{ => intc}/lm32_pic.c (100%) rename hw/{ => intc}/omap_intc.c (100%) rename hw/{ => intc}/openpic.c (100%) rename hw/{ => intc}/realview_gic.c (100%) rename hw/{ => intc}/sbi.c (100%) rename hw/{ => intc}/sh_intc.c (100%) rename hw/{ => intc}/slavio_intctl.c (100%) rename hw/{ => intc}/sun4c_intctl.c (100%)