[coreboot-gerrit] New patch to review for coreboot: 93025da Intel common SPI: Fix compilation breakage from refactoring

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8701

-gerrit

commit 93025dad106767ac2f1d2cb3082cd8a66fc3648c
Author: Stefan Reinauer 
Date:   Mon Mar 16 16:50:27 2015 -0700

Intel common SPI: Fix compilation breakage from refactoring

When the Intel SPI drivers were refactored, compilation for Chrome OS
    devices broke, because ELOG uses the SPI driver in SMM.

Change-Id: If2b2da5d526196ed742e17409b01a381417d0ce8
    Signed-off-by: Stefan Reinauer 
---
 src/southbridge/intel/common/spi.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c
index d6ab01a..1780fc0 100644
--- a/src/southbridge/intel/common/spi.c
+++ b/src/southbridge/intel/common/spi.c
@@ -360,6 +360,7 @@ void spi_init(void)
    bios_cntl &= ~(1 << 5);
    pci_write_config_byte(dev, 0xdc, bios_cntl | 0x1);
 }
+#ifndef __SMM__
 static void spi_init_cb(void *unused)
 {
    spi_init();
@@ -368,6 +369,7 @@ static void spi_init_cb(void *unused)
 BOOT_STATE_INIT_ENTRIES(spi_init_bscb) = {
    BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, spi_init_cb, NULL),
 };
+#endif

int spi_claim_bus(struct spi_slave *slave)
 {