diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-02-27 20:24:11 +0100 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-02-27 21:01:53 +0100 |
| commit | 9c29cfae8cc6214478a0a555e6901779eb19ef54 (patch) | |
| tree | dbe136e7a70310051ad0524054a7900383a772c2 | |
| parent | eeb36326b9402aaa009c0a672c3b3ecb80300297 (diff) | |
Fix microcode selection code
The ARM CPUs we know of don't have CPU microcode updates,
so don't show the selection in Kconfig.
Also simplify (and fix) the microcode selection in the Makefile
that would try to include microcode even though none is available.
Change-Id: I502d9b48d4449c1a759b5e90478ad37eef866406
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2540
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/cpu/Kconfig | 2 | ||||
| -rw-r--r-- | src/cpu/Makefile.inc | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index bb27da02e9..6177285a79 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -76,7 +76,7 @@ config CPU_MICROCODE_IN_CBFS default n choice - prompt "Include CPU microcode in CBFS" + prompt "Include CPU microcode in CBFS" if ARCH_X86 default CPU_MICROCODE_CBFS_GENERATE if CPU_MICROCODE_IN_CBFS default CPU_MICROCODE_CBFS_NONE if !CPU_MICROCODE_IN_CBFS diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index e1efecc7f5..b48a803795 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -11,21 +11,21 @@ subdirs-y += via ## Rules for building the microcode blob in CBFS ################################################################################ -ifneq ($(CONFIG_CPU_MICROCODE_CBFS_NONE), y) - -cbfs-files-y += cpu_microcode_blob.bin - -cpu_microcode_blob.bin-type = 0x53 - # 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)) -else +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 endif # In case we have more than one "source" (cough) files containing microcode, we -# Link them together in one large blob, so that we get all the microcode updates +# link them together in one large blob, so that we get all the microcode updates # in one file. This makes it easier for objcopy in the final step. # The --entry=0 is just here to suppress the LD warning. It does not affect the # final microcode file. @@ -38,5 +38,3 @@ $(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 $< $@ - -endif |