@@ -57,6 +57,7 @@ CONFIG_BITBANG_I2C=y
CONFIG_FRAMEBUFFER=y
CONFIG_XILINX_SPIPS=y
+CONFIG_A9SCU=y
CONFIG_MARVELL_88W8618=y
CONFIG_OMAP=y
CONFIG_TSC210X=y
@@ -64,8 +65,11 @@ CONFIG_BLIZZARD=y
CONFIG_ONENAND=y
CONFIG_TUSB6010=y
CONFIG_IMX=y
+CONFIG_MAINSTONE=y
+CONFIG_NSERIES=y
CONFIG_REALVIEW=y
CONFIG_ZAURUS=y
+CONFIG_ZYNQ=y
CONFIG_VERSATILE_PCI=y
CONFIG_VERSATILE_I2C=y
@@ -14,4 +14,5 @@ CONFIG_SLAVIO=y
CONFIG_CS4231=y
CONFIG_GRLIB=y
CONFIG_STP2000=y
+CONFIG_ECCMEMCTL=y
CONFIG_SUN4M=y
@@ -1,15 +1,6 @@
-obj-y += zynq_slcr.o
-obj-y += a9scu.o
-obj-y += arm_sysctl.o arm11mpcore.o a9mpcore.o
-obj-y += exynos4210_pmu.o
+obj-y += arm11mpcore.o a9mpcore.o
obj-y += a15mpcore.o
-obj-y += pxa2xx_pcmcia.o
-obj-y += omap_clk.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
obj-$(CONFIG_KVM) += kvm/arm_gic.o
obj-y := $(addprefix ../,$(obj-y))
@@ -1,11 +1,3 @@
-# LM32 peripherals
-obj-y += lm32_sys.o
-obj-y += milkymist-hpdmc.o
-obj-y += milkymist-pfpu.o
-obj-y += milkymist-sysctl.o
-
-obj-y := $(addprefix ../,$(obj-y))
-
# LM32 boards
obj-y += lm32_boards.o
obj-y += milkymist.o
@@ -8,3 +8,22 @@ common-obj-$(CONFIG_PL310) += arm_l2x0.o
common-obj-$(CONFIG_PUV3) += puv3_pm.o
common-obj-$(CONFIG_MACIO) += macio/
+
+obj-$(CONFIG_REALVIEW) += arm_sysctl.o
+obj-$(CONFIG_A9SCU) += a9scu.o
+obj-$(CONFIG_NSERIES) += cbus.o
+obj-$(CONFIG_ECCMEMCTL) += eccmemctl.o
+obj-$(CONFIG_EXYNOS4) += exynos4210_pmu.o
+obj-$(CONFIG_IMX) += imx_ccm.o
+obj-$(CONFIG_LM32) += lm32_sys.o
+obj-$(CONFIG_MILKYMIST) += milkymist-hpdmc.o
+obj-$(CONFIG_MILKYMIST) += milkymist-pfpu.o
+obj-$(CONFIG_MAINSTONE) += mst_fpga.o
+obj-$(CONFIG_OMAP) += omap_clk.o
+obj-$(CONFIG_OMAP) += omap_gpmc.o
+obj-$(CONFIG_OMAP) += omap_l4.o
+obj-$(CONFIG_OMAP) += omap_sdrc.o
+obj-$(CONFIG_OMAP) += omap_tap.o
+obj-$(CONFIG_PXA2XX) += pxa2xx_pcmcia.o
+obj-$(CONFIG_SLAVIO) += slavio_misc.o
+obj-$(CONFIG_ZYNQ) += zynq_slcr.o
similarity index 100%
rename from hw/a9scu.c
rename to hw/misc/a9scu.c
similarity index 100%
rename from hw/arm_sysctl.c
rename to hw/misc/arm_sysctl.c
similarity index 100%
rename from hw/cbus.c
rename to hw/misc/cbus.c
similarity index 100%
rename from hw/eccmemctl.c
rename to hw/misc/eccmemctl.c
similarity index 100%
rename from hw/exynos4210_pmu.c
rename to hw/misc/exynos4210_pmu.c
similarity index 100%
rename from hw/imx_ccm.c
rename to hw/misc/imx_ccm.c
similarity index 100%
rename from hw/lm32_sys.c
rename to hw/misc/lm32_sys.c
similarity index 100%
rename from hw/milkymist-hpdmc.c
rename to hw/misc/milkymist-hpdmc.c
similarity index 100%
rename from hw/milkymist-pfpu.c
rename to hw/misc/milkymist-pfpu.c
similarity index 100%
rename from hw/mst_fpga.c
rename to hw/misc/mst_fpga.c
similarity index 100%
rename from hw/omap_clk.c
rename to hw/misc/omap_clk.c
similarity index 100%
rename from hw/omap_gpmc.c
rename to hw/misc/omap_gpmc.c
similarity index 100%
rename from hw/omap_l4.c
rename to hw/misc/omap_l4.c
similarity index 100%
rename from hw/omap_sdrc.c
rename to hw/misc/omap_sdrc.c
similarity index 100%
rename from hw/omap_tap.c
rename to hw/misc/omap_tap.c
similarity index 100%
rename from hw/pxa2xx_pcmcia.c
rename to hw/misc/pxa2xx_pcmcia.c
similarity index 100%
rename from hw/slavio_misc.c
rename to hw/misc/slavio_misc.c
similarity index 100%
rename from hw/zynq_slcr.c
rename to hw/misc/zynq_slcr.c
@@ -1,6 +1 @@
-obj-y += slavio_misc.o
-obj-y += eccmemctl.o
-
-obj-y := $(addprefix ../,$(obj-y))
-
obj-y += sun4m.o leon3.o
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- default-configs/arm-softmmu.mak | 4 ++++ default-configs/sparc-softmmu.mak | 1 + hw/arm/Makefile.objs | 11 +---------- hw/lm32/Makefile.objs | 8 -------- hw/misc/Makefile.objs | 19 +++++++++++++++++++ hw/{ => misc}/a9scu.c | 0 hw/{ => misc}/arm_sysctl.c | 0 hw/{ => misc}/cbus.c | 0 hw/{ => misc}/eccmemctl.c | 0 hw/{ => misc}/exynos4210_pmu.c | 0 hw/{ => misc}/imx_ccm.c | 0 hw/{ => misc}/lm32_sys.c | 0 hw/{ => misc}/milkymist-hpdmc.c | 0 hw/{ => misc}/milkymist-pfpu.c | 0 hw/{ => misc}/mst_fpga.c | 0 hw/{ => misc}/omap_clk.c | 0 hw/{ => misc}/omap_gpmc.c | 0 hw/{ => misc}/omap_l4.c | 0 hw/{ => misc}/omap_sdrc.c | 0 hw/{ => misc}/omap_tap.c | 0 hw/{ => misc}/pxa2xx_pcmcia.c | 0 hw/{ => misc}/slavio_misc.c | 0 hw/{ => misc}/zynq_slcr.c | 0 hw/sparc/Makefile.objs | 5 ----- 24 files changed, 25 insertions(+), 23 deletions(-) rename hw/{ => misc}/a9scu.c (100%) rename hw/{ => misc}/arm_sysctl.c (100%) rename hw/{ => misc}/cbus.c (100%) rename hw/{ => misc}/eccmemctl.c (100%) rename hw/{ => misc}/exynos4210_pmu.c (100%) rename hw/{ => misc}/imx_ccm.c (100%) rename hw/{ => misc}/lm32_sys.c (100%) rename hw/{ => misc}/milkymist-hpdmc.c (100%) rename hw/{ => misc}/milkymist-pfpu.c (100%) rename hw/{ => misc}/mst_fpga.c (100%) rename hw/{ => misc}/omap_clk.c (100%) rename hw/{ => misc}/omap_gpmc.c (100%) rename hw/{ => misc}/omap_l4.c (100%) rename hw/{ => misc}/omap_sdrc.c (100%) rename hw/{ => misc}/omap_tap.c (100%) rename hw/{ => misc}/pxa2xx_pcmcia.c (100%) rename hw/{ => misc}/slavio_misc.c (100%) rename hw/{ => misc}/zynq_slcr.c (100%)