%-softmmu.mak only keep boards and optional device
definitions in Kconfig mode.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
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 baf90ca..6c1e898 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_FPGA=y
diff --git a/default-configs/xtensaeb-softmmu.mak
b/default-configs/xtensaeb-softmmu.mak
index baf90ca..f7e48c7 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_FPGA=y
+include xtensa-softmmu.mak
diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig
index 97543a9..2b507d4 100644
--- a/hw/xtensa/Kconfig
+++ b/hw/xtensa/Kconfig
@@ -3,3 +3,6 @@ config XTENSA_SIM
config XTENSA_FPGA
bool
+ select OPENCORES_ETH
+ select PFLASH_CFI01
+ select SERIAL
--
1.8.3.1
