From 810e2cde30035d0de691805041ffeeff57f68027 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 5 Dec 2016 20:32:24 -0800 Subject: 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 Reviewed-on: https://review.coreboot.org/17728 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel Reviewed-by: Iru Cai --- src/include/spi_flash.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/include') 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 #include +#include #include /* 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; -- cgit v1.2.3