Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37891 )
Change subject: cpu/intel/microcode: Apply more strict guard for assembly files ......................................................................
cpu/intel/microcode: Apply more strict guard for assembly files
Change-Id: I8243be7c9a57402b2ac1cfa1c0552990d4a4ba74 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/Makefile.inc M src/cpu/intel/microcode/Makefile.inc M src/drivers/intel/fsp1_1/Kconfig 3 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/37891/1
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 9486bc0..6ed93e5 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -124,7 +124,7 @@ $(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 b13172e..119c38f 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 93af4f7..7c69888 100644 --- a/src/drivers/intel/fsp1_1/Kconfig +++ b/src/drivers/intel/fsp1_1/Kconfig @@ -15,6 +15,7 @@ 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?