From fc5df349dab3b703b5810a7eea029da13babc756 Mon Sep 17 00:00:00 2001 From: Joe Komlodi Date: Mon, 16 Nov 2020 15:11:02 -0800 Subject: [PATCH] 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 Reviewed-by: Francisco Iglesias Message-id: 1605568264-26376-3-git-send-email-komlodi@xilinx.com Signed-off-by: Peter Maydell --- hw/block/m25p80.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index bad7253838..7e1d56442f 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, -- 2.30.2