summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/mainboard.c3
-rw-r--r--src/mainboard/lenovo/g505s/mainboard.c3
-rw-r--r--src/southbridge/amd/agesa/hudson/smi.c2
-rw-r--r--src/southbridge/amd/agesa/hudson/smi.h2
-rw-r--r--src/southbridge/amd/pi/hudson/smi.c2
-rw-r--r--src/southbridge/amd/pi/hudson/smi.h2
6 files changed, 6 insertions, 8 deletions
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
index 0adcbf3edc..7c1f5579bd 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
@@ -4,6 +4,7 @@
#include <acpi/acpi.h>
#include <console/console.h>
+#include <cpu/x86/smm.h>
#include <device/device.h>
#include <southbridge/amd/agesa/hudson/smi.h>
@@ -21,7 +22,7 @@ static void mainboard_enable(struct device *dev)
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
hudson_configure_gevent_smi(EC_SMI_GEVENT, SMI_MODE_SMI, SMI_LVL_HIGH);
- hudson_enable_smi_generation();
+ global_smi_enable();
if (!acpi_is_wakeup_s3())
pavilion_cold_boot_init();
diff --git a/src/mainboard/lenovo/g505s/mainboard.c b/src/mainboard/lenovo/g505s/mainboard.c
index 8fab16645a..8339626b9f 100644
--- a/src/mainboard/lenovo/g505s/mainboard.c
+++ b/src/mainboard/lenovo/g505s/mainboard.c
@@ -4,6 +4,7 @@
#include <acpi/acpi.h>
#include <console/console.h>
+#include <cpu/x86/smm.h>
#include <device/device.h>
#include <southbridge/amd/agesa/hudson/smi.h>
@@ -21,7 +22,7 @@ static void mainboard_enable(struct device *dev)
printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
hudson_configure_gevent_smi(EC_SMI_GEVENT, SMI_MODE_SMI, SMI_LVL_HIGH);
- hudson_enable_smi_generation();
+ global_smi_enable();
if (!acpi_is_wakeup_s3())
pavilion_cold_boot_init();
diff --git a/src/southbridge/amd/agesa/hudson/smi.c b/src/southbridge/amd/agesa/hudson/smi.c
index 9e6db341fd..6c7682511b 100644
--- a/src/southbridge/amd/agesa/hudson/smi.c
+++ b/src/southbridge/amd/agesa/hudson/smi.c
@@ -16,7 +16,7 @@ void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
}
/** Set the EOS bit and enable SMI generation from southbridge */
-void hudson_enable_smi_generation(void)
+void global_smi_enable(void)
{
uint32_t reg = smi_read32(SMI_REG_SMITRIG0);
reg &= ~SMITRG0_SMIENB; /* Enable SMI generation */
diff --git a/src/southbridge/amd/agesa/hudson/smi.h b/src/southbridge/amd/agesa/hudson/smi.h
index e467954cc0..d0187b8c16 100644
--- a/src/southbridge/amd/agesa/hudson/smi.h
+++ b/src/southbridge/amd/agesa/hudson/smi.h
@@ -37,6 +37,4 @@ void hudson_configure_gevent_smi(uint8_t gevent, uint8_t mode, uint8_t level);
void hudson_disable_gevent_smi(uint8_t gevent);
void hudson_enable_acpi_cmd_smi(void);
-void hudson_enable_smi_generation(void);
-
#endif /* _SOUTHBRIDGE_AMD_AGESA_HUDSON_SMI_H */
diff --git a/src/southbridge/amd/pi/hudson/smi.c b/src/southbridge/amd/pi/hudson/smi.c
index 9e6db341fd..6c7682511b 100644
--- a/src/southbridge/amd/pi/hudson/smi.c
+++ b/src/southbridge/amd/pi/hudson/smi.c
@@ -16,7 +16,7 @@ void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
}
/** Set the EOS bit and enable SMI generation from southbridge */
-void hudson_enable_smi_generation(void)
+void global_smi_enable(void)
{
uint32_t reg = smi_read32(SMI_REG_SMITRIG0);
reg &= ~SMITRG0_SMIENB; /* Enable SMI generation */
diff --git a/src/southbridge/amd/pi/hudson/smi.h b/src/southbridge/amd/pi/hudson/smi.h
index 054888718a..5af3db062d 100644
--- a/src/southbridge/amd/pi/hudson/smi.h
+++ b/src/southbridge/amd/pi/hudson/smi.h
@@ -37,6 +37,4 @@ void hudson_configure_gevent_smi(uint8_t gevent, uint8_t mode, uint8_t level);
void hudson_disable_gevent_smi(uint8_t gevent);
void hudson_enable_acpi_cmd_smi(void);
-void hudson_enable_smi_generation(void);
-
#endif /* _SOUTHBRIDGE_AMD_PI_HUDSON_SMI_H */