OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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

Browse Source 
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>
This commit is contained in:
Joe Komlodi 2020-11-16 15:11:02 -08:00 committed by Peter Maydell
parent 09414144cd
commit fc5df349da
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/block/m25p80.c
View File

@ -768,7 +768,7 @@ static void reset_memory(Flash *s)
s->volatile_cfg |= VCFG_DUMMY; s->volatile_cfg |= VCFG_DUMMY;
s->volatile_cfg |= VCFG_WRAP_SEQUENTIAL; s->volatile_cfg |= VCFG_WRAP_SEQUENTIAL;
if ((s->nonvolatile_cfg & NVCFG_XIP_MODE_MASK) 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 |= VCFG_XIP_MODE_DISABLED;
} }
s->volatile_cfg |= deposit32(s->volatile_cfg, s->volatile_cfg |= deposit32(s->volatile_cfg,