[coreboot-gerrit] New patch to review for coreboot: cpu/microcode: Remove unused EXTERNAL and ADDED_DURING_BUILD variables

[Timothy Pearson (tpearson@raptorengineeringinc.com)]

Timothy Pearson (tpearson at raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11903

-gerrit

commit e33ed034c77131f42c1d84893c7d8b376c30c1da
Author: Timothy Pearson <tpearson at raptorengineeringinc.com>
Date:   Wed Oct 14 15:41:49 2015 -0500

    cpu/microcode: Remove unused EXTERNAL and ADDED_DURING_BUILD variables
    
    Change-Id: Ifea94c21e531a74953f5a0e2f489378c20ef3b5c
    Signed-off-by: Timothy Pearson <tpearson at raptorengineeringinc.com>
---
 Makefile.inc         |  2 --
 src/cpu/Kconfig      | 32 --------------------------------
 src/cpu/Makefile.inc |  6 ------
 3 files changed, 40 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index d84bf19..79b22fe 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -655,11 +655,9 @@ 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_ADDED_DURING_BUILD),y)
 	@printf "    UPDATE-FIT \n"
 	$(CBFSTOOL) $@.tmp update-fit -n cpu_microcode_blob.bin -x $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES)
 endif
-endif
 ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y)
 	@printf "    CONFIG     $(PAYLOAD_CONFIG)\n"
 	if [ -f "$(PAYLOAD_CONFIG)" ]; then \
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index bbd8e1b..df1ca40 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -74,17 +74,6 @@ config CPU_MICROCODE_MULTIPLE_FILES
 	  Select this option to install separate microcode container files into
 	  CBFS instead of using the traditional monolithic microcode file format.
 
-# This variable is used to determine if we add CPU microcode to CBFS during the
-# build. Microcode can be added manually afterwards, or removed. As a result,
-# code should not rely on this to tell if a microcode update is present or not,
-# and should instead search CBFS.
-# This variable is useful in determining if certain automated post-processing
-# steps can be performed right after the build, such as automatically adding
-# a firmware interface table.
-config CPU_MICROCODE_ADDED_DURING_BUILD
-	bool
-	default y if CPU_MICROCODE_CBFS_GENERATE || CPU_MICROCODE_CBFS_EXTERNAL
-
 config CPU_MICROCODE_CBFS_GENERATE_MONOLITHIC_FILE
 	bool
 	default y if !CPU_MICROCODE_MULTIPLE_FILES
@@ -106,20 +95,6 @@ config CPU_MICROCODE_CBFS_GENERATE
 
 	  If unsure, select this option.
 
-config CPU_MICROCODE_CBFS_EXTERNAL
-	bool "Include external microcode file"
-	help
-	  Select this option if you want to include an external file containing
-	  the CPU microcode. This will be included as a separate file in CBFS.
-	  A word of caution: only select this option if you are sure the
-	  microcode that you have is newer than the microcode shipping with
-	  coreboot.
-
-	  The microcode file may be removed from the ROM image at a later
-	  time with cbfstool, if desired.
-
-	  If unsure, select "Generate from tree"
-
 config CPU_MICROCODE_CBFS_NONE
 	bool "Do not include microcode updates"
 	help
@@ -163,10 +138,3 @@ config CPU_MICROCODE_CBFS_NONE
 	  selecting this option.
 
 endchoice
-
-config CPU_MICROCODE_FILE
-	  string "Path and filename of CPU microcode"
-	  depends on CPU_MICROCODE_CBFS_EXTERNAL
-	  default "cpu_microcode.bin"
-	  help
-	    The path and filename of the file containing the CPU microcode.
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc
index 1a5c2a9..87f2ae8 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -17,12 +17,6 @@ $(eval $(call create_class_compiler,cpu_microcode,x86_32))
 ## Rules for building the microcode blob in CBFS
 ################################################################################
 
-# External microcode file, or are we generating one ?
-ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL), y)
-cpu_ucode_cbfs_file = $(call strip_quotes,$(CONFIG_CPU_MICROCODE_FILE))
-cbfs_include_ucode = y
-endif
-
 ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE_MONOLITHIC_FILE), y)
 cpu_ucode_cbfs_file = $(obj)/cpu_microcode_blob.bin
 cbfs_include_ucode = y