@@ -1,7 +1,12 @@
# Default configuration for arm-softmmu
-CONFIG_PCI=y
+# TODO: ARM_V7M is currently always required - make this more flexible!
+CONFIG_ARM_V7M=y
+
CONFIG_PCI_DEVICES=y
+
+CONFIG_EXYNOS4=y
+
CONFIG_VGA=y
CONFIG_NAND=y
CONFIG_ECC=y
@@ -25,7 +30,6 @@ CONFIG_ADS7846=y
CONFIG_MAX111X=y
CONFIG_SSI_SD=y
CONFIG_SSI_M25P80=y
-CONFIG_LAN9118=y
CONFIG_SMC91C111=y
CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
@@ -35,21 +39,15 @@ CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_MICRODRIVE=y
CONFIG_USB_MUSB=y
-CONFIG_USB_EHCI_SYSBUS=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
CONFIG_ARM11MPCORE=y
-CONFIG_A9MPCORE=y
CONFIG_A15MPCORE=y
-CONFIG_ARM_V7M=y
CONFIG_NETDUINO2=y
-CONFIG_ARM_GIC=y
CONFIG_ARM_TIMER=y
-CONFIG_ARM_MPTIMER=y
-CONFIG_A9_GTIMER=y
CONFIG_PL011=y
CONFIG_PL022=y
CONFIG_PL031=y
@@ -60,11 +58,9 @@ CONFIG_PL080=y
CONFIG_PL110=y
CONFIG_PL181=y
CONFIG_PL190=y
-CONFIG_PL310=y
CONFIG_PL330=y
CONFIG_CADENCE=y
CONFIG_XGMAC=y
-CONFIG_EXYNOS4=y
CONFIG_PXA2XX=y
CONFIG_BITBANG_I2C=y
CONFIG_FRAMEBUFFER=y
@@ -72,7 +68,6 @@ CONFIG_XILINX_SPIPS=y
CONFIG_ZYNQ_DEVCFG=y
CONFIG_ARM11SCU=y
-CONFIG_A9SCU=y
CONFIG_DIGIC=y
CONFIG_MARVELL_88W8618=y
CONFIG_OMAP=y
@@ -124,7 +119,6 @@ CONFIG_VFIO_PLATFORM=y
CONFIG_VFIO_XGMAC=y
CONFIG_VFIO_AMD_XGBE=y
-CONFIG_SDHCI=y
CONFIG_INTEGRATOR=y
CONFIG_INTEGRATOR_DEBUG=y
@@ -7,7 +7,14 @@ config DIGIC
config EXYNOS4
bool
+ select A9MPCORE
+ select I2C
+ select LAN9118
+ select PCI
+ select PL310 # cache controller
select PTIMER
+ select SDHCI
+ select USB_EHCI_SYSBUS
config HIGHBANK
bool
@@ -112,6 +119,10 @@ config ZAURUS
config A9MPCORE
bool
+ select A9_GTIMER
+ select A9SCU # snoop control unit
+ select ARM_GIC
+ select ARM_MPTIMER
config A15MPCORE
bool
Add Kconfig dependencies for the Exynos-related boards (nuri and smdkc210). This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Signed-off-by: Thomas Huth <thuth@redhat.com> --- default-configs/arm-softmmu.mak | 18 ++++++------------ hw/arm/Kconfig | 11 +++++++++++ 2 files changed, 17 insertions(+), 12 deletions(-)