The x86 microcode support works just fine without FW_LOADER. In fact these days most people load them early in boot so FW_LOADER never gets into the picture anyway.
People who need the FW_LOADER capability can still enable it. Signed-off-by: Herbert Xu <[email protected]> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1d6104ea8af0..8aac7a65bfbb 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1296,7 +1296,6 @@ config MICROCODE bool "CPU microcode loading support" default y depends on CPU_SUP_AMD || CPU_SUP_INTEL - select FW_LOADER ---help--- 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, @@ -1318,7 +1317,6 @@ config MICROCODE_INTEL bool "Intel microcode loading support" depends on MICROCODE default MICROCODE - select FW_LOADER ---help--- This options enables microcode patch loading support for Intel processors. @@ -1330,7 +1328,6 @@ config MICROCODE_INTEL config MICROCODE_AMD bool "AMD microcode loading support" depends on MICROCODE - select FW_LOADER ---help--- If you select this option, microcode patch loading support for AMD processors will be enabled. diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 7019d4b2df0c..5524ea15b3df 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -145,7 +145,6 @@ extern struct builtin_fw __end_builtin_fw[]; bool get_builtin_firmware(struct cpio_data *cd, const char *name) { -#ifdef CONFIG_FW_LOADER struct 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) return true; } } -#endif return false; } -- Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
