Commit c508c46e authored by Benjamin Gilbert's avatar Benjamin Gilbert Committed by Greg Kroah-Hartman
Browse files

firmware: Fix up docs referring to FIRMWARE_IN_KERNEL 



We've removed the option, so stop talking about it.

Signed-off-by: default avatarBenjamin Gilbert <benjamin.gilbert@coreos.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f55c733

Documentation/driver-api/firmware/built-in-fw.rst

+1 −6
Original line number Diff line number Diff line
@@ -11,13 +11,8 @@ options: 
  * CONFIG_EXTRA_FIRMWARE

  * CONFIG_EXTRA_FIRMWARE_DIR



This should not be confused with CONFIG_FIRMWARE_IN_KERNEL, this is for drivers

which enables firmware to be built as part of the kernel build process. This

option, CONFIG_FIRMWARE_IN_KERNEL, will build all firmware for all drivers

enabled which ship its firmware inside the Linux kernel source tree.



There are a few reasons why you might want to consider building your firmware

into the kernel with CONFIG_EXTRA_FIRMWARE though:

into the kernel with CONFIG_EXTRA_FIRMWARE:



* Speed

* Firmware is needed for accessing the boot device, and the user doesn't

Documentation/x86/microcode.txt

+2 −3
Original line number Diff line number Diff line
@@ -108,12 +108,11 @@ packages already put them there. 
====================



The loader supports also loading of a builtin microcode supplied through

the regular firmware builtin method CONFIG_FIRMWARE_IN_KERNEL. Only

64-bit is currently supported.

the regular builtin firmware method CONFIG_EXTRA_FIRMWARE. Only 64-bit is

currently supported.



Here's an example:



CONFIG_FIRMWARE_IN_KERNEL=y

CONFIG_EXTRA_FIRMWARE="intel-ucode/06-3a-09 amd-ucode/microcode_amd_fam15h.bin"

CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware"

arch/x86/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -1242,9 +1242,9 @@ config MICROCODE 
	  CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the

	  initrd for microcode blobs.



	  In addition, you can build-in the microcode into the kernel. For that you

	  need to enable FIRMWARE_IN_KERNEL and add the vendor-supplied microcode

	  to the CONFIG_EXTRA_FIRMWARE config option.

	  In addition, you can build the microcode into the kernel. For that you

	  need to add the vendor-supplied microcode to the CONFIG_EXTRA_FIRMWARE

	  config option.



config MICROCODE_INTEL

	bool "Intel microcode loading support"

CRA Git | Maintained and supported by SUSTech CRA and CCSE