Commit 69094c20 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'x86-microcode-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 microcode update from Ingo Molnar:
 "Remove the microcode loader's FW_LOADER coupling"

* tag 'x86-microcode-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode: Do not select FW_LOADER
parents 0a897743 c8a59a4d
...@@ -1293,7 +1293,6 @@ config MICROCODE ...@@ -1293,7 +1293,6 @@ config MICROCODE
bool "CPU microcode loading support" bool "CPU microcode loading support"
default y default y
depends on CPU_SUP_AMD || CPU_SUP_INTEL depends on CPU_SUP_AMD || CPU_SUP_INTEL
select FW_LOADER
help help
If you say Y here, you will be able to update the microcode on If you say Y here, you will be able to update the microcode on
Intel and AMD processors. The Intel support is for the IA32 family, Intel and AMD processors. The Intel support is for the IA32 family,
...@@ -1315,7 +1314,6 @@ config MICROCODE_INTEL ...@@ -1315,7 +1314,6 @@ config MICROCODE_INTEL
bool "Intel microcode loading support" bool "Intel microcode loading support"
depends on MICROCODE depends on MICROCODE
default MICROCODE default MICROCODE
select FW_LOADER
help help
This options enables microcode patch loading support for Intel This options enables microcode patch loading support for Intel
processors. processors.
...@@ -1327,7 +1325,6 @@ config MICROCODE_INTEL ...@@ -1327,7 +1325,6 @@ config MICROCODE_INTEL
config MICROCODE_AMD config MICROCODE_AMD
bool "AMD microcode loading support" bool "AMD microcode loading support"
depends on MICROCODE depends on MICROCODE
select FW_LOADER
help help
If you select this option, microcode patch loading support for AMD If you select this option, microcode patch loading support for AMD
processors will be enabled. processors will be enabled.
......
...@@ -145,7 +145,6 @@ extern struct builtin_fw __end_builtin_fw[]; ...@@ -145,7 +145,6 @@ extern struct builtin_fw __end_builtin_fw[];
bool get_builtin_firmware(struct cpio_data *cd, const char *name) bool get_builtin_firmware(struct cpio_data *cd, const char *name)
{ {
#ifdef CONFIG_FW_LOADER
struct builtin_fw *b_fw; struct builtin_fw *b_fw;
for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) { for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) {
...@@ -155,7 +154,6 @@ bool get_builtin_firmware(struct cpio_data *cd, const char *name) ...@@ -155,7 +154,6 @@ bool get_builtin_firmware(struct cpio_data *cd, const char *name)
return true; return true;
} }
} }
#endif
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment