| Message ID | 1605237055-393580-3-git-send-email-komlodi@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/block/m25p80: Numonyx: Fix dummy cycles and check for SPI mode on cmds | expand |
On Thu, Nov 12, 2020 at 07:10:53PM -0800, Joe Komlodi wrote: > 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> > --- > 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 452d252..eb6539f 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.7.4 >
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 452d252..eb6539f 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,
VCFG XIP is set (disabled) when the NVCFG XIP bits are all set (disabled). Signed-off-by: Joe Komlodi <komlodi@xilinx.com> --- hw/block/m25p80.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)