From c41a21d82510dc1f2b026075437b3ca9dbe0015b Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Sat, 17 Aug 2024 18:25:15 +0000 Subject: soc/intel/jasperlake: Switch to SOC_INTEL_COMMON_DEBUG_CONSENT This patch drops the SoC-specific config option `SOC_INTEL_JASPERLAKE_DEBUG_CONSENT`. Additionally, updates the FSP configuration to use the new generic config option. TEST=Able to build and boot google/dedede without any functional impact while debugging. Change-Id: I3e7abaf5fb3a0d5528041af5ce767a15fc738870 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/83960 Reviewed-by: Felix Held Tested-by: build bot (Jenkins) --- src/soc/intel/jasperlake/Kconfig | 16 ---------------- src/soc/intel/jasperlake/romstage/fsp_params.c | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) (limited to 'src/soc') diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig index 2871508cb4..1502c7509c 100644 --- a/src/soc/intel/jasperlake/Kconfig +++ b/src/soc/intel/jasperlake/Kconfig @@ -192,22 +192,6 @@ config FSP_HEADER_PATH config FSP_FD_PATH default "3rdparty/fsp/JasperLakeFspBinPkg/Fsp.fd" -config SOC_INTEL_JASPERLAKE_DEBUG_CONSENT - int "Debug Consent for JSL" - # USB DBC is more common for developers so make this default to 3 if - # SOC_INTEL_DEBUG_CONSENT=y - default 3 if SOC_INTEL_DEBUG_CONSENT - default 0 - help - This is to control debug interface on SOC. - Setting non-zero value will allow to use DBC or DCI to debug SOC. - PlatformDebugConsent in FspmUpd.h has the details. - - Desired platform debug type are - 0:Disabled, 1:Enabled (DCI OOB+[DbC]), 2:Enabled (DCI OOB), - 3:Enabled (USB3 DbC), 4:Enabled (XDP/MIPI60), 5:Enabled (USB2 DbC), - 6:Enable (2-wire DCI OOB), 7:Manual - config PRERAM_CBMEM_CONSOLE_SIZE hex default 0x1400 diff --git a/src/soc/intel/jasperlake/romstage/fsp_params.c b/src/soc/intel/jasperlake/romstage/fsp_params.c index 0132906534..0299860931 100644 --- a/src/soc/intel/jasperlake/romstage/fsp_params.c +++ b/src/soc/intel/jasperlake/romstage/fsp_params.c @@ -96,7 +96,7 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, m_cfg->SmbusEnable = config->SmbusEnable; /* Set debug probe type */ - m_cfg->PlatformDebugConsent = CONFIG_SOC_INTEL_JASPERLAKE_DEBUG_CONSENT; + m_cfg->PlatformDebugConsent = CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT; /* VT-d config */ m_cfg->VtdDisable = 0; -- cgit v1.2.3