diff options
| -rw-r--r-- | src/mainboard/siemens/chili/romstage.c | 2 | ||||
| -rw-r--r-- | src/mainboard/starlabs/labtop/variants/cml/romstage.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/romstage/fsp_params.c | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/mainboard/siemens/chili/romstage.c b/src/mainboard/siemens/chili/romstage.c index ddcc2cc87c48..6f36a7f9e34b 100644 --- a/src/mainboard/siemens/chili/romstage.c +++ b/src/mainboard/siemens/chili/romstage.c @@ -26,8 +26,6 @@ void mainboard_memory_init_params(FSPM_UPD *memupd) const uint8_t vtd = get_uint_option("vtd", 1); memupd->FspmTestConfig.VtdDisable = !vtd; - const uint8_t ht = get_uint_option("hyper_threading", memupd->FspmConfig.HyperThreading); - memupd->FspmConfig.HyperThreading = ht; variant_romstage_params(memupd); diff --git a/src/mainboard/starlabs/labtop/variants/cml/romstage.c b/src/mainboard/starlabs/labtop/variants/cml/romstage.c index 189b7f378c22..75a19e576b6e 100644 --- a/src/mainboard/starlabs/labtop/variants/cml/romstage.c +++ b/src/mainboard/starlabs/labtop/variants/cml/romstage.c @@ -73,10 +73,6 @@ void mainboard_memory_init_params(FSPM_UPD *memupd) const uint8_t vtd = get_uint_option("vtd", 1); memupd->FspmTestConfig.VtdDisable = !vtd; - const uint8_t ht = - get_uint_option("hyper_threading", memupd->FspmConfig.HyperThreading); - memupd->FspmConfig.HyperThreading = ht; - fill_spd_data(&memcfg); cannonlake_memcfg_init(&memupd->FspmConfig, &memcfg); } diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index 7c317e90c60c..cad2e752b8ee 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -66,6 +66,7 @@ config CPU_SPECIFIC_OPTIONS select GENERIC_GPIO_LIB select HAVE_FSP_GOP select HAVE_FSP_LOGO_SUPPORT + select HAVE_HYPERTHREADING select HAVE_SMI_HANDLER select IDT_IN_EVERY_STAGE select INTEL_CAR_NEM_ENHANCED diff --git a/src/soc/intel/cannonlake/romstage/fsp_params.c b/src/soc/intel/cannonlake/romstage/fsp_params.c index 0b63bd52f98f..842c8fb7d076 100644 --- a/src/soc/intel/cannonlake/romstage/fsp_params.c +++ b/src/soc/intel/cannonlake/romstage/fsp_params.c @@ -8,6 +8,7 @@ #include <fsp/util.h> #include <intelblocks/cpulib.h> #include <intelblocks/pmclib.h> +#include <option.h> #include <soc/iomap.h> #include <soc/msr.h> #include <soc/pci_devs.h> @@ -26,6 +27,8 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) unsigned int i; uint32_t mask = 0; + m_cfg->HyperThreading = get_uint_option("hyper_threading", CONFIG(FSP_HYPERTHREADING)); + /* * Probe for no IGD and disable InternalGfx and panel power to prevent a * crash in FSP-M. |