diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 9486bc06cc..6ed93e5182 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -124,7 +124,7 @@ else
 $(eval $(call early_x86_stage,bootblock,elf64-x86-64))
 endif
 
-bootblock-$(CONFIG_ARCH_BOOTBLOCK_X86_32) += walkcbfs.S
+bootblock-$(CONFIG_MICROCODE_UPDATE_PRE_RAM) += walkcbfs.S
 
 endif # CONFIG_ARCH_BOOTBLOCK_X86_32 / CONFIG_ARCH_BOOTBLOCK_X86_64
 
diff --git a/src/cpu/intel/microcode/Makefile.inc b/src/cpu/intel/microcode/Makefile.inc
index b13172ee16..119c38fac2 100644
--- a/src/cpu/intel/microcode/Makefile.inc
+++ b/src/cpu/intel/microcode/Makefile.inc
@@ -1,5 +1,4 @@
 bootblock-$(CONFIG_MICROCODE_UPDATE_PRE_RAM) += microcode_asm.S
-romstage-$(CONFIG_MICROCODE_UPDATE_PRE_RAM) += microcode_asm.S
 
 bootblock-$(CONFIG_SUPPORT_CPU_UCODE_IN_CBFS) += microcode.c
 ramstage-$(CONFIG_SUPPORT_CPU_UCODE_IN_CBFS) += microcode.c
diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig
index 93af4f7360..7c69888ea1 100644
--- a/src/drivers/intel/fsp1_1/Kconfig
+++ b/src/drivers/intel/fsp1_1/Kconfig
@@ -15,6 +15,7 @@ config PLATFORM_USES_FSP1_1
 	bool
 	select UEFI_2_4_BINDING
 	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
+	select MICROCODE_UPDATE_PRE_RAM
 	help
 	  Does the code require the Intel Firmware Support Package?