Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7957
-gerrit
commit 234f02e8cf1cbb98018b305cd8aeefa0e708dc91 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Sat Dec 27 11:47:21 2014 +0200
intel: Fix microcode alignment
CPU_MICROCODE_CBFS_LOC used a non-existing dependency variable CPU_MICROCODE_IN_CBFS. This broke alignment of microcode in CBFS.
Remoce CPU_MICROCODE_CBFS_LOC from global namespace as it is only used with PLATFORM_FSP.
CPU_MICROCODE_CBFS_LEN was no longer used at all.
Change-Id: I0454397924d2526d97b1f095cc371ba962873c99 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/cpu/Kconfig | 13 ------------- src/cpu/Makefile.inc | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index b0f7a14..9ab0556 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -159,16 +159,3 @@ config CPU_MICROCODE_FILE default "cpu_microcode.bin" help The path and filename of the file containing the CPU microcode. - -config CPU_MICROCODE_CBFS_LOC - hex "Microcode address in CBFS" - depends on CPU_MICROCODE_IN_CBFS - default 0 - -config CPU_MICROCODE_CBFS_LEN - hex "Microcode length in CBFS" - depends on CPU_MICROCODE_IN_CBFS - default 0xC000 - help - The microcode needs a specific length to get correctly - detected and loaded by all CPUs. diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index 60864ef..2411aeb 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -29,7 +29,7 @@ cpu_ucode_cbfs_file = $(obj)/cpu_microcode_blob.bin cbfs_include_ucode = y endif
-ifneq ($(CONFIG_CPU_MICROCODE_CBFS_LOC), 0) +ifeq ($(CONFIG_PLATFORM_USES_FSP), y) cpu_ucode_cbfs_offset = "-b $(CONFIG_CPU_MICROCODE_CBFS_LOC)" else cpu_ucode_cbfs_offset = "-b"