GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Duncan Laurie 2015-12-22 17:08:21 -08:00 committed by Stefan Reinauer
parent d890b45520
commit 9d08c4a5fd
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/soc/intel/broadwell/finalize.c
View File

@ -56,6 +56,7 @@ const struct reg_script system_agent_finalize_script[] = {
}; };
const struct reg_script pch_finalize_script[] = { const struct reg_script pch_finalize_script[] = {
#if !IS_ENABLED(CONFIG_SPI_CONSOLE)
/* Set SPI opcode menu */ /* Set SPI opcode menu */
REG_MMIO_WRITE16(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + SPIBAR_PREOP, REG_MMIO_WRITE16(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + SPIBAR_PREOP,
SPI_OPPREFIX), SPI_OPPREFIX),
@ -69,6 +70,7 @@ const struct reg_script pch_finalize_script[] = {
/* Lock SPIBAR */ /* Lock SPIBAR */
REG_MMIO_OR32(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + SPIBAR_HSFS, REG_MMIO_OR32(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + SPIBAR_HSFS,
SPIBAR_HSFS_FLOCKDN), SPIBAR_HSFS_FLOCKDN),
#endif
/* TC Lockdown */ /* TC Lockdown */
REG_MMIO_OR32(RCBA_BASE_ADDRESS + 0x0050, (1 << 31)), REG_MMIO_OR32(RCBA_BASE_ADDRESS + 0x0050, (1 << 31)),