cpu/microcode: Remove EXTERNAL / ADDED_DURING_BUILD variables

There has been a concerted effort to clean up coreboot's microcode
handling that has included a move away from coreboot-specific
microcode file collections.  As a result, the ability to specify
a single microcode file to be added to the image is of less utility
than before.

NOTE: This patch remove the built-in external microcode feature,
however the user can still specify no microcode during build and
manually add the correct microcode file(s) to the CBFS image after
the build is complete.

Change-Id: Ifea94c21e531a74953f5a0e2f489378c20ef3b5c
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/11903
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)

3 files changed, 3 insertions, 45 deletions

diff --git a/Makefile.inc b/Makefile.inc
index feadd0d789..de148cba7a 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -634,7 +634,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_ADDED_DURING_BUILD),y)
+ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE),y)
 	@printf "    UPDATE-FIT \n"
 	$(CBFSTOOL) $@.tmp update-fit -n cpu_microcode_blob.bin -x $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES)
 endif
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 578bab2296..9b9413c72c 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -67,17 +67,6 @@ config SUPPORT_CPU_UCODE_IN_CBFS
 	bool
 	default n
 
-# 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
-
 choice
 	prompt "Include CPU microcode in CBFS" if ARCH_X86
 	default CPU_MICROCODE_CBFS_GENERATE if SUPPORT_CPU_UCODE_IN_CBFS && USE_BLOBS
@@ -95,20 +84,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
@@ -160,10 +135,3 @@ config CPU_MICROCODE_MULTIPLE_FILES
 	help
 	  Select this option to install separate microcode container files into
 	  CBFS instead of using the traditional monolithic microcode file format.
-
-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 52b58f7ecb..517cbfaaf5 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -17,17 +17,8 @@ $(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), y)
 ifneq ($(CONFIG_CPU_MICROCODE_MULTIPLE_FILES), y)
-cpu_ucode_cbfs_file = $(obj)/cpu_microcode_blob.bin
-cbfs_include_ucode = y
-endif
+cbfs-files-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE)  += cpu_microcode_blob.bin
 endif
 
 # We just mash all microcode binaries together into one binary to rule them all.
@@ -42,8 +33,7 @@ $(obj)/cpu_microcode_blob.bin: $$(cpu_microcode_bins)
 	@echo $(cpu_microcode_bins)
 	cat /dev/null $+ > $@
 
-cbfs-files-$(cbfs_include_ucode) += cpu_microcode_blob.bin
-cpu_microcode_blob.bin-file := $(cpu_ucode_cbfs_file)
+cpu_microcode_blob.bin-file := $(obj)/cpu_microcode_blob.bin
 cpu_microcode_blob.bin-type := microcode
 
 ifneq ($(CONFIG_CPU_MICROCODE_CBFS_LOC),)