From 3a56c2f36c3f53da8ffebd9789a8fbd876d2f1a9 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 29 Jan 2019 12:16:27 +0100 Subject: [PATCH] xtensa-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/xtensa-softmmu.mak | 6 ++---- default-configs/xtensaeb-softmmu.mak | 7 +------ hw/xtensa/Kconfig | 3 +++ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak index 7aa7fa66fc..7e4d1cc097 100644 --- a/default-configs/xtensa-softmmu.mak +++ b/default-configs/xtensa-softmmu.mak @@ -1,8 +1,6 @@ # Default configuration for Xtensa -CONFIG_SERIAL=y -CONFIG_OPENCORES_ETH=y -CONFIG_PFLASH_CFI01=y - +# Boards: +# CONFIG_XTENSA_SIM=y CONFIG_XTENSA_XTFPGA=y diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensaeb-softmmu.mak index 7aa7fa66fc..f7e48c750c 100644 --- a/default-configs/xtensaeb-softmmu.mak +++ b/default-configs/xtensaeb-softmmu.mak @@ -1,8 +1,3 @@ # Default configuration for Xtensa -CONFIG_SERIAL=y -CONFIG_OPENCORES_ETH=y -CONFIG_PFLASH_CFI01=y - -CONFIG_XTENSA_SIM=y -CONFIG_XTENSA_XTFPGA=y +include xtensa-softmmu.mak diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig index dc8eaf6080..d72817d012 100644 --- a/hw/xtensa/Kconfig +++ b/hw/xtensa/Kconfig @@ -3,3 +3,6 @@ config XTENSA_SIM config XTENSA_XTFPGA bool + select OPENCORES_ETH + select PFLASH_CFI01 + select SERIAL -- 2.39.5