diff options
-rw-r--r-- | default-configs/arm-softmmu.mak | 4 | ||||
-rw-r--r-- | default-configs/i386-softmmu.mak | 2 | ||||
-rw-r--r-- | default-configs/ppc-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/ppc64-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/ppcemb-softmmu.mak | 1 | ||||
-rw-r--r-- | default-configs/x86_64-softmmu.mak | 2 | ||||
-rw-r--r-- | hw/arm/Makefile.objs | 10 | ||||
-rw-r--r-- | hw/cris/Makefile.objs | 6 | ||||
-rw-r--r-- | hw/i386/Makefile.objs | 3 | ||||
-rw-r--r-- | hw/intc/Makefile.objs | 18 | ||||
-rw-r--r-- | hw/intc/apic.c (renamed from hw/apic.c) | 0 | ||||
-rw-r--r-- | hw/intc/apic_common.c (renamed from hw/apic_common.c) | 0 | ||||
-rw-r--r-- | hw/intc/arm_gic.c (renamed from hw/arm_gic.c) | 0 | ||||
-rw-r--r-- | hw/intc/arm_gic_common.c (renamed from hw/arm_gic_common.c) | 0 | ||||
-rw-r--r-- | hw/intc/arm_gic_kvm.c (renamed from hw/kvm/arm_gic.c) | 0 | ||||
-rw-r--r-- | hw/intc/armv7m_nvic.c (renamed from hw/armv7m_nvic.c) | 0 | ||||
-rw-r--r-- | hw/intc/etraxfs_pic.c (renamed from hw/etraxfs_pic.c) | 0 | ||||
-rw-r--r-- | hw/intc/exynos4210_combiner.c (renamed from hw/exynos4210_combiner.c) | 0 | ||||
-rw-r--r-- | hw/intc/exynos4210_gic.c (renamed from hw/exynos4210_gic.c) | 0 | ||||
-rw-r--r-- | hw/intc/grlib_irqmp.c (renamed from hw/grlib_irqmp.c) | 0 | ||||
-rw-r--r-- | hw/intc/imx_avic.c (renamed from hw/imx_avic.c) | 0 | ||||
-rw-r--r-- | hw/intc/ioapic.c (renamed from hw/ioapic.c) | 1 | ||||
-rw-r--r-- | hw/intc/ioapic_common.c (renamed from hw/ioapic_common.c) | 0 | ||||
-rw-r--r-- | hw/intc/lm32_pic.c (renamed from hw/lm32_pic.c) | 0 | ||||
-rw-r--r-- | hw/intc/omap_intc.c (renamed from hw/omap_intc.c) | 0 | ||||
-rw-r--r-- | hw/intc/openpic.c (renamed from hw/openpic.c) | 0 | ||||
-rw-r--r-- | hw/intc/realview_gic.c (renamed from hw/realview_gic.c) | 0 | ||||
-rw-r--r-- | hw/intc/sbi.c (renamed from hw/sbi.c) | 0 | ||||
-rw-r--r-- | hw/intc/sh_intc.c (renamed from hw/sh_intc.c) | 0 | ||||
-rw-r--r-- | hw/intc/slavio_intctl.c (renamed from hw/slavio_intctl.c) | 0 | ||||
-rw-r--r-- | hw/intc/sun4c_intctl.c (renamed from hw/sun4c_intctl.c) | 0 | ||||
-rw-r--r-- | hw/lm32/Makefile.objs | 1 | ||||
-rw-r--r-- | hw/ppc/Makefile.objs | 2 | ||||
-rw-r--r-- | hw/sh4/Makefile.objs | 4 | ||||
-rw-r--r-- | hw/sparc/Makefile.objs | 6 |
35 files changed, 34 insertions, 28 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 94b52da..93c7d95 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -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 diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index fa070cd..79851bd 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -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 diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 36a8ed3..50034fc 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -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 diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index 2d5df77..6398d60 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -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 diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index ce705a9..05b50d6 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -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 diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 3102c09..176f493 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -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 diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 59b5cf6..915073b 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -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)) diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs index f8c85a4..776db7c 100644 --- a/hw/cris/Makefile.objs +++ b/hw/cris/Makefile.objs @@ -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 diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index a531d3a..533d337 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -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/ diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 2813adb..718d97a 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -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 diff --git a/hw/apic.c b/hw/intc/apic.c index 2d79a9e..2d79a9e 100644 --- a/hw/apic.c +++ b/hw/intc/apic.c diff --git a/hw/apic_common.c b/hw/intc/apic_common.c index e0ae07a..e0ae07a 100644 --- a/hw/apic_common.c +++ b/hw/intc/apic_common.c diff --git a/hw/arm_gic.c b/hw/intc/arm_gic.c index bcb072b..bcb072b 100644 --- a/hw/arm_gic.c +++ b/hw/intc/arm_gic.c diff --git a/hw/arm_gic_common.c b/hw/intc/arm_gic_common.c index 71594f1..71594f1 100644 --- a/hw/arm_gic_common.c +++ b/hw/intc/arm_gic_common.c diff --git a/hw/kvm/arm_gic.c b/hw/intc/arm_gic_kvm.c index 22b40b4..22b40b4 100644 --- a/hw/kvm/arm_gic.c +++ b/hw/intc/arm_gic_kvm.c diff --git a/hw/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 7574260..7574260 100644 --- a/hw/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c diff --git a/hw/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index 635103c..635103c 100644 --- a/hw/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c diff --git a/hw/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index 6874287..6874287 100644 --- a/hw/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c diff --git a/hw/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index bad6dde..bad6dde 100644 --- a/hw/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c diff --git a/hw/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index 68dfe6a..68dfe6a 100644 --- a/hw/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c diff --git a/hw/imx_avic.c b/hw/intc/imx_avic.c index 4e280b6..4e280b6 100644 --- a/hw/imx_avic.c +++ b/hw/intc/imx_avic.c diff --git a/hw/ioapic.c b/hw/intc/ioapic.c index 7089fa8..c6f09f4 100644 --- a/hw/ioapic.c +++ b/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" diff --git a/hw/ioapic_common.c b/hw/intc/ioapic_common.c index 42c7adc..42c7adc 100644 --- a/hw/ioapic_common.c +++ b/hw/intc/ioapic_common.c diff --git a/hw/lm32_pic.c b/hw/intc/lm32_pic.c index b4e80c8..b4e80c8 100644 --- a/hw/lm32_pic.c +++ b/hw/intc/lm32_pic.c diff --git a/hw/omap_intc.c b/hw/intc/omap_intc.c index 875eba4..875eba4 100644 --- a/hw/omap_intc.c +++ b/hw/intc/omap_intc.c diff --git a/hw/openpic.c b/hw/intc/openpic.c index c788714..c788714 100644 --- a/hw/openpic.c +++ b/hw/intc/openpic.c diff --git a/hw/realview_gic.c b/hw/intc/realview_gic.c index 0ec30ca..0ec30ca 100644 --- a/hw/realview_gic.c +++ b/hw/intc/realview_gic.c diff --git a/hw/sh_intc.c b/hw/intc/sh_intc.c index 050bfb6..050bfb6 100644 --- a/hw/sh_intc.c +++ b/hw/intc/sh_intc.c diff --git a/hw/slavio_intctl.c b/hw/intc/slavio_intctl.c index b367752..b367752 100644 --- a/hw/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c diff --git a/hw/sun4c_intctl.c b/hw/intc/sun4c_intctl.c index 1096375..1096375 100644 --- a/hw/sun4c_intctl.c +++ b/hw/intc/sun4c_intctl.c diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index bf8d152..1e59ac5 100644 --- a/hw/lm32/Makefile.objs +++ b/hw/lm32/Makefile.objs @@ -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 diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 70342c2..280ed26 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,7 +1,5 @@ # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) += spapr_nvram.o -# PowerPC OpenPIC -obj-y += openpic.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs index 0387b96..2393702 100644 --- a/hw/sh4/Makefile.objs +++ b/hw/sh4/Makefile.objs @@ -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 diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index 3de10ff..3246bb1 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -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)) |