Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45973 )
Change subject: src: Rename EM100Pro-specific SPI console Kconfig option ......................................................................
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 --- M src/Kconfig M src/console/Kconfig M src/drivers/spi/Kconfig M src/drivers/spi/Makefile.inc M src/include/console/spi.h M src/soc/intel/baytrail/Kconfig M src/soc/intel/braswell/Kconfig M src/soc/intel/broadwell/Kconfig M src/soc/intel/broadwell/finalize.c M src/southbridge/intel/lynxpoint/Kconfig 10 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/45973/1
diff --git a/src/Kconfig b/src/Kconfig index e46a6e6..5a4f7a3 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -878,7 +878,7 @@ 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.
diff --git a/src/console/Kconfig b/src/console/Kconfig index bad6c56..283488c 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -294,9 +294,9 @@ 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 diff --git a/src/drivers/spi/Kconfig b/src/drivers/spi/Kconfig index dbde3b2..13a73b8 100644 --- a/src/drivers/spi/Kconfig +++ b/src/drivers/spi/Kconfig @@ -164,5 +164,5 @@
endif # SPI_FLASH
-config HAVE_SPI_CONSOLE_SUPPORT +config HAVE_EM100PRO_SPI_CONSOLE_SUPPORT def_bool n diff --git a/src/drivers/spi/Makefile.inc b/src/drivers/spi/Makefile.inc index 6dbc43a..56ee44b 100644 --- a/src/drivers/spi/Makefile.inc +++ b/src/drivers/spi/Makefile.inc @@ -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 diff --git a/src/include/console/spi.h b/src/include/console/spi.h index 8a58b85..2eff0a8 100644 --- a/src/include/console/spi.h +++ b/src/include/console/spi.h @@ -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__ diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig index 8276da2..bd9f78e 100644 --- a/src/soc/intel/baytrail/Kconfig +++ b/src/soc/intel/baytrail/Kconfig @@ -30,7 +30,7 @@ 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 diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig index 4eb810e..edbc6fd 100644 --- a/src/soc/intel/braswell/Kconfig +++ b/src/soc/intel/braswell/Kconfig @@ -34,7 +34,7 @@ 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 diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 15ece2c..0ea5dbd 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -37,7 +37,7 @@ 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 diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c index bec62fb..300301b 100644 --- a/src/soc/intel/broadwell/finalize.c +++ b/src/soc/intel/broadwell/finalize.c @@ -41,7 +41,7 @@ };
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), diff --git a/src/southbridge/intel/lynxpoint/Kconfig b/src/southbridge/intel/lynxpoint/Kconfig index c104cbb..0190032 100644 --- a/src/southbridge/intel/lynxpoint/Kconfig +++ b/src/southbridge/intel/lynxpoint/Kconfig @@ -24,7 +24,7 @@ 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
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45973 )
Change subject: src: Rename EM100Pro-specific SPI console Kconfig option ......................................................................
Patch Set 1: Code-Review+2
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45973 )
Change subject: src: Rename EM100Pro-specific SPI console Kconfig option ......................................................................
Patch Set 1: Code-Review+2
Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45973 )
Change subject: src: Rename EM100Pro-specific SPI console Kconfig option ......................................................................
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 --- M src/Kconfig M src/console/Kconfig M src/drivers/spi/Kconfig M src/drivers/spi/Makefile.inc M src/include/console/spi.h M src/soc/intel/baytrail/Kconfig M src/soc/intel/braswell/Kconfig M src/soc/intel/broadwell/Kconfig M src/soc/intel/broadwell/finalize.c M src/southbridge/intel/lynxpoint/Kconfig 10 files changed, 12 insertions(+), 12 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Michael Niewöhner: Looks good to me, approved
diff --git a/src/Kconfig b/src/Kconfig index 7acdfdc..9cc9d31 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -889,7 +889,7 @@ 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.
diff --git a/src/console/Kconfig b/src/console/Kconfig index bad6c56..283488c 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -294,9 +294,9 @@ 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 diff --git a/src/drivers/spi/Kconfig b/src/drivers/spi/Kconfig index dbde3b2..13a73b8 100644 --- a/src/drivers/spi/Kconfig +++ b/src/drivers/spi/Kconfig @@ -164,5 +164,5 @@
endif # SPI_FLASH
-config HAVE_SPI_CONSOLE_SUPPORT +config HAVE_EM100PRO_SPI_CONSOLE_SUPPORT def_bool n diff --git a/src/drivers/spi/Makefile.inc b/src/drivers/spi/Makefile.inc index 6dbc43a..56ee44b 100644 --- a/src/drivers/spi/Makefile.inc +++ b/src/drivers/spi/Makefile.inc @@ -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 diff --git a/src/include/console/spi.h b/src/include/console/spi.h index 8a58b85..2eff0a8 100644 --- a/src/include/console/spi.h +++ b/src/include/console/spi.h @@ -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__ diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig index 8276da2..bd9f78e 100644 --- a/src/soc/intel/baytrail/Kconfig +++ b/src/soc/intel/baytrail/Kconfig @@ -30,7 +30,7 @@ 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 diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig index 4eb810e..edbc6fd 100644 --- a/src/soc/intel/braswell/Kconfig +++ b/src/soc/intel/braswell/Kconfig @@ -34,7 +34,7 @@ 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 diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 15ece2c..0ea5dbd 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -37,7 +37,7 @@ 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 diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c index bec62fb..300301b 100644 --- a/src/soc/intel/broadwell/finalize.c +++ b/src/soc/intel/broadwell/finalize.c @@ -41,7 +41,7 @@ };
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), diff --git a/src/southbridge/intel/lynxpoint/Kconfig b/src/southbridge/intel/lynxpoint/Kconfig index 43f8bce..5abb286 100644 --- a/src/southbridge/intel/lynxpoint/Kconfig +++ b/src/southbridge/intel/lynxpoint/Kconfig @@ -24,7 +24,7 @@ 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
-
Angel Pons (Code Review) -
Michael Niewöhner (Code Review)
-
Nico Huber (Code Review)