Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

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

diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
index ab774a2509b739309359ea595941f47e9f2fd390..115b3e34c983747abfa0ea99efd21657b9bc81cb 100644 (file)
--- a/default-configs/lm32-softmmu.mak
+++ b/default-configs/lm32-softmmu.mak
@@ -1,4 +1,12 @@
 # Default configuration for lm32-softmmu
 
-CONFIG_PTIMER=y
-CONFIG_PFLASH_CFI02=y
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_MILKYMIST_TMU2=n        # disabling it actually causes compile-time failures
+
+CONFIG_SEMIHOSTING=y
+
+# Boards:
+#
+CONFIG_LM32=y
+CONFIG_MILKYMIST=y