From a22b2ce579bf20063cf1908cf3f951c4165be449 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 29 Jan 2019 12:16:26 +0100 Subject: [PATCH] microblaze-softmmu.mak: express dependencies with Kconfig %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/microblaze-softmmu.mak | 10 ++-------- hw/microblaze/Kconfig | 12 ++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak index 7140ef3199..db8c6e4bba 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -1,13 +1,7 @@ # Default configuration for microblaze-softmmu -CONFIG_PFLASH_CFI01=y -CONFIG_SERIAL=y -CONFIG_XILINX=y -CONFIG_XILINX_AXI=y -CONFIG_XILINX_SPI=y -CONFIG_XILINX_ETHLITE=y -CONFIG_SSI_M25P80=y -CONFIG_XLNX_ZYNQMP=y +# Boards: +# CONFIG_PETALOGIX_S3ADSP1800=y CONFIG_PETALOGIX_ML605=y CONFIG_XLNX_ZYNQMP_PMU=y diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig index 44683b2737..c4dc120973 100644 --- a/hw/microblaze/Kconfig +++ b/hw/microblaze/Kconfig @@ -1,8 +1,20 @@ config PETALOGIX_S3ADSP1800 bool + select PFLASH_CFI01 + select XILINX + select XILINX_AXI + select XILINX_ETHLITE config PETALOGIX_ML605 bool + select PFLASH_CFI01 + select SERIAL + select SSI_M25P80 + select XILINX + select XILINX_AXI + select XILINX_ETHLITE + select XILINX_SPI config XLNX_ZYNQMP_PMU bool + select XLNX_ZYNQMP -- 2.30.2