Aaron Durbin (adurbin@chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14605
-gerrit
commit 6b9e0b52e625fbbe5b01d5442d511d212bf7048c Author: Aaron Durbin adurbin@chromium.org Date: Wed May 4 09:00:13 2016 -0500
{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 adurbin@chromium.org --- 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 5c50ad1c..34a3551 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 500ced2..b110f5f 100644 --- a/src/soc/intel/baytrail/placeholders.c +++ b/src/soc/intel/baytrail/placeholders.c @@ -17,8 +17,5 @@ #include <device/pci_rom.h> #include <soc/acpi.h>
- -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 8318050..3a7ab1c 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 0cc6399..6fd609b 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 248aba2..587f0e9 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 fcb89de..9428dcc 100644 --- a/src/soc/intel/skylake/smmrelocate.c +++ b/src/soc/intel/skylake/smmrelocate.c @@ -302,17 +302,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) { /*