cris-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/cris-softmmu.mak b/default-configs/cris-softmmu.mak
index b3cae5966bb3c3c3e9eca13ad085c1253cc98f8e..5932cf4d06fbf0564730cd6607409d91c01f562a 100644 (file)
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/cris-softmmu.mak
@@ -1,6 +1,5 @@
 # Default configuration for cris-softmmu
 
-CONFIG_ETRAXFS=y
-CONFIG_NAND=y
-CONFIG_PFLASH_CFI02=y
+# Boards:
+#
 CONFIG_AXIS=y

diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig
index b7738ab2eb1b41e15d3c3793af3066c5a48d1799..884ad2cbc0d3f6d61d095b690f5feedd150ee76b 100644 (file)
--- a/hw/cris/Kconfig
+++ b/hw/cris/Kconfig
@@ -1,5 +1,8 @@
 config AXIS
     bool
+    select ETRAXFS
+    select PFLASH_CFI02
+    select NAND
 
 config ETRAXFS
    bool