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>
This commit is contained in:
parent
09414144cd
commit
fc5df349da
|
@ -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,
|
||||||
|
|
Loading…
Reference in a new issue