diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-12-27 11:47:21 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-12-28 19:57:37 +0100 |
| commit | 78c622443e17a0b6d72142a9a8ed68069f22b745 (patch) | |
| tree | a4d2743330f6e19f2fec546ef490e03b7f36fc14 /src | |
| parent | 1bdd3217a245d3b93a41562814ee593664f0ad03 (diff) | |
| download | coreboot-78c622443e17a0b6d72142a9a8ed68069f22b745.tar.xz | |
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>
Reviewed-on: http://review.coreboot.org/7957
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpu/Kconfig | 13 | ||||
| -rw-r--r-- | src/cpu/Makefile.inc | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index b0f7a140ab..9ab0556da3 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 60864ef5dd..2411aebeb4 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" |