summaryrefslogtreecommitdiffstats
path: root/Documentation/x86
diff options
context:
space:
mode:
authorBenjamin Gilbert <benjamin.gilbert@coreos.com>2018-01-24 03:06:32 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-25 12:46:30 +0100
commitc508c46e6e3aef7762a214a09cf826711f1e2772 (patch)
tree85ee28d9542be743c00273b4c254f22f932c7234 /Documentation/x86
parentfirmware: Drop FIRMWARE_IN_KERNEL Kconfig option (diff)
downloadlinux-c508c46e6e3aef7762a214a09cf826711f1e2772.tar.xz
linux-c508c46e6e3aef7762a214a09cf826711f1e2772.zip
firmware: Fix up docs referring to FIRMWARE_IN_KERNEL
We've removed the option, so stop talking about it. Signed-off-by: Benjamin Gilbert <benjamin.gilbert@coreos.com> Acked-by: Ingo 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/x86')
-rw-r--r--Documentation/x86/microcode.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/x86/microcode.txt b/Documentation/x86/microcode.txt
index f57e1b45e628..79fdb4a8148a 100644
--- a/Documentation/x86/microcode.txt
+++ b/Documentation/x86/microcode.txt
@@ -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"