From patchwork Wed Feb 15 14:36:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 6787 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 42E0023E01 for ; Wed, 15 Feb 2012 14:36:34 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 0C577A189DF for ; Wed, 15 Feb 2012 14:36:33 +0000 (UTC) Received: by yhgm50 with SMTP id m50so791024yhg.11 for ; Wed, 15 Feb 2012 06:36:33 -0800 (PST) Received: by 10.50.188.234 with SMTP id gd10mr11721088igc.29.1329316593367; Wed, 15 Feb 2012 06:36:33 -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.231.66.135 with SMTP id n7cs12905ibi; Wed, 15 Feb 2012 06:36:32 -0800 (PST) Received: by 10.180.24.7 with SMTP id q7mr35955757wif.14.1329316591760; Wed, 15 Feb 2012 06:36:31 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id x55si2559615wec.135.2012.02.15.06.36.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Feb 2012 06:36:31 -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 1Rxfy8-0002pH-Kz; Wed, 15 Feb 2012 14:36:28 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook , patches@linaro.org Subject: [PATCH v5 5/7] hw/vexpress.c: Instantiate the motherboard CLCD Date: Wed, 15 Feb 2012 14:36:26 +0000 Message-Id: <1329316588-10830-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1329316588-10830-1-git-send-email-peter.maydell@linaro.org> References: <1329316588-10830-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkWT2GT6oTiKUFGcxN5FAVlDTgaM0fhQ4l2Hzutf0dr0VXyaMfsfqqQwC6L5xfYk7sMGsV9 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 8239ea1..43ad206 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 */