From patchwork Mon Jan 30 12:00:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 6435 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E8D38249C6 for ; Mon, 30 Jan 2012 12:00:56 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id CE8A3A186AA for ; Mon, 30 Jan 2012 12:00:56 +0000 (UTC) Received: by bkar19 with SMTP id r19so4091239bka.11 for ; Mon, 30 Jan 2012 04:00:56 -0800 (PST) Received: by 10.205.121.2 with SMTP id ga2mr8222789bkc.38.1327924856482; Mon, 30 Jan 2012 04:00:56 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.204.130.220 with SMTP id u28cs149366bks; Mon, 30 Jan 2012 04:00:56 -0800 (PST) Received: by 10.180.96.161 with SMTP id dt1mr27733246wib.13.1327924855182; Mon, 30 Jan 2012 04:00:55 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id a6si12227558wed.112.2012.01.30.04.00.54 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 Jan 2012 04:00:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Rrpum-0003km-V5; Mon, 30 Jan 2012 12:00:52 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , patches@linaro.org Subject: [PATCH v3 5/7] hw/vexpress.c: Instantiate the motherboard CLCD Date: Mon, 30 Jan 2012 12:00:50 +0000 Message-Id: <1327924852-14395-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1327924852-14395-1-git-send-email-peter.maydell@linaro.org> References: <1327924852-14395-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 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 Reviewed-by: Andreas Färber --- hw/vexpress.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/vexpress.c b/hw/vexpress.c index 26537f7..27459d9 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 */