From patchwork Fri Jan 6 18:58:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 134691 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 748C1B6F7E for ; Sat, 7 Jan 2012 06:26:54 +1100 (EST) Received: from localhost ([::1]:36431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjFRD-000617-QV for incoming@patchwork.ozlabs.org; Fri, 06 Jan 2012 14:26:51 -0500 Received: from eggs.gnu.org ([140.186.70.92]:43052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjFQv-0005OU-NH for qemu-devel@nongnu.org; Fri, 06 Jan 2012 14:26:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RjFQu-00017K-M8 for qemu-devel@nongnu.org; Fri, 06 Jan 2012 14:26:33 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:34614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RjFQu-00017E-EV for qemu-devel@nongnu.org; Fri, 06 Jan 2012 14:26:32 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RjEzk-0007Je-PF; Fri, 06 Jan 2012 18:58:28 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 6 Jan 2012 18:58:27 +0000 Message-Id: <1325876308-28097-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1325876308-28097-1-git-send-email-peter.maydell@linaro.org> References: <1325876308-28097-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= , Avi Kivity , patches@linaro.org Subject: [Qemu-devel] [PATCH v4 1/2] hw/integratorcp: Fix sense of REMAP bit 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 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 c8f3955..d9d8da3 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;