From 66e0c4c8c46eec6063a7bb8933990cc5c203ec2e Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Wed, 4 Dec 2013 22:21:15 -0600 Subject: cpu: Rename CPU_MICROCODE_IN_CBFS to SUPPORT_CPU_UCODE_IN_CBFS CPU_MICROCODE_IN_CBFS was designed to mean that loading microcode updates from a CBFS file is supported, however, the name implies that microcode is present in CBFS. This has recently caused confusion both with contributions from Google, as well as SAGE. Rename this option to SUPPORT_CPU_UCODE_IN_CBFS in order to make it clearer that what is meant is "hey, the code we have for this CPU supports loading microcode updates from CBFS", and prevent further confusion. Change-Id: I394555f690b5ab4cac6fbd3ddbcb740ab1138339 Signed-off-by: Alexandru Gagniuc Reviewed-on: http://review.coreboot.org/4482 Reviewed-by: Marc Jones Tested-by: build bot (Jenkins) --- src/cpu/Kconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/cpu/Kconfig') diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index 6c118b7908..cd6c7a0d4f 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -73,7 +73,7 @@ config SSE2 endif # ARCH_X86 -config CPU_MICROCODE_IN_CBFS +config SUPPORT_CPU_UCODE_IN_CBFS bool default n @@ -90,9 +90,8 @@ config CPU_MICROCODE_ADDED_DURING_BUILD choice prompt "Include CPU microcode in CBFS" if ARCH_X86 - default CPU_MICROCODE_CBFS_GENERATE if CPU_MICROCODE_IN_CBFS - default CPU_MICROCODE_CBFS_EXTERNAL if CPU_MICROCODE_IN_CBFS - default CPU_MICROCODE_CBFS_NONE + default CPU_MICROCODE_CBFS_GENERATE if SUPPORT_CPU_UCODE_IN_CBFS + default CPU_MICROCODE_CBFS_NONE if !SUPPORT_CPU_UCODE_IN_CBFS config CPU_MICROCODE_CBFS_GENERATE bool "Generate from tree" -- cgit v1.2.3