diff options
author | Subrata Banik <subratabanik@google.com> | 2024-08-17 18:30:44 +0000 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2024-08-21 13:44:52 +0000 |
commit | 2142053986befcc841666f7f62d8b6c3c0f2a28f (patch) | |
tree | e141001fffa26d7f2f4c02a5ce015fb4e936a6c1 | |
parent | e6f6d2b76cfd1e0a9f193feb7a76835fd8523774 (diff) |
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>
-rw-r--r-- | src/soc/intel/meteorlake/Kconfig | 18 | ||||
-rw-r--r-- | src/soc/intel/meteorlake/romstage/fsp_params.c | 2 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 327b3a240e..3b31e5380d 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -357,21 +357,13 @@ config FSP_FD_PATH 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 055fec7fad..84e665d929 100644 --- a/src/soc/intel/meteorlake/romstage/fsp_params.c +++ b/src/soc/intel/meteorlake/romstage/fsp_params.c @@ -364,7 +364,7 @@ static void fill_fspm_trace_params(FSP_M_CONFIG *m_cfg, 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)) { |