Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83961?usp=email )
Change subject: soc/intel/meteorlake: Switch to SOC_INTEL_COMMON_DEBUG_CONSENT ......................................................................
soc/intel/meteorlake: Switch to SOC_INTEL_COMMON_DEBUG_CONSENT
This patch replaces the SoC-specific config option `SOC_INTEL_METEORLAKE_DEBUG_CONSENT` with the generic `SOC_INTEL_COMMON_DEBUG_CONSENT`.
Additionally, updates the FSP configuration to use the new generic config option.
TEST=Able to build and boot google/rex0 without any functional impact while debugging.
Change-Id: I657d20a38e15eee333a4e45c0c600736148173d4 Signed-off-by: Subrata Banik subratabanik@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/83961 Reviewed-by: Dinesh Gehlot digehlot@google.com Reviewed-by: Felix Held felix-coreboot@felixheld.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/meteorlake/Kconfig M src/soc/intel/meteorlake/romstage/fsp_params.c 2 files changed, 6 insertions(+), 14 deletions(-)
Approvals: build bot (Jenkins): Verified Dinesh Gehlot: Looks good to me, approved Felix Held: Looks good to me, approved
diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 327b3a2..3b31e53 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -357,21 +357,13 @@ depends on FSP_USE_REPO default "3rdparty/fsp/MeteorLakeFspBinPkg/Fsp.fd"
-config SOC_INTEL_METEORLAKE_DEBUG_CONSENT - int "Debug Consent for MTL" - # USB DBC is more common for developers so make this default to 6 if - # SOC_INTEL_DEBUG_CONSENT=y +# Override platform debug consent value: +# 0:Disabled, 2:Enabled Trace Active, 4:Enabled Trace Ready, +# 6:Enable Trace Power-Off, 7:Manual +config SOC_INTEL_COMMON_DEBUG_CONSENT + int default 6 if SOC_INTEL_DEBUG_CONSENT default 2 if SOC_INTEL_COMMON_BLOCK_TRACEHUB - 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, 2:Enabled Trace Active, 4:Enabled Trace Ready, - 6:Enable Trace Power-Off, 7:Manual
config DATA_BUS_WIDTH int diff --git a/src/soc/intel/meteorlake/romstage/fsp_params.c b/src/soc/intel/meteorlake/romstage/fsp_params.c index 055fec7..84e665d 100644 --- a/src/soc/intel/meteorlake/romstage/fsp_params.c +++ b/src/soc/intel/meteorlake/romstage/fsp_params.c @@ -364,7 +364,7 @@ const struct soc_intel_meteorlake_config *config) { /* Set debug probe type */ - m_cfg->PlatformDebugOption = CONFIG_SOC_INTEL_METEORLAKE_DEBUG_CONSENT; + m_cfg->PlatformDebugOption = CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT;
/* CrashLog config */ if (CONFIG(SOC_INTEL_CRASHLOG)) {