Received: from eggs.gnu.org ([209.51.188.92]:47894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBST-00081E-Eb for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:08:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBSS-0005nc-Gh for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:08:25 -0400 From: Thomas Huth Date: Thu, 18 Apr 2019 20:00:42 +0200 Message-Id: <20190418180057.3593-15-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-QEMU-4.1 v5 14/29] hw/arm: Express dependencies of collie with Kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Cc: Beniamino Galvani , Jan Kiszka , Antony Pavlov , Peter Chubb , qemu-block@nongnu.org, Cedric Le Goater , "Michael S. Tsirkin" , Andrew Jeffery , Igor Mitsyanko , Andrey Smirnov , Rob Herring , qemu-arm@nongnu.org, Andrzej Zaborowski , John Snow , Joel Stanley , "Edgar E . Iglesias" , Jean-Christophe Dubois , Marcel Apfelbaum , Philippe Mathieu-Daude , Alistair Francis , Subbaraya Sundeep , Gerd Hoffmann Add Kconfig dependencies for the Strongarm collie machine. This patch is based on earlier work by =C3=81kos Kov=C3=A1cs (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 7 +++++++ hw/arm/Makefile.objs | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index af78e7c892..25e8f717ac 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -25,6 +25,7 @@ CONFIG_GUMSTIX=3Dy CONFIG_SPITZ=3Dy CONFIG_TOSA=3Dy CONFIG_Z2=3Dy +CONFIG_COLLIE=3Dy =20 CONFIG_VGA=3Dy CONFIG_TMP421=3Dy @@ -97,5 +98,3 @@ CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy - -CONFIG_STRONGARM=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 785e383411..325133c129 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -168,6 +168,13 @@ config STELLARIS =20 config STRONGARM bool + select PXA2XX + +config COLLIE + bool + select PFLASH_CFI01 + select ZAURUS # scoop + select STRONGARM =20 config SX1 bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 00328d1b0b..729e711b87 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -17,7 +17,7 @@ obj-$(CONFIG_TOSA) +=3D tosa.o obj-$(CONFIG_Z2) +=3D z2.o obj-$(CONFIG_REALVIEW) +=3D realview.o obj-$(CONFIG_STELLARIS) +=3D stellaris.o -obj-$(CONFIG_STRONGARM) +=3D collie.o +obj-$(CONFIG_COLLIE) +=3D collie.o obj-$(CONFIG_VERSATILE) +=3D versatilepb.o obj-$(CONFIG_VEXPRESS) +=3D vexpress.o obj-$(CONFIG_ZYNQ) +=3D xilinx_zynq.o --=20 2.21.0