summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/Makefile.inc20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc
index 09d36ec67e..a860f67752 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -15,17 +15,17 @@ subdirs-$(CONFIG_CPU_QEMU_X86) += qemu-x86
## Rules for building the microcode blob in CBFS
################################################################################
+cpu_ucode_cbfs_name = cpu_microcode_blob.bin
+
# External microcode file, or are we generating one ?
ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL), y)
-cbfs-files-y += cpu_microcode_blob.bin
-cpu_microcode_blob.bin-type = 0x53
-cpu_microcode_blob.bin-file = $(call strip_quotes,$(CONFIG_CPU_MICROCODE_FILE))
+cpu_ucode_cbfs_file = $(call strip_quotes,$(CONFIG_CPU_MICROCODE_FILE))
+cbfs_include_ucode = y
endif
ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE), y)
-cbfs-files-y += cpu_microcode_blob.bin
-cpu_microcode_blob.bin-type = 0x53
-cpu_microcode_blob.bin-file = $(obj)/cpu_microcode_blob.bin
+cpu_ucode_cbfs_file = $(obj)/cpu_microcode_blob.bin
+cbfs_include_ucode = y
endif
# In case we have more than one "source" (cough) files containing microcode, we
@@ -42,3 +42,11 @@ $(obj)/cpu_microcode_blob.o: $$(cpu_microcode-objs)
$(obj)/cpu_microcode_blob.bin: $(obj)/cpu_microcode_blob.o
@printf " MICROCODE $(subst $(obj)/,,$(@))\n"
$(OBJCOPY) -j .data -O binary $< $@
+
+ifeq ($(cbfs_include_ucode),y)
+# Add CPU microcode to specified rom image $(1)
+add-cpu-microcode-to-cbfs = \
+ $(CBFSTOOL) $(1) locate -f $(cpu_ucode_cbfs_file) -n $(cpu_ucode_cbfs_name) -a 16 | xargs $(CBFSTOOL) $(1) add -n $(cpu_ucode_cbfs_name) -f $(cpu_ucode_cbfs_file) -t 0x53 -b
+else
+add-cpu-microcode-to-cbfs = true
+endif