mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 06:31:31 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-spi
This commit is contained in:
commit
67ecb84ccb
2 changed files with 3 additions and 3 deletions
|
@ -767,8 +767,8 @@ int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
/* Cannot unlock; would unlock larger region than requested */
|
/* Cannot unlock; would unlock larger region than requested */
|
||||||
if (stm_is_locked_sr(flash, status_old, ofs - flash->erase_size,
|
if (stm_is_locked_sr(flash, ofs - flash->erase_size, flash->erase_size,
|
||||||
flash->erase_size))
|
status_old))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
/*
|
/*
|
||||||
* Need largest pow such that:
|
* Need largest pow such that:
|
||||||
|
|
|
@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||||
#define TX_BUFFER_SIZE 0x40
|
#define TX_BUFFER_SIZE 0x40
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define OFFSET_BITS_MASK GENMASK(24, 0)
|
#define OFFSET_BITS_MASK GENMASK(23, 0)
|
||||||
|
|
||||||
#define FLASH_STATUS_WEL 0x02
|
#define FLASH_STATUS_WEL 0x02
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue