summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--default-configs/lm32-softmmu.mak10
-rw-r--r--hw/display/Kconfig3
-rw-r--r--hw/lm32/Kconfig6
3 files changed, 13 insertions, 6 deletions
diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
index f4898383eb..6d259665d6 100644
--- a/default-configs/lm32-softmmu.mak
+++ b/default-configs/lm32-softmmu.mak
@@ -1,8 +1,10 @@
 # Default configuration for lm32-softmmu
 
+# Uncomment the following lines to disable these optional devices:
+#
+#CONFIG_MILKYMIST_TMU2=n        # disabling it actually causes compile-time failures
+
+# Boards:
+#
 CONFIG_LM32=y
 CONFIG_MILKYMIST=y
-CONFIG_FRAMEBUFFER=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_SD=y
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index e126cbb188..a96ea763a8 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -70,8 +70,7 @@ config FRAMEBUFFER
 
 config MILKYMIST_TMU2
     bool
-    default y
-    depends on OPENGL && X11 && MILKYMIST
+    depends on OPENGL && X11
 
 config SM501
     bool
diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
index 4f45840670..3d09c2dd6f 100644
--- a/hw/lm32/Kconfig
+++ b/hw/lm32/Kconfig
@@ -1,7 +1,13 @@
 config LM32
     bool
     select PTIMER
+    select PFLASH_CFI02
 
 config MILKYMIST
     bool
+    # FIXME: disabling it results in compile-time errors
+    select MILKYMIST_TMU2 if OPENGL && X11
     select PTIMER
+    select PFLASH_CFI01
+    select FRAMEBUFFER
+    select SD