From cad97e287a23df1146f607614487d6c5c57a2c72 Mon Sep 17 00:00:00 2001 From: Barnali Sarkar Date: Thu, 29 Sep 2016 11:25:49 +0530 Subject: [PATCH] UPSTREAM: src/cpu: Fix location for cpu_microcode_blob.bin in COREBOOT CBFS only The CPU_MICROCODE_BLOB_CBFS_LOC should only be specified for COREBOOT CBFS, not for other CBFS. BUG=none BRANCH=none TEST=Built and boot kunimitsu Signed-off-by: Barnali Sarkar Reviewed-on: https://review.coreboot.org/16932 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Change-Id: I58bb289e6c9add2647876ef817b7920f6e7b427a Reviewed-on: https://chromium-review.googlesource.com/397912 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/cpu/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index 046c418554..4ac68120cf 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -46,7 +46,7 @@ cpu_microcode_blob.bin-file ?= $(obj)/cpu_microcode_blob.bin cpu_microcode_blob.bin-type := microcode ifneq ($(CONFIG_CPU_MICROCODE_CBFS_LOC),) -cpu_microcode_blob.bin-position := $(CONFIG_CPU_MICROCODE_CBFS_LOC) +cpu_microcode_blob.bin-COREBOOT-position := $(CONFIG_CPU_MICROCODE_CBFS_LOC) else cpu_microcode_blob.bin-align := 16 endif