From 4ed8e9ce9dcd8c91acc8d8e45aca6486d3b9b879 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Fri, 27 Dec 2019 14:30:51 -0700 Subject: spi-generic: remove SPI_FLASH_SECTOR_ERASE_TIMEOUT_MS 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/37962 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson --- src/include/spi-generic.h | 1 - src/southbridge/intel/common/spi.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/include/spi-generic.h b/src/include/spi-generic.h index c8dbb6798a..926bd11d19 100644 --- a/src/include/spi-generic.h +++ b/src/include/spi-generic.h @@ -22,7 +22,6 @@ */ #define SPI_FLASH_PROG_TIMEOUT_MS 200 #define SPI_FLASH_PAGE_ERASE_TIMEOUT_MS 500 -#define SPI_FLASH_SECTOR_ERASE_TIMEOUT_MS 1000 #include #include diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c index 63206d0a83..924fdcc810 100644 --- a/src/southbridge/intel/common/spi.c +++ b/src/southbridge/intel/common/spi.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "spi.h" @@ -739,7 +740,7 @@ static int ich_hwseq_erase(const struct spi_flash *flash, u32 offset, u32 start, end, erase_size; int ret; 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; if (offset % erase_size || len % erase_size) { -- cgit v1.2.3