From: Thomas Huth Date: Thu, 7 Feb 2019 09:35:22 +0000 (+0100) Subject: hw/arm: Express dependencies of the highbank machines with Kconfig X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=08bcda026fc7543ccde115e750936bfd273c459d;p=qemu.git hw/arm: Express dependencies of the highbank machines with Kconfig Add Kconfig dependencies for the highbank machine (and the midway machine). This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 2a11e76cc7..50a4be3cad 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_PCI_DEVICES=y CONFIG_PCI_TESTDEV=y CONFIG_EXYNOS4=y +CONFIG_HIGHBANK=y CONFIG_VGA=y CONFIG_NAND=y @@ -45,24 +46,17 @@ CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y CONFIG_ARM11MPCORE=y -CONFIG_A15MPCORE=y CONFIG_NETDUINO2=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_PL110=y CONFIG_PL181=y CONFIG_PL190=y CONFIG_PL330=y CONFIG_CADENCE=y -CONFIG_XGMAC=y CONFIG_PXA2XX=y CONFIG_BITBANG_I2C=y CONFIG_FRAMEBUFFER=y @@ -150,7 +144,6 @@ CONFIG_XILINX_AXI=y CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y -CONFIG_HIGHBANK=y CONFIG_MUSICPAL=y # for realview and versatilepb diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index acd07b2add..0ba377ac18 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -18,6 +18,17 @@ config EXYNOS4 config HIGHBANK bool + select A9MPCORE + select A15MPCORE + select AHCI + select ARM_TIMER # sp804 + select ARM_V7M + select PL011 # UART + select PL022 # Serial port + select PL031 # RTC + select PL061 # GPIO + select PL310 # cache controller + select XGMAC # ethernet config INTEGRATOR bool