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 1gtqG3-00023s-GV for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4q-0005pv-Gb for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:33 -0500 From: Thomas Huth Date: Wed, 13 Feb 2019 09:38:04 +0100 Message-Id: <1550047098-1210-12-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> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 11/25] 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, pbonzini@redhat.com, qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com 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 5c43bb3..9851068 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -21,6 +21,7 @@ CONFIG_GUMSTIX=3Dy CONFIG_SPITZ=3Dy CONFIG_TOSA=3Dy CONFIG_Z2=3Dy +CONFIG_COLLIE=3Dy =20 CONFIG_VGA=3Dy CONFIG_TMP421=3Dy @@ -95,5 +96,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 67f1228..39cbda9 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -175,6 +175,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 93e1160..053fcb6 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 1.8.3.1