From patchwork Wed Jan 4 11:34:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 6048 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 C894D23E16 for ; Wed, 4 Jan 2012 11:35:07 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id BF2C5A1813D for ; Wed, 4 Jan 2012 11:35:07 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id c11so16570291eaa.11 for ; Wed, 04 Jan 2012 03:35:07 -0800 (PST) Received: by 10.205.120.148 with SMTP id fy20mr12518071bkc.125.1325676907612; Wed, 04 Jan 2012 03:35:07 -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.205.82.144 with SMTP id ac16cs366335bkc; Wed, 4 Jan 2012 03:35:07 -0800 (PST) Received: by 10.152.134.50 with SMTP id ph18mr45359736lab.1.1325676905771; Wed, 04 Jan 2012 03:35:05 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id je10si44131967lab.5.2012.01.04.03.35.05 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Jan 2012 03:35:05 -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 1RiP7T-00061Y-RY; Wed, 04 Jan 2012 11:34:59 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= , Avi Kivity , patches@linaro.org Subject: [PATCH v3 1/2] hw/integratorcp: Fix sense of REMAP bit Date: Wed, 4 Jan 2012 11:34:58 +0000 Message-Id: <1325676899-23131-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1325676899-23131-1-git-send-email-peter.maydell@linaro.org> References: <1325676899-23131-1-git-send-email-peter.maydell@linaro.org> Fix the sense of the REMAP bit: 0 should mean "map flash", 1 should mean "map RAM". Signed-off-by: Peter Maydell --- hw/integratorcp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/integratorcp.c b/hw/integratorcp.c index 2551236..8e4c154 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -112,7 +112,7 @@ static uint64_t integratorcm_read(void *opaque, target_phys_addr_t offset, static void integratorcm_do_remap(integratorcm_state *s, int flash) { - if (flash) { + if (!flash) { if (s->flash_mapped) { sysbus_del_memory(&s->busdev, &s->flash); s->flash_mapped = false;