From eac7023f848599f023cc07a95a32040da711a700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 8 Jul 2019 21:32:58 +0300 Subject: [PATCH] soc/intel: Remove invalid smm_relocate stubs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/34150 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Paul Menzel --- src/soc/intel/cannonlake/include/soc/smm.h | 11 ----------- src/soc/intel/icelake/include/soc/smm.h | 11 ----------- src/soc/intel/skylake/include/soc/smm.h | 10 ---------- 3 files changed, 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