diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 78d7af03a2e8..2b274958e63c 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -6,7 +6,7 @@ CONFIG_VGA=y
 CONFIG_NAND=y
 CONFIG_ECC=y
 CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
+CONFIG_SERIAL_ISA=$(CONFIG_SERIAL)
 CONFIG_PTIMER=y
 CONFIG_SD=y
 CONFIG_MAX7310=y
@@ -25,8 +25,8 @@ CONFIG_MAX111X=y
 CONFIG_SSI=y
 CONFIG_SSI_SD=y
 CONFIG_SSI_M25P80=y
-CONFIG_LAN9118=y
-CONFIG_SMC91C111=y
+CONFIG_LAN9118=$(or $(CONFIG_REALVIEW),$(CONFIG_EXYNOS4),$(CONFIG_FSL_IMX31))
+CONFIG_SMC91C111=$(or $(CONFIG_PXA2XX),$(CONFIG_MAINSTONE),$(CONFIG_REALVIEW))
 CONFIG_ALLWINNER_EMAC=y
 CONFIG_IMX_FEC=y
 CONFIG_FTGMAC100=y
@@ -39,6 +39,7 @@ CONFIG_USB_MUSB=y
 CONFIG_USB_EHCI_SYSBUS=y
 CONFIG_PLATFORM_BUS=y
 
+CONFIG_STRONGARM=y
 CONFIG_ARM11MPCORE=y
 CONFIG_A9MPCORE=y
 CONFIG_A15MPCORE=y
@@ -48,7 +49,7 @@ CONFIG_ARM_V7M=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
 CONFIG_ARM_TIMER=y
-CONFIG_ARM_MPTIMER=y
+CONFIG_ARM_MPTIMER=$(or $(CONFIG_A9MPCORE),$(CONFIG_ARM11MPCORE),$(CONFIG_A15MPCORE))
 CONFIG_A9_GTIMER=y
 CONFIG_PL011=y
 CONFIG_PL022=y
@@ -64,12 +65,13 @@ CONFIG_PL310=y
 CONFIG_PL330=y
 CONFIG_CADENCE=y
 CONFIG_XGMAC=y
-CONFIG_EXYNOS4=y
+CONFIG_EXYNOS4=$(CONFIG_A9MPCORE)
 CONFIG_PXA2XX=y
 CONFIG_BITBANG_I2C=y
 CONFIG_FRAMEBUFFER=y
 CONFIG_XILINX_SPIPS=y
 CONFIG_ZYNQ_DEVCFG=y
+CONFIG_HIGHBANK=$(and $(CONFIG_A9MPCORE),$(CONFIG_A15MPCORE))
 
 CONFIG_ARM11SCU=y
 CONFIG_A9SCU=y
@@ -81,10 +83,11 @@ CONFIG_BLIZZARD=y
 CONFIG_ONENAND=y
 CONFIG_TUSB6010=y
 CONFIG_IMX=y
-CONFIG_MAINSTONE=y
-CONFIG_NSERIES=y
+CONFIG_MAINSTONE=$(CONFIG_PXA2XX)
+CONFIG_NSERIES=$(CONFIG_OMAP)
 CONFIG_RASPI=y
-CONFIG_REALVIEW=y
+CONFIG_REALVIEW=$(CONFIG_ARM11MPCORE)
+CONFIG_INTEGRATOR=y
 CONFIG_ZAURUS=y
 CONFIG_ZYNQ=y
 CONFIG_STM32F2XX_TIMER=y
@@ -94,7 +97,7 @@ CONFIG_STM32F2XX_ADC=y
 CONFIG_STM32F2XX_SPI=y
 CONFIG_STM32F205_SOC=y
 
-CONFIG_VERSATILE_PCI=y
+CONFIG_VERSATILE_PCI=$(CONFIG_PCI)
 CONFIG_VERSATILE_I2C=y
 
 CONFIG_PCI_GENERIC=y
diff --git a/default-configs/armeb-softmmu.mak b/default-configs/armeb-softmmu.mak
new file mode 100644
index 000000000000..bf5c67c8f878
--- /dev/null
+++ b/default-configs/armeb-softmmu.mak
@@ -0,0 +1,26 @@
+# Default configuration for armeb-softmmu
+
+CONFIG_ECC=y
+CONFIG_SERIAL=y
+CONFIG_PTIMER=y
+CONFIG_SD=y
+CONFIG_SSI=y
+CONFIG_SSI_SD=y
+#CONFIG_USB=y
+CONFIG_PLATFORM_BUS=y
+CONFIG_ARM_V7M=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_TIMER=y
+CONFIG_PL011=y
+CONFIG_PL022=y
+CONFIG_PL031=y
+CONFIG_PL041=y
+CONFIG_PL050=y
+CONFIG_PL061=y
+CONFIG_PL080=y
+CONFIG_PL181=y
+CONFIG_PL190=y
+CONFIG_PL310=y
+CONFIG_PL330=y
+CONFIG_BITBANG_I2C=y
+CONFIG_GPIO_KEY=y
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 4c5c4ee76c12..729a41b20c89 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -1,15 +1,25 @@
-obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o
-obj-$(CONFIG_DIGIC) += digic_boards.o
-obj-y += integratorcp.o mainstone.o musicpal.o nseries.o
-obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o
-obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o
+obj-y += boot.o
+obj-$(CONFIG_HIGHBANK) += highbank.o
+obj-$(CONFIG_INTEGRATOR) += integratorcp.o
+obj-$(CONFIG_MARVELL_88W8618) += musicpal.o
+obj-$(CONFIG_REALVIEW) += realview.o versatilepb.o
+obj-$(CONFIG_A9MPCORE) += vexpress.o
+obj-$(CONFIG_SMBIOS) += virt.o
 obj-$(CONFIG_ACPI) += virt-acpi-build.o
+obj-$(CONFIG_ZYNQ) += xilinx_zynq.o
 obj-y += netduino2.o
 obj-y += sysbus-fdt.o
 
-obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
-obj-$(CONFIG_DIGIC) += digic.o
-obj-y += omap1.o omap2.o strongarm.o
+obj-y += armv7m.o
+obj-$(CONFIG_STELLARIS) += stellaris.o
+obj-$(CONFIG_EXYNOS4) += exynos4210.o exynos4_boards.o
+obj-$(CONFIG_DIGIC) += digic.o digic_boards.o
+obj-$(CONFIG_STRONGARM) += strongarm.o collie.o
+obj-$(CONFIG_OMAP) += omap1.o omap2.o omap_sx1.o palm.o
+obj-$(CONFIG_PXA2XX) += pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
+obj-$(CONFIG_PXA2XX) += gumstix.o spitz.o tosa.o z2.o
+obj-$(CONFIG_NSERIES) += nseries.o
+obj-$(CONFIG_MAINSTONE) += mainstone.o
 obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
 obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o
 obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o