[coreboot-gerrit] Change in coreboot[master]: cpu/intel/: Clean up microcode update from __PRE_RAM__

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35587 )

Change subject: cpu/intel/: Clean up microcode update from __PRE_RAM__
......................................................................

cpu/intel/: Clean up microcode update from __PRE_RAM__

Change-Id: Ib12985dd9a12495533a82be556405f975a0abe27
Signed-off-by: Kyösti Mälkki 
---
M src/cpu/intel/microcode/microcode.c
1 file changed, 1 insertion(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/35587/1

diff --git a/src/cpu/intel/microcode/microcode.c b/src/cpu/intel/microcode/microcode.c
index ed660a7..feb73c8 100644
--- a/src/cpu/intel/microcode/microcode.c
+++ b/src/cpu/intel/microcode/microcode.c
@@ -24,11 +24,9 @@
 #include <arch/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/microcode.h>
-
-#if !defined(__PRE_RAM__)
 #include <smp/spinlock.h>
+
 DECLARE_SPIN_LOCK(microcode_lock)
-#endif

struct microcode {
    u32 hdrver;	/* Header Version */
@@ -225,15 +223,11 @@
 {
    const void *patch = intel_microcode_find();

-#if !defined(__ROMCC__) && !defined(__PRE_RAM__)
    spin_lock(&microcode_lock);
-#endif

intel_microcode_load_unlocked(patch);

-#if !defined(__ROMCC__) && !defined(__PRE_RAM__)
    spin_unlock(&microcode_lock);
-#endif
 }

#if ENV_RAMSTAGE