xtensa-softmmu.mak: express dependencies with Kconfig

%-softmmu.mak only keep boards and optional device
definitions in Kconfig mode.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak
index 7aa7fa66fc99bf3e1df8fe3753d2151a231db8e3..7e4d1cc0979c076e9f09d26aa81f3d451e1ed113 100644 (file)
--- 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 7aa7fa66fc99bf3e1df8fe3753d2151a231db8e3..f7e48c750cda65fca0aef8d0c609733e8a026846 100644 (file)
--- 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 dc8eaf6080b8af032fbf82b38778493f84fa1844..d72817d012e376c9c48b661c307327cac41b6a8e 100644 (file)
--- 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