On 10/03/2019 22.33, Philippe Mathieu-Daudé wrote: > Hi Thomas, > > On 3/7/19 3:18 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 b6f3d60..b8509fd 100644 >> --- a/default-configs/arm-softmmu.mak >> +++ b/default-configs/arm-softmmu.mak >> @@ -27,6 +27,7 @@ CONFIG_Z2=y >> CONFIG_COLLIE=y >> CONFIG_ASPEED_SOC=y >> CONFIG_NETDUINO2=y >> +CONFIG_MPS2=y >> >> CONFIG_VGA=y >> CONFIG_SSI_M25P80=y >> @@ -35,28 +36,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 743c78b..32c8663 100644 >> --- a/hw/arm/Kconfig >> +++ b/hw/arm/Kconfig >> @@ -308,6 +308,13 @@ config ASPEED_SOC >> >> config MPS2 >> bool >> + select ARMSSE >> + select LAN9118 >> + select MPS2_FPGAIO >> + select MPS2_SCC >> + select PL022 # Serial port >> + select PL080 # DMA controller >> + select TZ_MPC > > Can we move TZ_MPC to ARMSSE?
Oh, right, armsse_init() uses TYPE_TZ_MPC, too, so it should be moved. Thomas