sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi-generic: remove SPI_FLASH_SECTOR_ERASE_TIMEOUT_MS

Browse Source 
There was one user of SPI_FLASH_SECTOR_ERASE_TIMEOUT_MS,
southbridge/intel/common/spi.c. Remove the define and encode
the 1 second timeout that it was wanting at the single use site.

Change-Id: If33a1a04bc4d3441e90bf0ca305ddf71c4f8bb88
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37962
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
Aaron Durbin
2019-12-27 14:30:51 -07:00
parent 8b1cdd55a9
commit 4ed8e9ce9d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/spi-generic.h
View File

@ -22,7 +22,6 @@
*/ */
#define SPI_FLASH_PROG_TIMEOUT_MS 200 #define SPI_FLASH_PROG_TIMEOUT_MS 200
#define SPI_FLASH_PAGE_ERASE_TIMEOUT_MS 500 #define SPI_FLASH_PAGE_ERASE_TIMEOUT_MS 500
#define SPI_FLASH_SECTOR_ERASE_TIMEOUT_MS 1000
#include <commonlib/region.h> #include <commonlib/region.h>
#include <stdint.h> #include <stdint.h>

3
src/southbridge/intel/common/spi.c
View File

@ -31,6 +31,7 @@
#include <device/pci.h> #include <device/pci.h>
#include <spi_flash.h> #include <spi_flash.h>
#include <spi-generic.h> #include <spi-generic.h>
#include <timer.h>
#include "spi.h" #include "spi.h"
@ -739,7 +740,7 @@ static int ich_hwseq_erase(const struct spi_flash *flash, u32 offset,
u32 start, end, erase_size; u32 start, end, erase_size;
int ret; int ret;
uint16_t hsfc; uint16_t hsfc;
unsigned int timeout = 1000 * SPI_FLASH_SECTOR_ERASE_TIMEOUT_MS; unsigned int timeout = 1000 * USECS_PER_MSEC; /* 1 second timeout */
erase_size = flash->sector_size; erase_size = flash->sector_size;
if (offset % erase_size || len % erase_size) { if (offset % erase_size || len % erase_size) {