qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, yang.zhong@intel.com, pbonzini@redhat.com
Cc: qemu-arm@nongnu.org, philmd@redhat.com
Subject: [Qemu-devel] [PATCH 03/25] hw/arm: Express dependencies of integratorcp with Kconfig
Date: Sat,  9 Feb 2019 07:39:04 +0100	[thread overview]
Message-ID: <1549694366-1284-4-git-send-email-thuth@redhat.com> (raw)
In-Reply-To: <1549694366-1284-1-git-send-email-thuth@redhat.com>

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 | 11 +----------
 hw/arm/Kconfig                  |  9 +++++++++
 hw/display/Kconfig              |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 59734ee..2033050 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -7,6 +7,7 @@ CONFIG_PCI_DEVICES=y
 
 CONFIG_EXYNOS4=y
 CONFIG_HIGHBANK=y
+CONFIG_INTEGRATOR=y
 
 CONFIG_VGA=y
 CONFIG_NAND=y
@@ -31,7 +32,6 @@ CONFIG_ADS7846=y
 CONFIG_MAX111X=y
 CONFIG_SSI_SD=y
 CONFIG_SSI_M25P80=y
-CONFIG_SMC91C111=y
 CONFIG_ALLWINNER_EMAC=y
 CONFIG_IMX_FEC=y
 CONFIG_FTGMAC100=y
@@ -49,15 +49,8 @@ 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_PL080=y
-CONFIG_PL110=y
-CONFIG_PL181=y
 CONFIG_PL190=y
 CONFIG_PL330=y
 CONFIG_CADENCE=y
@@ -119,8 +112,6 @@ CONFIG_VFIO_XGMAC=y
 CONFIG_VFIO_AMD_XGBE=y
 
 CONFIG_SDHCI=y
-CONFIG_INTEGRATOR=y
-CONFIG_INTEGRATOR_DEBUG=y
 
 CONFIG_ALLWINNER_A10_PIT=y
 CONFIG_ALLWINNER_A10_PIC=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 984de8a..c022b8d 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -33,6 +33,15 @@ config HIGHBANK
 
 config INTEGRATOR
     bool
+    select ARM_TIMER
+    select INTEGRATOR_DEBUG
+    select PL011 # UART
+    select PL031 # RTC
+    select PL050 # keyboard/mouse
+    select PL110 # pl111 LCD controller
+    select PL181 # display
+    select PCI
+    select SMC91C111
 
 config MAINSTONE
     bool
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index ee3acd9..34c8c12 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -21,6 +21,7 @@ config JAZZ_LED
 
 config PL110
     bool
+    select FRAMEBUFFER
 
 config SII9022
     bool
-- 
1.8.3.1

  parent reply	other threads:[~2019-02-09  6:40 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-09  6:39 [Qemu-devel] [PATCH 00/25] Kconfig dependencies for ARM machines Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 01/25] hw/arm: Express dependencies of the exynos machines with Kconfig Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 02/25] hw/arm: Express dependencies of the highbank " Thomas Huth
2019-02-09  6:39 ` Thomas Huth [this message]
2019-02-09  6:39 ` [Qemu-devel] [PATCH 04/25] hw/arm: Express dependencies of the fsl-imx31 machine " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 05/25] hw/arm: Express dependencies of musicpal " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 06/25] hw/arm: Express dependencies of the OMAP machines " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 07/25] hw/arm: Express dependencies of stellaris " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 08/25] hw/arm: Express dependencies of realview, versatile and vexpress " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 09/25] hw/arm: Express dependencies of the PXA2xx machines " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 10/25] hw/arm: Express dependencies of xilinx-zynq " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 11/25] hw/arm: Express dependencies of collie " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 12/25] hw/arm: Express dependencies of the aspeed boards " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 13/25] hw/arm: Express dependencies of the virt machine " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 14/25] hw/arm: Express dependencies of netduino / stm32f2xx " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 15/25] hw/arm: Express dependencies of allwinner / cubieboard " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 16/25] hw/arm: Express dependencies of the MPS2 boards " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 17/25] hw/arm: Express dependencies of the raspi machines " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 18/25] hw/arm: Express dependencies of canon-a1100 " Thomas Huth
2019-02-11 17:45   ` Philippe Mathieu-Daudé
2019-02-09  6:39 ` [Qemu-devel] [PATCH 19/25] hw/arm: Express dependencies of sabrelite " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 20/25] hw/arm: Express dependencies of the MSF2 machine " Thomas Huth
2019-02-11 17:42   ` Philippe Mathieu-Daudé
2019-02-09  6:39 ` [Qemu-devel] [PATCH 21/25] hw/arm: Express dependencies for remaining IMX boards " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 22/25] hw/arm: Express dependencies of nrf51 Kconfig Thomas Huth
2019-02-11 17:37   ` Philippe Mathieu-Daudé
2019-02-12 16:13     ` Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 23/25] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig Thomas Huth
2019-02-11 14:45   ` Paolo Bonzini
2019-02-12 16:05     ` Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 24/25] hw/arm: Express dependencies of the xlnx-versal-virt " Thomas Huth
2019-02-09  6:39 ` [Qemu-devel] [PATCH 25/25] hw/arm: Remove hard-enablement of the remaining PCI devices Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1549694366-1284-4-git-send-email-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=yang.zhong@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).