lm32-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/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
index f4898383ebc72a2680e2d4f72d31490f4901672e..6d259665d604b4a0cc07d4130ac52b729500e3d1 100644 (file)
--- 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 e126cbb188651512a4e2bd3e5312671edad56ef1..a96ea763a8f56813c4a18e31c2aa6cf72d51c6bb 100644 (file)
--- 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 4f45840670e4917728921b704fb1a1aa4a5b0425..3d09c2dd6fa7b5cf43a7e21fe1b7d17b79a47281 100644 (file)
--- 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