Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging

[qemu.git] / default-configs / cris-softmmu.mak

diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
index e0d2cabb2d569d5bbb3ff6b4d4717dd7b0de0198..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_NAND=y
-CONFIG_PTIMER=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_PFLASH_CFI02=y
+# Boards:
+#
+CONFIG_AXIS=y