Patch set updated for coreboot: broadwell: Fix CONFIG_SPI_CONSOLE usage

[Duncan Laurie]

Duncan Laurie ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12792

-gerrit

commit 9a162de846ded577786a7eb413c0823ffb0df12b
Author: Duncan Laurie 
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 the SPI console config option is
    enabled.

This was tested using an em100 and google/samus board to ensure
    the console output does not stop at the finalize step.

Change-Id: Ie460f583214b47544e92d4afa8ef862563a11e36
    Signed-off-by: Duncan Laurie 
---
 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..9645348 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 !IS_ENABLED(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)),