aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2019-01-29 12:16:26 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2019-03-07 21:46:19 +0100
commit0858746b8355df74b32c4e38a2e9755bc67564cc (patch)
tree5a410ae71fd3d551460bbb93d4581c1736365cfd
parent9483cf27dd363926b59ee3a9c117538c834beb4e (diff)
downloadqemu-0858746b8355df74b32c4e38a2e9755bc67564cc.zip
qemu-0858746b8355df74b32c4e38a2e9755bc67564cc.tar.gz
qemu-0858746b8355df74b32c4e38a2e9755bc67564cc.tar.bz2
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>
-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 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 e126cbb..a96ea76 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 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