diff options
| author | Joe Komlodi | 2020-11-17 00:11:02 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-12-15 14:39:30 +0100 |
| commit | fc5df349dab3b703b5810a7eea029da13babc756 (patch) | |
| tree | 15b5bb7081c0fc1688acd5309d65befc64699b67 /hw | |
| parent | hw/block/m25p80: Make Numonyx config field names more accurate (diff) | |
| download | qemu-fc5df349dab3b703b5810a7eea029da13babc756.tar.gz qemu-fc5df349dab3b703b5810a7eea029da13babc756.tar.xz qemu-fc5df349dab3b703b5810a7eea029da13babc756.zip | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/m25p80.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |