On 4/18/19 8:00 PM, Thomas Huth wrote: > Add Kconfig dependencies for the mps2-an* machines. > > Signed-off-by: Thomas Huth <th...@redhat.com> > --- > 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-softmmu.mak > index a0b9016e3a..31d31d3f4a 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -30,6 +30,7 @@ CONFIG_Z2=y > CONFIG_COLLIE=y > CONFIG_ASPEED_SOC=y > CONFIG_NETDUINO2=y > +CONFIG_MPS2=y > > CONFIG_VGA=y > CONFIG_SSI_M25P80=y > @@ -38,28 +39,9 @@ CONFIG_IMX_FEC=y > CONFIG_FRAMEBUFFER=y > > CONFIG_DIGIC=y > -CONFIG_MPS2=y > CONFIG_RASPI=y > CONFIG_NRF51_SOC=y > > -CONFIG_CMSDK_APB_TIMER=y > -CONFIG_CMSDK_APB_DUALTIMER=y > -CONFIG_CMSDK_APB_UART=y > -CONFIG_CMSDK_APB_WATCHDOG=y > - > -CONFIG_MPS2_FPGAIO=y > -CONFIG_MPS2_SCC=y > - > -CONFIG_TZ_MPC=y > -CONFIG_TZ_MSC=y > -CONFIG_TZ_PPC=y > -CONFIG_ARMSSE=y > -CONFIG_IOTKIT_SECCTL=y > -CONFIG_IOTKIT_SYSCTL=y > -CONFIG_IOTKIT_SYSINFO=y > -CONFIG_ARMSSE_CPUID=y > -CONFIG_ARMSSE_MHU=y > - > CONFIG_FSL_IMX6=y > CONFIG_FSL_IMX25=y > CONFIG_FSL_IMX7=y > 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 > > config MPS2 > bool > + select ARMSSE > + select LAN9118 > + select MPS2_FPGAIO > + select MPS2_SCC > + select PL022 # Serial port > + select PL080 # DMA controller > > config FSL_IMX7 > bool > @@ -340,6 +346,18 @@ config ARM11MPCORE > > 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 > > config ARMSSE_CPUID > bool >
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
