summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2016-12-05 20:32:24 -0800
committerFurquan Shaikh <furquan@google.com>2016-12-06 07:17:28 +0100
commit810e2cde30035d0de691805041ffeeff57f68027 (patch)
tree99706a026be4551118b334773ccb61a6f5772005 /src/include
parentd3d1f13599a042bfd7ecb5f11f5a8a76853b7f88 (diff)
downloadcoreboot-810e2cde30035d0de691805041ffeeff57f68027.tar.xz
spi_flash: Make a deep copy of spi_slave structure
Commit 36b81af (spi: Pass pointer to spi_slave structure in spi_setup_slave) changes the way spi_setup_slave handles the spi_slave structure. Instead of expecting spi controller drivers to maintain spi_slave structure in CAR_GLOBAL/data section, caller is expected to manage the spi_slave structure. This requires that spi_flash drivers maintain spi_slave structure and flash probe function needs to make a copy of the passed in spi_slave structure. This change fixes the regression on Lenovo X230 and other mainboards. Change-Id: I0ad971eecaf3bfe301e9f95badc043193cc27cab Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/17728 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Iru Cai <mytbk920423@gmail.com>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/spi_flash.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h
index 8fec4849c7..5a9237869f 100644
--- a/src/include/spi_flash.h
+++ b/src/include/spi_flash.h
@@ -17,6 +17,7 @@
#include <stdint.h>
#include <stddef.h>
+#include <spi-generic.h>
#include <boot/coreboot_tables.h>
/* SPI Flash opcodes */
@@ -24,7 +25,7 @@
#define SPI_OPCODE_FAST_READ 0x0b
struct spi_flash {
- struct spi_slave *spi;
+ struct spi_slave spi;
const char *name;
u32 size;
u32 sector_size;