diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-08-16 08:05:52 +0300 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-11-13 09:12:10 +0000 |
| commit | ead8a07cee63277da683e42ca820e1e853a3de17 (patch) | |
| tree | aea1ff31577bd4f740ca2dd7b70f0ab4bda9d2cd /src/southbridge | |
| parent | 799184397a06966403b9b2f3f5b53dba27eb272a (diff) | |
| download | coreboot-ead8a07cee63277da683e42ca820e1e853a3de17.tar.xz | |
intel/82801dx,ix: Rename SMM_ASEG functions
Static declarations for use with SMM_ASEG conflict those
declared globally for use with SMM_TSEG.
Change-Id: I8d2984cd8fe6208417b2eda0c10da8fc7bb76cf1
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35892
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/southbridge')
| -rw-r--r-- | src/southbridge/intel/i82801dx/smi.c | 8 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801ix/smi.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/southbridge/intel/i82801dx/smi.c b/src/southbridge/intel/i82801dx/smi.c index 521b98db04..dc53220fc1 100644 --- a/src/southbridge/intel/i82801dx/smi.c +++ b/src/southbridge/intel/i82801dx/smi.c @@ -235,7 +235,7 @@ static void smi_set_eos(void) extern uint8_t smm_relocation_start, smm_relocation_end; static void *default_smm_area = NULL; -static void smm_relocate(void) +static void aseg_smm_relocate(void) { u32 smi_en; u16 pm1_en; @@ -318,7 +318,7 @@ static void smm_relocate(void) outb(0x00, 0xb2); } -static void smm_install(void) +static void aseg_smm_install(void) { /* copy the real SMM handler */ memcpy((void *)0xa0000, _binary_smm_start, @@ -329,10 +329,10 @@ static void smm_install(void) void smm_init(void) { /* Put SMM code to 0xa0000 */ - smm_install(); + aseg_smm_install(); /* Put relocation code to 0x38000 and relocate SMBASE */ - smm_relocate(); + aseg_smm_relocate(); /* We're done. Make sure SMIs can happen! */ smi_set_eos(); diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c index 0a80dd2ccf..5f73f411dc 100644 --- a/src/southbridge/intel/i82801ix/smi.c +++ b/src/southbridge/intel/i82801ix/smi.c @@ -45,7 +45,7 @@ static u16 pmbase = DEFAULT_PMBASE; extern uint8_t smm_relocation_start, smm_relocation_end; static void *default_smm_area = NULL; -static void smm_relocate(void) +static void aseg_smm_relocate(void) { u32 smi_en; u16 pm1_en; @@ -126,7 +126,7 @@ static void smm_relocate(void) static int smm_handler_copied = 0; -static void smm_install(void) +static void aseg_smm_install(void) { /* The first CPU running this gets to copy the SMM handler. But not all * of them. @@ -158,10 +158,10 @@ static void smm_install(void) void smm_init(void) { /* Put SMM code to 0xa0000 */ - smm_install(); + aseg_smm_install(); /* Put relocation code to 0x38000 and relocate SMBASE */ - smm_relocate(); + aseg_smm_relocate(); /* We're done. Make sure SMIs can happen! */ smi_set_eos(); |