From: Joe Komlodi <joe.komlodi@xilinx.com>
Date: Mon, 16 Nov 2020 23:11:02 +0000 (-0800)
Subject: hw/block/m25p80: Fix when VCFG XIP bit is set for Numonyx
X-Git-Tag: v6.0.0-rc0~177^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc5df349dab3b703b5810a7eea029da13babc756;p=thirdparty%2Fqemu.git

hw/block/m25p80: Fix when VCFG XIP bit is set for Numonyx

VCFG XIP is set (disabled) when the NVCFG XIP bits are all set (disabled).

Signed-off-by: Joe Komlodi <komlodi@xilinx.com>
Reviewed-by: Francisco Iglesias <francisco.iglesias@xilinx.com>
Message-id: 1605568264-26376-3-git-send-email-komlodi@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index bad72538386..7e1d56442f3 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -768,7 +768,7 @@ static void reset_memory(Flash *s)
         s->volatile_cfg |= VCFG_DUMMY;
         s->volatile_cfg |= VCFG_WRAP_SEQUENTIAL;
         if ((s->nonvolatile_cfg & NVCFG_XIP_MODE_MASK)
-                                != NVCFG_XIP_MODE_DISABLED) {
+                                == NVCFG_XIP_MODE_DISABLED) {
             s->volatile_cfg |= VCFG_XIP_MODE_DISABLED;
         }
         s->volatile_cfg |= deposit32(s->volatile_cfg,