src: Rename EM100Pro-specific SPI console Kconfig option

To avoid confusion with `flashconsole` (CONSOLE_SPI_FLASH), prefix this
option with `EM100Pro`. Looks like it is not build-tested, however.

Change-Id: I4868fa52250fbbf43e328dfd12e0e48fc58c4234
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45973
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
This commit is contained in:
Angel Pons 2020-10-03 12:22:04 +02:00 committed by Michael Niewöhner
parent 0b418bd287
commit 12d48cdf67
10 changed files with 12 additions and 12 deletions

View File

@ -889,7 +889,7 @@ config DEBUG_SMI
bool "Output verbose SMI debug messages"
default n
depends on HAVE_SMI_HANDLER
select SPI_FLASH_SMM if SPI_CONSOLE || CONSOLE_SPI_FLASH
select SPI_FLASH_SMM if EM100PRO_SPI_CONSOLE || CONSOLE_SPI_FLASH
help
This option enables additional SMI related debug messages.

View File

@ -294,9 +294,9 @@ config CONSOLE_QEMU_DEBUGCON_PORT
depends on CONSOLE_QEMU_DEBUGCON
default 0x402
config SPI_CONSOLE
bool "SPI debug console output"
depends on HAVE_SPI_CONSOLE_SUPPORT && !DEBUG_SPI_FLASH
config EM100PRO_SPI_CONSOLE
bool "EM100Pro SPI debug console output"
depends on HAVE_EM100PRO_SPI_CONSOLE_SUPPORT && !DEBUG_SPI_FLASH
help
Enable support for the debug console on the Dediprog EM100Pro.
This is currently working only in ramstage due to how the spi

View File

@ -164,5 +164,5 @@ config SPI_FLASH_HAS_VOLATILE_GROUP
endif # SPI_FLASH
config HAVE_SPI_CONSOLE_SUPPORT
config HAVE_EM100PRO_SPI_CONSOLE_SUPPORT
def_bool n

View File

@ -2,7 +2,7 @@
subdirs-y += tpm
ifeq ($(CONFIG_SPI_CONSOLE),y)
ifeq ($(CONFIG_EM100PRO_SPI_CONSOLE),y)
ramstage-y += spiconsole.c
smm-y += spiconsole.c
endif

View File

@ -8,7 +8,7 @@
void spiconsole_init(void);
void spiconsole_tx_byte(unsigned char c);
#define __CONSOLE_SPI_ENABLE__ (CONFIG(SPI_CONSOLE) && \
#define __CONSOLE_SPI_ENABLE__ (CONFIG(EM100PRO_SPI_CONSOLE) && \
(ENV_RAMSTAGE || (ENV_SMM && CONFIG(DEBUG_SMI))))
#if __CONSOLE_SPI_ENABLE__

View File

@ -30,7 +30,7 @@ config CPU_SPECIFIC_OPTIONS
select UDELAY_TSC
select SOC_INTEL_COMMON
select INTEL_DESCRIPTOR_MODE_CAPABLE
select HAVE_SPI_CONSOLE_SUPPORT
select HAVE_EM100PRO_SPI_CONSOLE_SUPPORT
select INTEL_GMA_ACPI
select INTEL_GMA_SWSMISCI
select CPU_INTEL_COMMON

View File

@ -34,7 +34,7 @@ config CPU_SPECIFIC_OPTIONS
select UDELAY_TSC
select USE_GENERIC_FSP_CAR_INC
select INTEL_DESCRIPTOR_MODE_CAPABLE
select HAVE_SPI_CONSOLE_SUPPORT
select HAVE_EM100PRO_SPI_CONSOLE_SUPPORT
select HAVE_FSP_GOP
select GENERIC_GPIO_LIB
select INTEL_GMA_ACPI

View File

@ -37,7 +37,7 @@ config CPU_SPECIFIC_OPTIONS
select SOC_INTEL_COMMON_BLOCK_POWER_LIMIT
select INTEL_DESCRIPTOR_MODE_CAPABLE
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
select HAVE_SPI_CONSOLE_SUPPORT
select HAVE_EM100PRO_SPI_CONSOLE_SUPPORT
select INTEL_GMA_ACPI
select HAVE_POWER_STATE_AFTER_FAILURE
select HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE

View File

@ -41,7 +41,7 @@ const struct reg_script system_agent_finalize_script[] = {
};
const struct reg_script pch_finalize_script[] = {
#if !CONFIG(SPI_CONSOLE)
#if !CONFIG(EM100PRO_SPI_CONSOLE)
/* Lock SPIBAR */
REG_MMIO_OR32(RCBA_BASE_ADDRESS + SPIBAR_OFFSET + SPIBAR_HSFS,
SPIBAR_HSFS_FLOCKDN),

View File

@ -24,7 +24,7 @@ config SOUTH_BRIDGE_OPTIONS # dummy
select PCIEXP_ASPM
select PCIEXP_COMMON_CLOCK
select INTEL_DESCRIPTOR_MODE_CAPABLE
select HAVE_SPI_CONSOLE_SUPPORT
select HAVE_EM100PRO_SPI_CONSOLE_SUPPORT
select RTC
select SOUTHBRIDGE_INTEL_COMMON_GPIO if !INTEL_LYNXPOINT_LP
select SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ