[coreboot-gerrit] New patch to review for coreboot: 2587294 arch/x86: Do not run UPDATE-FIT if we don't include microcode

[Alexandru Gagniuc (mr.nuke.me@gmail.com)]

Alexandru Gagniuc (mr.nuke.me at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4480

-gerrit

commit 25872940b0a33e7321d6075304feef463894cf49
Author: Alexandru Gagniuc <mr.nuke.me at gmail.com>
Date:   Wed Dec 4 21:57:15 2013 -0600

    arch/x86: Do not run UPDATE-FIT if we don't include microcode
    
    The original intention was to only run UPDATE_FIT when a microcode file was
    included in CBFS. This happens when either CPU_MICROCODE_CBFS_GENERATE or
    CPU_MICROCODE_CBFS_EXTERNAL is selected, however, the makefile checked that
    CPU_MICROCODE_IN_CBFS was selected instead. The end result was that on
    hasswell, the UPDATE-FIT step was always run, even when no microcode was
    included, generating a build error.
    
    Instead, check CPU_MICROCODE_CBFS_NONE, which, when selected, means a
    microcode file will not be placed in CBFS.
    
    Change-Id: I28638912ed6f77761ef8a584f7636dc907b7a9b7
    Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
---
 src/arch/x86/Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 2e54645..8b91473 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -140,7 +140,7 @@ ifeq ($(CONFIG_PXE_ROM),y)
 	$(CBFSTOOL) $@.tmp add -f $(CONFIG_PXE_ROM_FILE) -n pci$(CONFIG_PXE_ROM_ID).rom -t raw
 endif
 ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y)
-ifeq ($(CONFIG_CPU_MICROCODE_IN_CBFS),y)
+ifneq ($(CPU_MICROCODE_CBFS_NONE),y)
 	@printf "    UPDATE-FIT \n"
 	$(CBFSTOOL) $@.tmp update-fit -n cpu_microcode_blob.bin -x $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES)
 endif