From e6f6d2b76cfd1e0a9f193feb7a76835fd8523774 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Sat, 17 Aug 2024 18:08:28 +0000 Subject: soc/intel/alderlake: Switch to SOC_INTEL_COMMON_DEBUG_CONSENT This patch replaces the SoC-specific config option `SOC_INTEL_ALDERLAKE_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/redrix without any functional impact while debugging. Change-Id: I9a9c81b72d707f5ed2e1a53c139ee22be0e30068 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/83957 Tested-by: build bot (Jenkins) Reviewed-by: Dinesh Gehlot Reviewed-by: Felix Held --- src/soc/intel/alderlake/Kconfig | 18 +++++------------- src/soc/intel/alderlake/romstage/fsp_params.c | 2 +- 2 files changed, 6 insertions(+), 14 deletions(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index 632798e6a1..598c0284c3 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -426,20 +426,12 @@ config FSP_FD_PATH default "3rdparty/fsp/AlderLakeFspBinPkg/Client/AlderLakeS/Fsp.fd" if SOC_INTEL_ALDERLAKE_PCH_S default "3rdparty/fsp/AlderLakeFspBinPkg/IoT/AlderLakeN/Fsp.fd" if SOC_INTEL_ALDERLAKE_PCH_N && FSP_TYPE_IOT -config SOC_INTEL_ALDERLAKE_DEBUG_CONSENT - int "Debug Consent for ADL" - # USB DBC is more common for developers so make this default to 2 if - # SOC_INTEL_DEBUG_CONSENT=y +# Override platform debug consent value: +# 0:Disabled, 2:Enabled (All Probes+TraceHub), 6:Enable (Low Power), +# 7:Manual +config SOC_INTEL_COMMON_DEBUG_CONSENT + int default 2 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, 2:Enabled (All Probes+TraceHub), 6:Enable (Low Power), - 7:Manual config DATA_BUS_WIDTH int diff --git a/src/soc/intel/alderlake/romstage/fsp_params.c b/src/soc/intel/alderlake/romstage/fsp_params.c index a63b64c966..b5e54f82a6 100644 --- a/src/soc/intel/alderlake/romstage/fsp_params.c +++ b/src/soc/intel/alderlake/romstage/fsp_params.c @@ -354,7 +354,7 @@ static void fill_fspm_trace_params(FSP_M_CONFIG *m_cfg, const struct soc_intel_alderlake_config *config) { /* Set debug probe type */ - m_cfg->PlatformDebugConsent = CONFIG_SOC_INTEL_ALDERLAKE_DEBUG_CONSENT; + m_cfg->PlatformDebugConsent = CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT; /* CrashLog config */ m_cfg->CpuCrashLogDevice = CONFIG(SOC_INTEL_CRASHLOG) && is_devfn_enabled(SA_DEVFN_TMT); -- cgit v1.2.3