%-softmmu.mak only keep boards and optional device
definitions in Kconfig mode.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
default-configs/lm32-softmmu.mak | 10 ++++++----
hw/display/Kconfig | 3 +--
hw/lm32/Kconfig | 6 ++++++
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
index f489838..6d25966 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 69f8a7e..ee3acd9 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -71,8 +71,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 4f45840..3d09c2d 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
--
1.8.3.1
