Skip to content

Commit 69094c2

Browse files
committed
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
2 parents 0a89774 + c8a59a4 commit 69094c2

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

arch/x86/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,6 @@ config MICROCODE
12931293
bool "CPU microcode loading support"
12941294
default y
12951295
depends on CPU_SUP_AMD || CPU_SUP_INTEL
1296-
select FW_LOADER
12971296
help
12981297
If you say Y here, you will be able to update the microcode on
12991298
Intel and AMD processors. The Intel support is for the IA32 family,
@@ -1315,7 +1314,6 @@ config MICROCODE_INTEL
13151314
bool "Intel microcode loading support"
13161315
depends on MICROCODE
13171316
default MICROCODE
1318-
select FW_LOADER
13191317
help
13201318
This options enables microcode patch loading support for Intel
13211319
processors.
@@ -1327,7 +1325,6 @@ config MICROCODE_INTEL
13271325
config MICROCODE_AMD
13281326
bool "AMD microcode loading support"
13291327
depends on MICROCODE
1330-
select FW_LOADER
13311328
help
13321329
If you select this option, microcode patch loading support for AMD
13331330
processors will be enabled.

arch/x86/kernel/cpu/microcode/core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ extern struct builtin_fw __end_builtin_fw[];
145145

146146
bool get_builtin_firmware(struct cpio_data *cd, const char *name)
147147
{
148-
#ifdef CONFIG_FW_LOADER
149148
struct builtin_fw *b_fw;
150149

151150
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)
155154
return true;
156155
}
157156
}
158-
#endif
159157
return false;
160158
}
161159

0 commit comments

Comments
 (0)