summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorUwe Poeche <uwe.poeche@siemens.com>2019-07-15 11:15:36 +0200
committerMartin Roth <martinroth@google.com>2019-07-23 15:43:38 +0000
commit7724cebf978a17f0a2c6117dfebc71d56723d53a (patch)
tree5b4d1174d3874f6c811fdec5d65e36a4bf230a72 /src
parent7ae71921cfb9a9e9256f48e9ad6721918d2de381 (diff)
downloadcoreboot-7724cebf978a17f0a2c6117dfebc71d56723d53a.tar.xz
include/spi-generic: move common flash timeouts
This patch moves SPI_FLASH time-outs from spi/spi_flash_internal.h for SPI SW-sequencing to include/spi-generic.h to provide also for SPI HW-sequencing. tested on siemens/bdx1 and checked if all includes of spi_flash_internal.h on other places provide an include of spi-generic.h before Change-Id: I837f1a027b836996bc42389bdf7dbab7f0e9db09 Signed-off-by: Uwe Poeche <uwe.poeche@siemens.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34345 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Diffstat (limited to 'src')
-rw-r--r--src/drivers/spi/spi_flash_internal.h9
-rw-r--r--src/include/spi-generic.h9
2 files changed, 9 insertions, 9 deletions
diff --git a/src/drivers/spi/spi_flash_internal.h b/src/drivers/spi/spi_flash_internal.h
index 4a9e289029..95c51a8b05 100644
--- a/src/drivers/spi/spi_flash_internal.h
+++ b/src/drivers/spi/spi_flash_internal.h
@@ -7,15 +7,6 @@
#ifndef SPI_FLASH_INTERNAL_H
#define SPI_FLASH_INTERNAL_H
-/* Common parameters -- kind of high, but they should only occur when there
- * is a problem (and well your system already is broken), so err on the side
- * of caution in case we're dealing with slower SPI buses and/or processors.
- */
-#define CONF_SYS_HZ 100
-#define SPI_FLASH_PROG_TIMEOUT (2 * CONF_SYS_HZ)
-#define SPI_FLASH_PAGE_ERASE_TIMEOUT (5 * CONF_SYS_HZ)
-#define SPI_FLASH_SECTOR_ERASE_TIMEOUT (10 * CONF_SYS_HZ)
-
/* Common commands */
#define CMD_READ_ID 0x9f
diff --git a/src/include/spi-generic.h b/src/include/spi-generic.h
index d0f957f1f9..93704f81d9 100644
--- a/src/include/spi-generic.h
+++ b/src/include/spi-generic.h
@@ -16,6 +16,15 @@
#ifndef _SPI_GENERIC_H_
#define _SPI_GENERIC_H_
+/* Common parameters -- kind of high, but they should only occur when there
+ * is a problem (and well your system already is broken), so err on the side
+ * of caution in case we're dealing with slower SPI buses and/or processors.
+ */
+#define CONF_SYS_HZ 100
+#define SPI_FLASH_PROG_TIMEOUT (2 * CONF_SYS_HZ)
+#define SPI_FLASH_PAGE_ERASE_TIMEOUT (5 * CONF_SYS_HZ)
+#define SPI_FLASH_SECTOR_ERASE_TIMEOUT (10 * CONF_SYS_HZ)
+
#include <commonlib/region.h>
#include <stdint.h>
#include <stddef.h>