[coreboot-gerrit] New patch to review for coreboot: broadwell: Fix CONFIG_SPI_CONSOLE usage

[Duncan Laurie (dlaurie@google.com)]

Duncan Laurie (dlaurie at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12792

-gerrit

commit 9906af17bb403516d2c065385c9b325480e1e5ba
Author: Duncan Laurie <dlaurie at google.com>
Date:   Tue Dec 22 17:08:21 2015 -0800

    broadwell: Fix CONFIG_SPI_CONSOLE usage
    
    Locking down the SPI controller with a specific opcode menu kills
    the SPI console.  Skip this when that config option is enabled.
    
    Change-Id: Ie460f583214b47544e92d4afa8ef862563a11e36
    Signed-off-by: Duncan Laurie <dlaurie at google.com>
---
 src/soc/intel/broadwell/finalize.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c
index 15bd03c..2406bb6 100644
--- a/src/soc/intel/broadwell/finalize.c
+++ b/src/soc/intel/broadwell/finalize.c
@@ -56,6 +56,7 @@ const struct reg_script system_agent_finalize_script[] = {
 };
 
 const struct reg_script pch_finalize_script[] = {
+#if !CONFIG_SPI_CONSOLE
 	/* Set SPI opcode menu */
 	REG_MMIO_WRITE16(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + SPIBAR_PREOP,
 			 SPI_OPPREFIX),
@@ -69,6 +70,7 @@ const struct reg_script pch_finalize_script[] = {
 	/* Lock SPIBAR */
 	REG_MMIO_OR32(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + SPIBAR_HSFS,
 		      SPIBAR_HSFS_FLOCKDN),
+#endif
 
 	/* TC Lockdown */
 	REG_MMIO_OR32(RCBA_BASE_ADDRESS + 0x0050, (1 << 31)),