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: 141364 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 31C5C1007D5 for ; Thu, 16 Feb 2012 05:16:15 +1100 (EST) Received: from localhost ([::1]:54880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rxg0W-0005zU-IH for incoming@patchwork.ozlabs.org; Wed, 15 Feb 2012 09:38:56 -0500 Received: from eggs.gnu.org ([140.186.70.92]:41380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rxg0N-0005t0-FA for qemu-devel@nongnu.org; Wed, 15 Feb 2012 09:38:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rxg0G-0007Kv-UY for qemu-devel@nongnu.org; Wed, 15 Feb 2012 09:38:47 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:46575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rxg0G-00074B-7o for qemu-devel@nongnu.org; Wed, 15 Feb 2012 09:38:40 -0500 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 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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Subject: [Qemu-devel] [PATCH v5 5/7] hw/vexpress.c: Instantiate the motherboard CLCD X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 */