diff options
| author | Duncan Laurie <dlaurie@google.com> | 2015-12-22 17:08:21 -0800 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-12-27 17:42:46 +0100 |
| commit | 9d08c4a5fd006e14060d03e590df1f31ce3e7c5c (patch) | |
| tree | f982ff4cf9a175690cbca6d247977cab42a2c541 /src/soc/intel/broadwell/finalize.c | |
| parent | d890b45520a4b2af2ae2b15096b5897ed7464fcb (diff) | |
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 <dlaurie@google.com>
Reviewed-on: https://review.coreboot.org/12792
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/soc/intel/broadwell/finalize.c')
| -rw-r--r-- | src/soc/intel/broadwell/finalize.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c index 15bd03cef9..964534831d 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)), |