diff options
| author | Timothy Pearson <tpearson@raptorengineeringinc.com> | 2015-10-14 15:41:49 -0500 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-11-05 02:24:45 +0100 |
| commit | 855fc1fcdbf1e40931d31f25ca7091a7b0aeace5 (patch) | |
| tree | 59bd0a00f24697ebfc1b610110323385cc135608 /src/cpu/Makefile.inc | |
| parent | 24391321e8afe74063b1c4216732b66ad6d1ed36 (diff) | |
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)
Diffstat (limited to 'src/cpu/Makefile.inc')
| -rw-r--r-- | src/cpu/Makefile.inc | 14 |
1 files changed, 2 insertions, 12 deletions
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),) |