Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0946b2fb authored by Robin H. Johnson's avatar Robin H. Johnson Committed by Greg Kroah-Hartman
Browse files

firmware: cleanup FIRMWARE_IN_KERNEL message 



The help for FIRMWARE_IN_KERNEL still references the firmware_install
command that was recently removed by commit 5620a0d1 ("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: 5620a0d1 ("firmware: delete in-kernel firmware").
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: stable <stable@vger.kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarRobin H. Johnson <robbat2@gentoo.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a244727

drivers/base/Kconfig

+13 −12
Original line number Diff line number Diff line
@@ -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.