diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
index b3cae5966b..5932cf4d06 100644
--- 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 b7738ab2eb..884ad2cbc0 100644
--- 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