summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2012-02-16 09:56:09 +0000
committerPeter Maydell <peter.maydell@linaro.org>2012-02-17 11:13:24 +0000
commitb7206878680f1e77031dacb420ef2c630a6b6257 (patch)
tree8dc4846263ea8f03577ea102acde144c431b4c7e
parent4c3b29b8ad22857b1bb8e28cb17eabd108d9b978 (diff)
downloadfocaccia-qemu-b7206878680f1e77031dacb420ef2c630a6b6257.tar.gz
focaccia-qemu-b7206878680f1e77031dacb420ef2c630a6b6257.zip
hw/vexpress.c: Instantiate the motherboard CLCD
Instantiate the CLCD on the vexpress motherboard as well as one on
the daughterboard -- the A15 daughterboard does not have a CLCD
and so relies on the motherboard one.

At the moment QEMU doesn't provide infrastructure for selecting
which display device gets to actually show graphics -- the first
one registered is it. Fortunately this works for the major use
case (Linux): if the daughterboard has a CLCD it will come first
and be used, otherwise we fall back to the motherboard CLCD.
So we don't (currently) need to implement the control register
which allows software to tell the mux which video output to pass
through to the outside world.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--hw/vexpress.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/vexpress.c b/hw/vexpress.c
index 8239ea184d..43ad206f0f 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -282,7 +282,7 @@ static void vexpress_common_init(const VEDBoardInfo *daughterboard,
 
     /* VE_COMPACTFLASH: not modelled */
 
-    /* VE_CLCD: not modelled (we use the daughterboard CLCD only) */
+    sysbus_create_simple("pl111", map[VE_CLCD], pic[14]);
 
     /* VE_NORFLASH0: not modelled */
     /* VE_NORFLASH0ALIAS: not modelled */