Skip to content

Commit 0946b2f

Browse files
robbat2gregkh
authored andcommitted
firmware: cleanup FIRMWARE_IN_KERNEL message
The help for FIRMWARE_IN_KERNEL still references the firmware_install command that was recently removed by commit 5620a0d ("firmware: delete in-kernel firmware"). Clean up the message to direct the user to their distribution's linux-firmware package, and remove any reference to firmware being included in the kernel source tree. Fixes: 5620a0d ("firmware: delete in-kernel firmware"). Cc: Masahiro Yamada <[email protected]> Cc: stable <[email protected]> Cc: David Woodhouse <[email protected]> Signed-off-by: Robin H. Johnson <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5a24472 commit 0946b2f

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

drivers/base/Kconfig

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,23 @@ config FIRMWARE_IN_KERNEL
9191
depends on FW_LOADER
9292
default y
9393
help
94-
The kernel source tree includes a number of firmware 'blobs'
95-
that are used by various drivers. The recommended way to
96-
use these is to run "make firmware_install", which, after
97-
converting ihex files to binary, copies all of the needed
98-
binary files in firmware/ to /lib/firmware/ on your system so
99-
that they can be loaded by userspace helpers on request.
94+
Various drivers in the kernel source tree may require firmware,
95+
which is generally available in your distribution's linux-firmware
96+
package.
97+
98+
The linux-firmware package should install firmware into
99+
/lib/firmware/ on your system, so they can be loaded by userspace
100+
helpers on request.
100101

101102
Enabling this option will build each required firmware blob
102-
into the kernel directly, where request_firmware() will find
103-
them without having to call out to userspace. This may be
104-
useful if your root file system requires a device that uses
105-
such firmware and do not wish to use an initrd.
103+
specified by EXTRA_FIRMWARE into the kernel directly, where
104+
request_firmware() will find them without having to call out to
105+
userspace. This may be useful if your root file system requires a
106+
device that uses such firmware and you do not wish to use an
107+
initrd.
106108

107109
This single option controls the inclusion of firmware for
108-
every driver that uses request_firmware() and ships its
109-
firmware in the kernel source tree, which avoids a
110+
every driver that uses request_firmware(), which avoids a
110111
proliferation of 'Include firmware for xxx device' options.
111112

112113
Say 'N' and let firmware be loaded from userspace.

0 commit comments

Comments
 (0)