GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Stefan Reinauer 2013-02-27 20:24:11 +01:00
parent eeb36326b9
commit 9c29cfae8c
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/Kconfig
View File

@ -76,7 +76,7 @@ config CPU_MICROCODE_IN_CBFS
default n default n
choice 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_GENERATE if CPU_MICROCODE_IN_CBFS
default CPU_MICROCODE_CBFS_NONE if !CPU_MICROCODE_IN_CBFS default CPU_MICROCODE_CBFS_NONE if !CPU_MICROCODE_IN_CBFS

18
src/cpu/Makefile.inc
View File

@ -11,21 +11,21 @@ subdirs-y += via
## Rules for building the microcode blob in CBFS ## 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 ? # External microcode file, or are we generating one ?
ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL), y) 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_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 cpu_microcode_blob.bin-file = $(obj)/cpu_microcode_blob.bin
endif endif
# In case we have more than one "source" (cough) files containing microcode, we # 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. # 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 # The --entry=0 is just here to suppress the LD warning. It does not affect the
# final microcode file. # 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 $(obj)/cpu_microcode_blob.bin: $(obj)/cpu_microcode_blob.o
@printf " MICROCODE $(subst $(obj)/,,$(@))\n" @printf " MICROCODE $(subst $(obj)/,,$(@))\n"
$(OBJCOPY) -j .data -O binary $< $@ $(OBJCOPY) -j .data -O binary $< $@
endif