From 48b3dbc7483f5404a2dfb3b8bb5f4bcf7d3c4b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 29 Dec 2014 19:36:50 +0200 Subject: x86 SMM: Replace weak prototypes with weak function stub MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I682617cd2f4310d3e2e2ab6ffec51def28a4779c Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7961 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Patrick Georgi --- src/include/cpu/x86/smm.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/include') diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index 7b529e0773..c16a6c50d2 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -467,7 +467,7 @@ void smi_handler(u32 smm_revision); void io_trap_handler(int smif); int southbridge_io_trap_handler(int smif); -int __attribute__((weak)) mainboard_io_trap_handler(int smif); +int mainboard_io_trap_handler(int smif); void southbridge_smi_set_eos(void); @@ -475,18 +475,14 @@ void southbridge_smi_set_eos(void); void cpu_smi_handler(void); void northbridge_smi_handler(void); void southbridge_smi_handler(void); +#else +void cpu_smi_handler(unsigned int node, smm_state_save_area_t *state_save); +void northbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); +void southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); +#endif /* CONFIG_SMM_MODULES */ void mainboard_smi_gpi(u32 gpi_sts); int mainboard_smi_apmc(u8 data); void mainboard_smi_sleep(u8 slp_typ); -#else -void __attribute__((weak)) cpu_smi_handler(unsigned int node, smm_state_save_area_t *state_save); -void __attribute__((weak)) northbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); -void __attribute__((weak)) southbridge_smi_handler(unsigned int node, smm_state_save_area_t *state_save); - -void __attribute__((weak)) mainboard_smi_gpi(u32 gpi_sts); -int __attribute__((weak)) mainboard_smi_apmc(u8 data); -void __attribute__((weak)) mainboard_smi_sleep(u8 slp_typ); -#endif /* CONFIG_SMM_MODULES */ #if !CONFIG_SMM_TSEG void smi_release_lock(void); -- cgit v1.2.3