From 0d25e5ac670d32f61e159cc6a2e9a68cd524d6a6 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 9 Feb 2019 13:13:45 +0100 Subject: soc/intel/fsp_broadwell_de: Move FSP_DEBUG_LEVEL option here It is not mentioned in the FSP spec and doesn't seem to be implemented for any other FSP than the Broadwell-DE one. Change-Id: I87c758204f1aabf13f47de19fd87c6e1ed67258e Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/31300 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/drivers/intel/fsp1_0/Kconfig | 11 ----------- src/soc/intel/fsp_broadwell_de/fsp/Kconfig | 11 +++++++++++ src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/drivers/intel/fsp1_0/Kconfig b/src/drivers/intel/fsp1_0/Kconfig index b2338aa123..4ce528fb77 100644 --- a/src/drivers/intel/fsp1_0/Kconfig +++ b/src/drivers/intel/fsp1_0/Kconfig @@ -34,17 +34,6 @@ config DCACHE_RAM_SIZE hex default 0x4000 -config FSP_1_0_DEBUG_LEVEL - int "FSP debug level (0-3)" - default 0 - range 0 3 - help - Select the debug level, where: - 0: DISABLED - 1: MINIMUM - 2: NORMAL - 3: MAXIMUM - config FSP_HEADER_PATH string "Location of FSP headers" help diff --git a/src/soc/intel/fsp_broadwell_de/fsp/Kconfig b/src/soc/intel/fsp_broadwell_de/fsp/Kconfig index b4f48868d4..f958e7194f 100644 --- a/src/soc/intel/fsp_broadwell_de/fsp/Kconfig +++ b/src/soc/intel/fsp_broadwell_de/fsp/Kconfig @@ -127,3 +127,14 @@ config FSP_EHCI2_ENABLE default n help Enable EHCI controller 2 + +config FSP_DEBUG_LEVEL + int "FSP debug level (0-3)" + default 0 + range 0 3 + help + Select the debug level, where: + 0: DISABLED + 1: MINIMUM + 2: NORMAL + 3: MAXIMUM diff --git a/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c index ef6212eb4b..b8ef6b18b4 100644 --- a/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c +++ b/src/soc/intel/fsp_broadwell_de/fsp/chipset_fsp_util.c @@ -69,7 +69,7 @@ static void ConfigureDefaultUpdData(UPD_DATA_REGION *UpdData) if (!IS_ENABLED(CONFIG_CONSOLE_SERIAL)) UpdData->SerialPortType = 0; - UpdData->DebugOutputLevel = CONFIG_FSP_1_0_DEBUG_LEVEL; + UpdData->DebugOutputLevel = CONFIG_FSP_DEBUG_LEVEL; /* * Memory Down -- cgit v1.2.3