summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/Kconfig8
-rw-r--r--src/cpu/Makefile.inc2
2 files changed, 0 insertions, 10 deletions
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 933e50f227..297b1a125e 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -111,7 +111,6 @@ config CPU_MICROCODE_CBFS_DEFAULT_BINS
config CPU_MICROCODE_CBFS_EXTERNAL_BINS
bool "Include external microcode binary"
select USE_CPU_MICROCODE_CBFS_BINS
- depends on !CPU_MICROCODE_MULTIPLE_FILES
help
Select this option if you want to include external binary files
in the CPUs native format. They will be included as a separate
@@ -128,7 +127,6 @@ config CPU_MICROCODE_CBFS_EXTERNAL_BINS
config CPU_MICROCODE_CBFS_EXTERNAL_HEADER
bool "Include external microcode header files"
- depends on !CPU_MICROCODE_MULTIPLE_FILES
help
Select this option if you want to include external c header files
containing the CPU microcode. This will be included as a separate
@@ -179,12 +177,6 @@ config CPU_MICROCODE_CBFS_NONE
endchoice
-config CPU_MICROCODE_MULTIPLE_FILES
- bool
- help
- Select this option to install separate microcode container files into
- CBFS instead of using the traditional monolithic microcode file format.
-
config CPU_MICROCODE_HEADER_FILES
string "List of space separated microcode header files with the path"
depends on CPU_MICROCODE_CBFS_EXTERNAL_HEADER
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc
index a072a8b232..ec2f19fd18 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -13,9 +13,7 @@ $(eval $(call create_class_compiler,cpu_microcode,x86_32))
## Rules for building the microcode blob in CBFS
################################################################################
-ifneq ($(CONFIG_CPU_MICROCODE_MULTIPLE_FILES), y)
cbfs-files-$(CONFIG_USE_CPU_MICROCODE_CBFS_BINS) += cpu_microcode_blob.bin
-endif
ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER),y)
cbfs-files-y += cpu_microcode_blob.bin