summaryrefslogtreecommitdiff
path: root/src/soc/intel/sch
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2016-12-04 22:17:37 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2016-12-11 08:56:40 +0100
commit9d8adc0e3a923e1d201d50344f94a9176e5ec939 (patch)
tree5868a41948f5eda05a1fb8a213c4891d8a631cad /src/soc/intel/sch
parent3b3a28436f8ef65e2aee80f7367452c2bc136a19 (diff)
x86 SMM: Fix use with RELOCATABLE_RAMSTAGE
The value for _size was not evaluated correctly if ramstage is relocated, make the calculation runtime. While touching it, move symbol declarations to header file. Change-Id: I4402315945771acf1c86a81cac6d43f1fe99a2a2 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/17784 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/sch')
-rw-r--r--src/soc/intel/sch/smi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/soc/intel/sch/smi.c b/src/soc/intel/sch/smi.c
index 24628e52e6..f79e963ba1 100644
--- a/src/soc/intel/sch/smi.c
+++ b/src/soc/intel/sch/smi.c
@@ -24,9 +24,6 @@
#include "chip.h"
#include "sch.h"
-extern unsigned char _binary_smm_start;
-extern unsigned char _binary_smm_size;
-
/* I945 */
#define SMRAM 0x9d
#define D_OPEN (1 << 6)
@@ -299,7 +296,8 @@ static void smm_install(void)
D_OPEN | G_SMRAME | C_BASE_SEG);
/* copy the real SMM handler */
- memcpy((void *)0xa0000, &_binary_smm_start, (size_t)&_binary_smm_size);
+ memcpy((void *)0xa0000, _binary_smm_start,
+ _binary_smm_end - _binary_smm_start);
wbinvd();
/* close the SMM memory window and enable normal SMM */