From 6366d92803fdd43882592263f70ad83114359c64 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 4 May 2016 09:00:13 -0500 Subject: {cpu,soc}/intel: remove unused smm_init() function There used to be a need for an empty smm_init() function because initialize_cpus() called it even though nothing called initialize_cpus(). However, garbage collection at link time is implemented so there's no reason to provide an empty function to satisfy a symbol that is completely culled during link. Remove it. Change-Id: Ic13c85f1d3d57e38e7132e4289a98a95829f765a Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/14605 Tested-by: build bot (Jenkins) Reviewed-by: Duncan Laurie Reviewed-by: Furquan Shaikh --- src/cpu/intel/haswell/smmrelocate.c | 9 --------- src/soc/intel/baytrail/placeholders.c | 3 --- src/soc/intel/braswell/smm.c | 4 ---- src/soc/intel/broadwell/smmrelocate.c | 9 --------- src/soc/intel/fsp_baytrail/placeholders.c | 4 ---- src/soc/intel/skylake/smmrelocate.c | 11 ----------- 6 files changed, 40 deletions(-) diff --git a/src/cpu/intel/haswell/smmrelocate.c b/src/cpu/intel/haswell/smmrelocate.c index 5c50ad1c93..34a35516a7 100644 --- a/src/cpu/intel/haswell/smmrelocate.c +++ b/src/cpu/intel/haswell/smmrelocate.c @@ -352,15 +352,6 @@ void smm_relocate(void) smm_initiate_relocation(); } -void smm_init(void) -{ - /* smm_init() is normally called from initialize_cpus() in - * lapic_cpu_init.c. However, that path is no longer used. Don't reuse - * the function name because that would cause confusion. - * The smm_initialize() function above is used to setup SMM at the - * appropriate time. */ -} - void smm_lock(void) { /* LOCK the SMM memory window and enable normal SMM. diff --git a/src/soc/intel/baytrail/placeholders.c b/src/soc/intel/baytrail/placeholders.c index 500ced27c1..b110f5f416 100644 --- a/src/soc/intel/baytrail/placeholders.c +++ b/src/soc/intel/baytrail/placeholders.c @@ -17,8 +17,5 @@ #include #include - -void smm_init(void) {} - /* Rmodules don't like weak symbols. */ u32 map_oprom_vendev(u32 vendev) { return vendev; } diff --git a/src/soc/intel/braswell/smm.c b/src/soc/intel/braswell/smm.c index 8318050ce0..3a7ab1cb69 100644 --- a/src/soc/intel/braswell/smm.c +++ b/src/soc/intel/braswell/smm.c @@ -29,10 +29,6 @@ /* Save settings which will be committed in SMI functions. */ static uint32_t smm_save_params[SMM_SAVE_PARAM_COUNT]; -void smm_init(void) -{ -} - void southcluster_smm_save_param(int param, uint32_t data) { smm_save_params[param] = data; diff --git a/src/soc/intel/broadwell/smmrelocate.c b/src/soc/intel/broadwell/smmrelocate.c index 0cc6399780..6fd609b508 100644 --- a/src/soc/intel/broadwell/smmrelocate.c +++ b/src/soc/intel/broadwell/smmrelocate.c @@ -316,15 +316,6 @@ void smm_relocate(void) smm_initiate_relocation(); } -void smm_init(void) -{ - /* smm_init() is normally called from initialize_cpus() in - * lapic_cpu_init.c. However, that path is no longer used. Don't reuse - * the function name because that would cause confusion. - * The smm_initialize() function above is used to setup SMM at the - * appropriate time. */ -} - void smm_lock(void) { /* LOCK the SMM memory window and enable normal SMM. diff --git a/src/soc/intel/fsp_baytrail/placeholders.c b/src/soc/intel/fsp_baytrail/placeholders.c index 248aba2e74..587f0e9e62 100644 --- a/src/soc/intel/fsp_baytrail/placeholders.c +++ b/src/soc/intel/fsp_baytrail/placeholders.c @@ -20,9 +20,5 @@ void acpi_create_serialio_ssdt(acpi_header_t *ssdt) {} -#if IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) -void smm_init(void) {} -#endif - /* Rmodules don't like weak symbols. */ u32 map_oprom_vendev(u32 vendev) { return vendev; } diff --git a/src/soc/intel/skylake/smmrelocate.c b/src/soc/intel/skylake/smmrelocate.c index 0c0806866b..807aaa38ac 100644 --- a/src/soc/intel/skylake/smmrelocate.c +++ b/src/soc/intel/skylake/smmrelocate.c @@ -305,17 +305,6 @@ void smm_relocate(void) smm_initiate_relocation(); } -void smm_init(void) -{ - /* - * smm_init() is normally called from initialize_cpus() in - * lapic_cpu_init.c. However, that path is no longer used. Don't reuse - * the function name because that would cause confusion. - * The smm_initialize() function above is used to setup SMM at the - * appropriate time. - */ -} - void smm_lock(void) { /* -- cgit v1.2.3