From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:51882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG1-00023s-81 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4v-0005y4-KV for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:38 -0500 From: Thomas Huth Date: Wed, 13 Feb 2019 09:38:08 +0100 Message-Id: <1550047098-1210-16-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH v2 15/25] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Add dependencies for the Cubitech Cubieboard. Note that CONFIG_AHCI has a hard dependency on CONFIG_PCI currently, so PCI is now always selected by AHCI, even for boards that only want to use AHCI via a sysbus device. We should break up that dependency later by splitting ahci.c into sysbus and pci parts. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 6 +----- hw/arm/Kconfig | 9 +++++++++ hw/ide/Kconfig | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 3279fb5..28bb37f 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -4,6 +4,7 @@ CONFIG_ARM_V7M=y CONFIG_ARM_VIRT=y +CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y @@ -28,7 +29,6 @@ CONFIG_NETDUINO2=y CONFIG_VGA=y CONFIG_SSI_M25P80=y -CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y CONFIG_FRAMEBUFFER=y @@ -55,10 +55,6 @@ CONFIG_IOTKIT_SYSCTL=y CONFIG_IOTKIT_SYSINFO=y CONFIG_ARMSSE_CPUID=y -CONFIG_ALLWINNER_A10_PIT=y -CONFIG_ALLWINNER_A10_PIC=y -CONFIG_ALLWINNER_A10=y - CONFIG_FSL_IMX6=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 5d7dafb..3d78102 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -24,6 +24,10 @@ config CHEETAH select OMAP select TSC210X +config CUBIEBOARD + bool + select ALLWINNER_A10 + config DIGIC bool select PTIMER @@ -257,6 +261,11 @@ config EXYNOS4 config ALLWINNER_A10 bool + select AHCI + select ALLWINNER_A10_PIT + select ALLWINNER_A10_PIC + select ALLWINNER_EMAC + select SERIAL config RASPI bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index ab47b6a..c457f60 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -45,7 +45,7 @@ config MICRODRIVE config AHCI bool default y if PCI_DEVICES - depends on PCI + select PCI # TODO: Split up ahci.c into sysbus and pci parts select IDE_QDEV config IDE_SII3112 -- 1.8.3.1