2 files changed, 1 insertions, 7 deletions
diff --git a/src/cpu/amd/microcode/Makefile.inc b/src/cpu/amd/microcode/Makefile.inc
index 6631019f38..48f1d0d136 100644
--- a/src/cpu/amd/microcode/Makefile.inc
+++ b/src/cpu/amd/microcode/Makefile.inc
@@ -1 +1,2 @@
 ramstage-y += microcode.c
+romstage-$(CONFIG_UPDATE_CPU_MICROCODE) += microcode.c
diff --git a/src/cpu/amd/microcode/microcode.c b/src/cpu/amd/microcode/microcode.c
index 1e94daba08..46d814e0c9 100644
--- a/src/cpu/amd/microcode/microcode.c
+++ b/src/cpu/amd/microcode/microcode.c
@@ -17,17 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef __ROMCC__
 #include <stdint.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/microcode.h>
-#endif
-
-#ifndef __PRE_RAM__
-#include <cpu/cpu.h>
-#include <cpu/x86/cache.h>
-#endif
 
 struct microcode {
 	u32 date_code;