firmware: cleanup FIRMWARE_IN_KERNEL message
The help for FIRMWARE_IN_KERNEL still references the firmware_install command that was recently removed by commit5620a0d1aa("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:5620a0d1aa("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: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
		
							parent
							
								
									5a244727f4
								
							
						
					
					
						commit
						0946b2fb38
					
				| @ -91,22 +91,23 @@ config FIRMWARE_IN_KERNEL | |||||||
| 	depends on FW_LOADER | 	depends on FW_LOADER | ||||||
| 	default y | 	default y | ||||||
| 	help | 	help | ||||||
| 	  The kernel source tree includes a number of firmware 'blobs' | 	  Various drivers in the kernel source tree may require firmware, | ||||||
| 	  that are used by various drivers. The recommended way to | 	  which is generally available in your distribution's linux-firmware | ||||||
| 	  use these is to run "make firmware_install", which, after | 	  package. | ||||||
| 	  converting ihex files to binary, copies all of the needed | 
 | ||||||
| 	  binary files in firmware/ to /lib/firmware/ on your system so | 	  The linux-firmware package should install firmware into | ||||||
| 	  that they can be loaded by userspace helpers on request. | 	  /lib/firmware/ on your system, so they can 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 | 	  specified by EXTRA_FIRMWARE into the kernel directly, where | ||||||
| 	  them without having to call out to userspace. This may be | 	  request_firmware() will find them without having to call out to | ||||||
| 	  useful if your root file system requires a device that uses | 	  userspace. This may be useful if your root file system requires a | ||||||
| 	  such firmware and do not wish to use an initrd. | 	  device that uses such firmware and you 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 that uses request_firmware() and ships its | 	  every driver that uses request_firmware(), which avoids a | ||||||
| 	  firmware in the kernel source tree, which avoids a |  | ||||||
| 	  proliferation 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. | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user