aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-04-29 08:22:17 -0400
committerTom Rini <trini@konsulko.com>2021-04-29 08:22:17 -0400
commit3d2f8bc673d8a8c0ecb2ba27d21f8c54152281ca (patch)
treef9deb4f1c5c0fa674ff41ee393ea71f3dec0e4e7 /drivers
parenta26522e77477531fc1025b27cebb45de9fc5a3db (diff)
parent94657482f3fb64de124cc68b14c869a6836eaaf3 (diff)
downloadu-boot-3d2f8bc673d8a8c0ecb2ba27d21f8c54152281ca.zip
u-boot-3d2f8bc673d8a8c0ecb2ba27d21f8c54152281ca.tar.gz
u-boot-3d2f8bc673d8a8c0ecb2ba27d21f8c54152281ca.tar.bz2
Merge https://source.denx.de/u-boot/custodians/u-boot-cfi-flash
- mtd: cfi: Fix PPB lock status readout (Marek)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/cfi_flash.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 9642d7c..9c27fea 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -2276,12 +2276,12 @@ ulong flash_get_size(phys_addr_t base, int banknum)
flash_unlock_seq(info, 0);
flash_write_cmd(info, 0,
info->addr_unlock1,
- FLASH_CMD_READ_ID);
+ AMD_CMD_SET_PPB_ENTRY);
info->protect[sect_cnt] =
- flash_isset(
- info, sect_cnt,
- FLASH_OFFSET_PROTECT,
- FLASH_STATUS_PROTECT);
+ !flash_isset(info, sect_cnt,
+ 0, 0x01);
+ flash_write_cmd(info, 0, 0,
+ info->cmd_reset);
break;
default:
/* default: not protected */