提交 113647a2 编写于 作者: M matt mooney 提交者: Greg Kroah-Hartman

driver-core: Kconfig grammar corrections in firmware configuration

Fix some grammatical errors and reword a few sentences.
Signed-off-by: Nmatt mooney <mfm@muteddisk.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 b6badddc
...@@ -65,17 +65,17 @@ config PREVENT_FIRMWARE_BUILD ...@@ -65,17 +65,17 @@ config PREVENT_FIRMWARE_BUILD
default y default y
help help
Say yes to avoid building firmware. Firmware is usually shipped Say yes to avoid building firmware. Firmware is usually shipped
with the driver, and only when updating the firmware a rebuild with the driver and only when updating the firmware should a
should be made. rebuild be made.
If unsure say Y here. If unsure, say Y here.
config FW_LOADER config FW_LOADER
tristate "Userspace firmware loading support" if EXPERT tristate "Userspace firmware loading support" if EXPERT
default y default y
---help--- ---help---
This option is provided for the case where no in-kernel-tree modules This option is provided for the case where none of the in-tree modules
require userspace firmware loading support, but a module built outside require userspace firmware loading support, but a module built
the kernel tree does. out-of-tree does.
config FIRMWARE_IN_KERNEL config FIRMWARE_IN_KERNEL
bool "Include in-kernel firmware blobs in kernel binary" bool "Include in-kernel firmware blobs in kernel binary"
...@@ -83,22 +83,22 @@ config FIRMWARE_IN_KERNEL ...@@ -83,22 +83,22 @@ config FIRMWARE_IN_KERNEL
default y default y
help help
The kernel source tree includes a number of firmware 'blobs' The kernel source tree includes a number of firmware 'blobs'
which are used by various drivers. The recommended way to that are used by various drivers. The recommended way to
use these is to run "make firmware_install" and to copy the use these is to run "make firmware_install" and to copy the
resulting binary files created in usr/lib/firmware directory resulting binary files created in usr/lib/firmware/ of the
of the kernel tree to the /lib/firmware on your system so kernel tree to /lib/firmware/ on your system so that they can
that they can be loaded by userspace helpers on request. be loaded by userspace helpers on request.
Enabling this option will build each required firmware blob Enabling this option will build each required firmware blob
into the kernel directly, where request_firmware() will find into the kernel directly, where request_firmware() will find
them without having to call out to userspace. This may be them without having to call out to userspace. This may be
useful if your root file system requires a device which uses useful if your root file system requires a device that uses
such firmware, and do not wish to use an initrd. such firmware and do not wish to use an initrd.
This single option controls the inclusion of firmware for This single option controls the inclusion of firmware for
every driver which uses request_firmware() and ships its every driver that uses request_firmware() and ships its
firmware in the kernel source tree, to avoid a proliferation firmware in the kernel source tree, which avoids a
of 'Include firmware for xxx device' options. proliferation of 'Include firmware for xxx device' options.
Say 'N' and let firmware be loaded from userspace. Say 'N' and let firmware be loaded from userspace.
...@@ -106,27 +106,27 @@ config EXTRA_FIRMWARE ...@@ -106,27 +106,27 @@ config EXTRA_FIRMWARE
string "External firmware blobs to build into the kernel binary" string "External firmware blobs to build into the kernel binary"
depends on FW_LOADER depends on FW_LOADER
help help
This option allows firmware to be built into the kernel, for the This option allows firmware to be built into the kernel for the case
cases where the user either cannot or doesn't want to provide it from where the user either cannot or doesn't want to provide it from
userspace at runtime (for example, when the firmware in question is userspace at runtime (for example, when the firmware in question is
required for accessing the boot device, and the user doesn't want to required for accessing the boot device, and the user doesn't want to
use an initrd). use an initrd).
This option is a string, and takes the (space-separated) names of the This option is a string and takes the (space-separated) names of the
firmware files -- the same names which appear in MODULE_FIRMWARE() firmware files -- the same names that appear in MODULE_FIRMWARE()
and request_firmware() in the source. These files should exist under and request_firmware() in the source. These files should exist under
the directory specified by the EXTRA_FIRMWARE_DIR option, which is the directory specified by the EXTRA_FIRMWARE_DIR option, which is
by default the firmware/ subdirectory of the kernel source tree. by default the firmware subdirectory of the kernel source tree.
So, for example, you might set CONFIG_EXTRA_FIRMWARE="usb8388.bin", For example, you might set CONFIG_EXTRA_FIRMWARE="usb8388.bin", copy
copy the usb8388.bin file into the firmware/ directory, and build the the usb8388.bin file into the firmware directory, and build the kernel.
kernel. Then any request_firmware("usb8388.bin") will be Then any request_firmware("usb8388.bin") will be satisfied internally
satisfied internally without needing to call out to userspace. without needing to call out to userspace.
WARNING: If you include additional firmware files into your binary WARNING: If you include additional firmware files into your binary
kernel image which are not available under the terms of the GPL, kernel image that are not available under the terms of the GPL,
then it may be a violation of the GPL to distribute the resulting then it may be a violation of the GPL to distribute the resulting
image -- since it combines both GPL and non-GPL work. You should image since it combines both GPL and non-GPL work. You should
consult a lawyer of your own before distributing such an image. consult a lawyer of your own before distributing such an image.
config EXTRA_FIRMWARE_DIR config EXTRA_FIRMWARE_DIR
...@@ -136,10 +136,9 @@ config EXTRA_FIRMWARE_DIR ...@@ -136,10 +136,9 @@ config EXTRA_FIRMWARE_DIR
help help
This option controls the directory in which the kernel build system This option controls the directory in which the kernel build system
looks for the firmware files listed in the EXTRA_FIRMWARE option. looks for the firmware files listed in the EXTRA_FIRMWARE option.
The default is the firmware/ directory in the kernel source tree, The default is firmware/ in the kernel source tree, but by changing
but by changing this option you can point it elsewhere, such as this option you can point it elsewhere, such as /lib/firmware/ or
the /lib/firmware/ directory or another separate directory some other directory containing the firmware files.
containing firmware files.
config DEBUG_DRIVER config DEBUG_DRIVER
bool "Driver Core verbose debug messages" bool "Driver Core verbose debug messages"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册