aboutsummaryrefslogtreecommitdiff
path: root/default-configs
diff options
context:
space:
mode:
Diffstat (limited to 'default-configs')
-rw-r--r--default-configs/arm-softmmu.mak24
1 files changed, 5 insertions, 19 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 3f82d635e4..df7d9421e0 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -3,9 +3,8 @@
# TODO: ARM_V7M is currently always required - make this more flexible!
CONFIG_ARM_V7M=y
-CONFIG_PCI=y
-CONFIG_PCI_DEVICES=y
-CONFIG_PCI_TESTDEV=y
+# CONFIG_PCI_DEVICES=n
+# CONFIG_TEST_DEVICES=n
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
@@ -17,6 +16,9 @@ CONFIG_CHEETAH=y
CONFIG_SX1=y
CONFIG_NSERIES=y
CONFIG_STELLARIS=y
+CONFIG_REALVIEW=y
+CONFIG_VERSATILE=y
+CONFIG_VEXPRESS=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -25,8 +27,6 @@ CONFIG_SERIAL=y
CONFIG_MAX7310=y
CONFIG_TMP421=y
CONFIG_PCA9552=y
-CONFIG_DDC=y
-CONFIG_SII9022=y
CONFIG_ADS7846=y
CONFIG_MAX111X=y
CONFIG_SSI_M25P80=y
@@ -38,13 +38,8 @@ CONFIG_MICRODRIVE=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
-CONFIG_ARM11MPCORE=y
-
CONFIG_NETDUINO2=y
-CONFIG_PL041=y
-CONFIG_PL080=y
-CONFIG_PL190=y
CONFIG_PL330=y
CONFIG_CADENCE=y
CONFIG_PXA2XX=y
@@ -52,12 +47,10 @@ CONFIG_FRAMEBUFFER=y
CONFIG_XILINX_SPIPS=y
CONFIG_ZYNQ_DEVCFG=y
-CONFIG_ARM11SCU=y
CONFIG_DIGIC=y
CONFIG_MAINSTONE=y
CONFIG_MPS2=y
CONFIG_RASPI=y
-CONFIG_REALVIEW=y
CONFIG_ZAURUS=y
CONFIG_ZYNQ=y
CONFIG_STM32F2XX_TIMER=y
@@ -86,10 +79,6 @@ CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
CONFIG_ARMSSE_MHU=y
-CONFIG_VERSATILE=y
-CONFIG_VERSATILE_PCI=y
-CONFIG_VERSATILE_I2C=y
-
CONFIG_PCI_EXPRESS=y
CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
@@ -120,6 +109,3 @@ CONFIG_XILINX_AXI=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y
CONFIG_STRONGARM=y
-
-# for realview and versatilepb
-CONFIG_LSI_SCSI_PCI=y