summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-03-27 18:54:12 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-04-08 18:13:11 +0200
commitce3b494cb504f96992f2d37ebc8f56deed202b06 (patch)
treef429708613d5a933df2175e289718e5c1afb81e0
parent1fd6bb44ed7ddd875e0d37d17685621f1ef27823 (diff)
downloadqemu-ce3b494cb504f96992f2d37ebc8f56deed202b06.tar.gz
qemu-ce3b494cb504f96992f2d37ebc8f56deed202b06.tar.bz2
qemu-ce3b494cb504f96992f2d37ebc8f56deed202b06.zip
moxie: configure with default-configs file
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--default-configs/moxie-softmmu.mak3
-rw-r--r--hw/moxie/Makefile.objs2
2 files changed, 4 insertions, 1 deletions
diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-softmmu.mak
index 8ede8d5b23..0a8194aafe 100644
--- a/default-configs/moxie-softmmu.mak
+++ b/default-configs/moxie-softmmu.mak
@@ -1 +1,4 @@
# Default configuration for moxie-softmmu
+
+CONFIG_SERIAL=y
+CONFIG_VGA=y
diff --git a/hw/moxie/Makefile.objs b/hw/moxie/Makefile.objs
index a5f1742936..f5e04e80ff 100644
--- a/hw/moxie/Makefile.objs
+++ b/hw/moxie/Makefile.objs
@@ -1,5 +1,5 @@
# moxie boards
-obj-y = serial.o mc146818rtc.o vga.o
+obj-y = mc146818rtc.o
obj-y := $(addprefix ../,$(obj-y))
obj-y += moxiesim.o