summaryrefslogtreecommitdiff
path: root/src/cpu/intel
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-11-05 19:06:56 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-11-08 07:46:23 +0000
commit82c0e7e3d50cca20ed98d650d511071329e9f3a0 (patch)
tree03739fcddc4d8e50488925fa0dee337cb9bc255c /src/cpu/intel
parent44f1af2996c3727a3675a3dd3b7f199219e7fbf6 (diff)
downloadcoreboot-82c0e7e3d50cca20ed98d650d511071329e9f3a0.tar.xz
arch/x86: Drop some __SMM__ guards
Change-Id: I64063bbae5b44f1f24566609a7f770c6d5f69fac Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36637 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/cpu/intel')
-rw-r--r--src/cpu/intel/fsp_model_406dx/model_406dx.h3
-rw-r--r--src/cpu/intel/model_2065x/model_2065x.h4
-rw-r--r--src/cpu/intel/model_206ax/model_206ax.h4
3 files changed, 2 insertions, 9 deletions
diff --git a/src/cpu/intel/fsp_model_406dx/model_406dx.h b/src/cpu/intel/fsp_model_406dx/model_406dx.h
index 140dc2e4bf..adfec562ef 100644
--- a/src/cpu/intel/fsp_model_406dx/model_406dx.h
+++ b/src/cpu/intel/fsp_model_406dx/model_406dx.h
@@ -79,12 +79,9 @@
#define PSS_LATENCY_BUSMASTER 10
#ifndef __ROMCC__
-#ifdef __SMM__
/* Lock MSRs */
void intel_model_406dx_finalize_smm(void);
-#else
int cpu_config_tdp_levels(void);
#endif
-#endif
#endif /* _CPU_INTEL_MODEL_406DX_H */
diff --git a/src/cpu/intel/model_2065x/model_2065x.h b/src/cpu/intel/model_2065x/model_2065x.h
index 8087edb828..f6982d9ee9 100644
--- a/src/cpu/intel/model_2065x/model_2065x.h
+++ b/src/cpu/intel/model_2065x/model_2065x.h
@@ -69,14 +69,12 @@
#define PSS_LATENCY_TRANSITION 10
#define PSS_LATENCY_BUSMASTER 10
-#ifdef __SMM__
/* Lock MSRs */
void intel_model_2065x_finalize_smm(void);
-#else
+
/* Configure power limits for turbo mode */
void set_power_limits(u8 power_limit_1_time);
int cpu_config_tdp_levels(void);
-#endif
/* Sanity check config options. */
#if (CONFIG_SMM_TSEG_SIZE <= CONFIG_SMM_RESERVED_SIZE)
diff --git a/src/cpu/intel/model_206ax/model_206ax.h b/src/cpu/intel/model_206ax/model_206ax.h
index f2a0b71a5b..7017c128cb 100644
--- a/src/cpu/intel/model_206ax/model_206ax.h
+++ b/src/cpu/intel/model_206ax/model_206ax.h
@@ -93,14 +93,12 @@
# error "CONFIG_IED_REGION_SIZE is not a power of 2"
#endif
-#ifdef __SMM__
/* Lock MSRs */
void intel_model_206ax_finalize_smm(void);
-#else
+
/* Configure power limits for turbo mode */
void set_power_limits(u8 power_limit_1_time);
int cpu_config_tdp_levels(void);
-#endif
int get_platform_id(void);
#endif