Received: from eggs.gnu.org ([209.51.188.92]:46677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBOX-0004kV-OI for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBOV-0002xA-9c for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:21 -0400 From: Thomas Huth Date: Thu, 18 Apr 2019 20:00:47 +0200 Message-Id: <20190418180057.3593-20-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-QEMU-4.1 v5 19/29] hw/arm: Express dependencies of the MPS2 boards 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 mps2-an* machines. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 20 +------------------- hw/arm/Kconfig | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index a0b9016e3a..31d31d3f4a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -30,6 +30,7 @@ CONFIG_Z2=3Dy CONFIG_COLLIE=3Dy CONFIG_ASPEED_SOC=3Dy CONFIG_NETDUINO2=3Dy +CONFIG_MPS2=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy @@ -38,28 +39,9 @@ CONFIG_IMX_FEC=3Dy CONFIG_FRAMEBUFFER=3Dy =20 CONFIG_DIGIC=3Dy -CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy CONFIG_NRF51_SOC=3Dy =20 -CONFIG_CMSDK_APB_TIMER=3Dy -CONFIG_CMSDK_APB_DUALTIMER=3Dy -CONFIG_CMSDK_APB_UART=3Dy -CONFIG_CMSDK_APB_WATCHDOG=3Dy - -CONFIG_MPS2_FPGAIO=3Dy -CONFIG_MPS2_SCC=3Dy - -CONFIG_TZ_MPC=3Dy -CONFIG_TZ_MSC=3Dy -CONFIG_TZ_PPC=3Dy -CONFIG_ARMSSE=3Dy -CONFIG_IOTKIT_SECCTL=3Dy -CONFIG_IOTKIT_SYSCTL=3Dy -CONFIG_IOTKIT_SYSINFO=3Dy -CONFIG_ARMSSE_CPUID=3Dy -CONFIG_ARMSSE_MHU=3Dy - CONFIG_FSL_IMX6=3Dy CONFIG_FSL_IMX25=3Dy CONFIG_FSL_IMX7=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 2ef5696900..466b143fdf 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -301,6 +301,12 @@ config ASPEED_SOC =20 config MPS2 bool + select ARMSSE + select LAN9118 + select MPS2_FPGAIO + select MPS2_SCC + select PL022 # Serial port + select PL080 # DMA controller =20 config FSL_IMX7 bool @@ -340,6 +346,18 @@ config ARM11MPCORE =20 config ARMSSE bool + select ARMSSE_CPUID + select ARMSSE_MHU + select CMSDK_APB_TIMER + select CMSDK_APB_DUALTIMER + select CMSDK_APB_UART + select CMSDK_APB_WATCHDOG + select IOTKIT_SECCTL + select IOTKIT_SYSCTL + select IOTKIT_SYSINFO + select TZ_MPC + select TZ_MSC + select TZ_PPC =20 config ARMSSE_CPUID bool --=20 2.21.0