summaryrefslogtreecommitdiff
path: root/drivers/base/Kconfig
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-12-19 14:37:24 +0300
committerDave Airlie <airlied@redhat.com>2017-12-19 14:37:24 +0300
commit6b7dcb536e3535444c39286333f10d06d2f44fb5 (patch)
tree6a4c1e30e5900626e506d46b100d21a2fcd59003 /drivers/base/Kconfig
parenta942b3c2cddc4378482a427845d15c78eb50f4d4 (diff)
parent1291a0d5049dbc06baaaf66a9ff3f53db493b19b (diff)
downloadlinux-6b7dcb536e3535444c39286333f10d06d2f44fb5.tar.xz
BackMerge tag 'v4.15-rc4' into drm-next
Linux 4.15-rc4 Daniel requested it to fix some messy conflicts.
Diffstat (limited to 'drivers/base/Kconfig')
-rw-r--r--drivers/base/Kconfig25
1 files changed, 13 insertions, 12 deletions
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 2c3cab066871..1e71d70cdf3f 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -91,22 +91,23 @@ config FIRMWARE_IN_KERNEL
depends on FW_LOADER
default y
help
- The kernel source tree includes a number of firmware 'blobs'
- that are used by various drivers. The recommended way to
- use these is to run "make firmware_install", which, after
- converting ihex files to binary, copies all of the needed
- binary files in firmware/ to /lib/firmware/ on your system so
- that they can be loaded by userspace helpers on request.
+ Various drivers in the kernel source tree may require firmware,
+ which is generally available in your distribution's linux-firmware
+ package.
+
+ The linux-firmware package should install firmware into
+ /lib/firmware/ on your system, so they can be loaded by userspace
+ helpers on request.
Enabling this option will build each required firmware blob
- into the kernel directly, where request_firmware() will find
- them without having to call out to userspace. This may be
- useful if your root file system requires a device that uses
- such firmware and do not wish to use an initrd.
+ specified by EXTRA_FIRMWARE into the kernel directly, where
+ request_firmware() will find them without having to call out to
+ userspace. This may be useful if your root file system requires a
+ device that uses such firmware and you do not wish to use an
+ initrd.
This single option controls the inclusion of firmware for
- every driver that uses request_firmware() and ships its
- firmware in the kernel source tree, which avoids a
+ every driver that uses request_firmware(), which avoids a
proliferation of 'Include firmware for xxx device' options.
Say 'N' and let firmware be loaded from userspace.