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>
8 years ago · 3a56c2f36c
3 changed files with 6 additions and 10 deletions
--- 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
--- 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
--- 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