[coreboot-gerrit] Change in coreboot[master]: soc/intel: Remove invalid smm_relocate stubs

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34150 )

Change subject: soc/intel: Remove invalid smm_relocate stubs
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34150
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
Reviewed-by: Paul Menzel 
---
M src/soc/intel/cannonlake/include/soc/smm.h
M src/soc/intel/icelake/include/soc/smm.h
M src/soc/intel/skylake/include/soc/smm.h
3 files changed, 0 insertions(+), 32 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/soc/intel/cannonlake/include/soc/smm.h b/src/soc/intel/cannonlake/include/soc/smm.h
index e38c338..e1c819b 100644
--- a/src/soc/intel/cannonlake/include/soc/smm.h
+++ b/src/soc/intel/cannonlake/include/soc/smm.h
@@ -50,7 +50,6 @@
 /* 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_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 f556b11..3c66f57 100644
--- a/src/soc/intel/icelake/include/soc/smm.h
+++ b/src/soc/intel/icelake/include/soc/smm.h
@@ -49,7 +49,6 @@
 /* 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_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 72992d2..7114a80 100644
--- a/src/soc/intel/skylake/include/soc/smm.h
+++ b/src/soc/intel/skylake/include/soc/smm.h
@@ -48,21 +48,11 @@
    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