2 files changed, 1 insertions, 28 deletions
diff --git a/src/cpu/amd/pi/00730F01/Makefile.inc b/src/cpu/amd/pi/00730F01/Makefile.inc
index 5e49869de7..c4a92cf65d 100644
--- a/src/cpu/amd/pi/00730F01/Makefile.inc
+++ b/src/cpu/amd/pi/00730F01/Makefile.inc
@@ -12,8 +12,6 @@
 #
 
 romstage-y += fixme.c
-romstage-y += update_microcode.c
-romstage-y += microcode_fam16h.c
 
 ramstage-y += fixme.c
 ramstage-y += chip_name.c
diff --git a/src/cpu/amd/pi/00730F01/microcode_fam16h.c b/src/cpu/amd/pi/00730F01/microcode_fam16h.c
index 1251c38fea..1f1dbd90d1 100644
--- a/src/cpu/amd/pi/00730F01/microcode_fam16h.c
+++ b/src/cpu/amd/pi/00730F01/microcode_fam16h.c
@@ -16,8 +16,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/microcode.h>
 #include <cbfs.h>
-#include <arch/io.h>
-#include <smp/spinlock.h>
 
 /*
  * Values and header structure from:
@@ -122,22 +120,12 @@ void amd_update_microcode_from_cbfs(uint32_t equivalent_processor_rev_id)
 				   "Skipping microcode patch!\n");
 		return;
 	}
-#ifdef __PRE_RAM__
-#if CONFIG(HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK)
-		spin_lock(romstage_microcode_cbfs_lock());
-#endif
-#endif
 	ucode = cbfs_boot_map_with_leak("cpu_microcode_blob.bin",
 					CBFS_TYPE_MICROCODE,
 					&ucode_len);
 	if (!ucode) {
 		printk(BIOS_DEBUG, "cpu_microcode_blob.bin not found. "
 				   "Skipping updates.\n");
-#ifdef __PRE_RAM__
-#if CONFIG(HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK)
-			spin_unlock(romstage_microcode_cbfs_lock());
-#endif
-#endif
 		return;
 	}
 
@@ -145,21 +133,8 @@ void amd_update_microcode_from_cbfs(uint32_t equivalent_processor_rev_id)
 	    ucode_len < F16H_MPB_DATA_OFFSET) {
 		printk(BIOS_DEBUG, "microcode file invalid. Skipping "
 				   "updates.\n");
-#ifdef __PRE_RAM__
-#if CONFIG(HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK)
-		spin_unlock(romstage_microcode_cbfs_lock());
-#endif
-#endif
 		return;
 	}
 
-	amd_update_microcode(ucode, ucode_len,
-				equivalent_processor_rev_id);
-
-#ifdef __PRE_RAM__
-#if CONFIG(HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK)
-	spin_unlock(romstage_microcode_cbfs_lock());
-#endif
-#endif
-
+	amd_update_microcode(ucode, ucode_len, equivalent_processor_rev_id);
 }