GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-spi

Browse source
This commit is contained in:
Tom Rini 2016-01-07 12:41:57 -05:00
commit 67ecb84ccb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mtd/spi/spi_flash.c
View file

@ -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:

2
drivers/spi/fsl_qspi.c
View file

@ -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