summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-08 21:32:58 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-10 09:19:25 +0000
commiteac7023f848599f023cc07a95a32040da711a700 (patch)
tree70757503daa81d05724bbbeb50e13a241e651ade
parentf08f266aa23c444d43cd4b521278c130cfa37c95 (diff)
soc/intel: Remove invalid smm_relocate stubs
Remove the per-platform empty stubs, builds would just fail as there is no equivalent conditional for the smmrelocate.c file. Change-Id: Ie11f307b7bc5415bfdba6a2c66aed01b70d9f0e0 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34150 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/soc/intel/cannonlake/include/soc/smm.h11
-rw-r--r--src/soc/intel/icelake/include/soc/smm.h11
-rw-r--r--src/soc/intel/skylake/include/soc/smm.h10
3 files changed, 0 insertions, 32 deletions
diff --git a/src/soc/intel/cannonlake/include/soc/smm.h b/src/soc/intel/cannonlake/include/soc/smm.h
index e38c3381d8..e1c819ba14 100644
--- a/src/soc/intel/cannonlake/include/soc/smm.h
+++ b/src/soc/intel/cannonlake/include/soc/smm.h
@@ -50,7 +50,6 @@ struct smm_relocation_params {
/* Mainboard handler for eSPI SMIs */
void mainboard_smi_espi_handler(void);
-#if CONFIG(HAVE_SMI_HANDLER)
void smm_relocation_handler(int cpu, uintptr_t curr_smbase,
uintptr_t staggered_smbase);
void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
@@ -58,14 +57,4 @@ void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
void smm_initialize(void);
void smm_relocate(void);
-#else /* CONFIG_HAVE_SMI_HANDLER */
-static inline void smm_relocation_handler(int cpu, uintptr_t curr_smbase,
- uintptr_t staggered_smbase) {}
-static inline void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
- size_t *smm_save_state_size) {}
-static inline void smm_initialize(void) {}
-
-static inline void smm_relocate(void) {}
-#endif /* CONFIG_HAVE_SMI_HANDLER */
-
#endif
diff --git a/src/soc/intel/icelake/include/soc/smm.h b/src/soc/intel/icelake/include/soc/smm.h
index f556b11514..3c66f57d43 100644
--- a/src/soc/intel/icelake/include/soc/smm.h
+++ b/src/soc/intel/icelake/include/soc/smm.h
@@ -49,7 +49,6 @@ struct smm_relocation_params {
/* Mainboard handler for eSPI SMIs */
void mainboard_smi_espi_handler(void);
-#if CONFIG(HAVE_SMI_HANDLER)
void smm_relocation_handler(int cpu, uintptr_t curr_smbase,
uintptr_t staggered_smbase);
void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
@@ -57,14 +56,4 @@ void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
void smm_initialize(void);
void smm_relocate(void);
-#else /* CONFIG_HAVE_SMI_HANDLER */
-static inline void smm_relocation_handler(int cpu, uintptr_t curr_smbase,
- uintptr_t staggered_smbase) {}
-static inline void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
- size_t *smm_save_state_size) {}
-static inline void smm_initialize(void) {}
-
-static inline void smm_relocate(void) {}
-#endif /* CONFIG_HAVE_SMI_HANDLER */
-
#endif
diff --git a/src/soc/intel/skylake/include/soc/smm.h b/src/soc/intel/skylake/include/soc/smm.h
index 72992d2517..7114a80b08 100644
--- a/src/soc/intel/skylake/include/soc/smm.h
+++ b/src/soc/intel/skylake/include/soc/smm.h
@@ -48,21 +48,11 @@ struct smm_relocation_params {
int smm_save_state_in_msrs;
};
-#if CONFIG(HAVE_SMI_HANDLER)
void smm_relocation_handler(int cpu, uintptr_t curr_smbase,
uintptr_t staggered_smbase);
void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
size_t *smm_save_state_size);
void smm_initialize(void);
void smm_relocate(void);
-#else /* CONFIG_HAVE_SMI_HANDLER */
-static inline void smm_relocation_handler(int cpu, uintptr_t curr_smbase,
- uintptr_t staggered_smbase) {}
-static inline void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
- size_t *smm_save_state_size) {}
-static inline void smm_initialize(void) {}
-
-static inline void smm_relocate(void) {}
-#endif /* CONFIG_HAVE_SMI_HANDLER */
#endif