From patchwork Tue Jan 24 12:39:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 6370 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 CF3D423F8F for ; Tue, 24 Jan 2012 12:39:25 +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 BF027A1835F for ; Tue, 24 Jan 2012 12:39:25 +0000 (UTC) Received: by mail-bk0-f52.google.com with SMTP id r19so3955104bka.11 for ; Tue, 24 Jan 2012 04:39:25 -0800 (PST) MIME-Version: 1.0 Received: by 10.205.120.17 with SMTP id fw17mr4758794bkc.74.1327408765561; Tue, 24 Jan 2012 04:39:25 -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 u28cs99702bks; Tue, 24 Jan 2012 04:39:25 -0800 (PST) Received: by 10.216.136.132 with SMTP id w4mr5060167wei.53.1327408763369; Tue, 24 Jan 2012 04:39:23 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id n11si13740797wiw.4.2012.01.24.04.39.22 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jan 2012 04:39:23 -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 1Rpfej-0000xr-36; Tue, 24 Jan 2012 12:39:21 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH v2 7/9] hw/vexpress.c: Instantiate the motherboard CLCD Date: Tue, 24 Jan 2012 12:39:18 +0000 Message-Id: <1327408760-3666-8-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1327408760-3666-1-git-send-email-peter.maydell@linaro.org> References: <1327408760-3666-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQmsNWPZvOcD2qUct/Z0UOj3TNh+Xbb4hfibIHYicLGt4CW5DbZFu7+QWGjgzouQ1m+8kJtP 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 9033b50..9860085 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 */