diff options
| author | Markus Trippelsdorf | 2017-09-16 11:01:16 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2017-09-16 10:58:48 -0700 |
| commit | df85b2d767aad90fd2746f993fcd66dd322768f8 (patch) | |
| tree | c2a2ab7761d941750255218b0a08cbbec10f95ad /drivers/base | |
| parent | 7318413077a5141a50a753b1fab687b7907eef16 (diff) | |
firmware: Restore support for built-in firmware
Commit 5620a0d1aac ("firmware: delete in-kernel firmware") removed the
entire firmware directory. Unfortunately it thereby also removed the
support for built-in firmware.
This restores the ability to build firmware directly into the kernel by
pruning the original Makefile to the necessary minimum. The default for
EXTRA_FIRMWARE_DIR is now the standard directory /lib/firmware/.
Fixes: 5620a0d1aac ("firmware: delete in-kernel firmware")
Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Acked-by: Greg K-H <gregkh@linuxfoundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index f046d21de57d..1a5f6a157a57 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -140,13 +140,10 @@ config EXTRA_FIRMWARE config EXTRA_FIRMWARE_DIR string "Firmware blobs root directory" depends on EXTRA_FIRMWARE != "" - default "firmware" + default "/lib/firmware" help This option controls the directory in which the kernel build system looks for the firmware files listed in the EXTRA_FIRMWARE option. - The default is firmware/ in the kernel source tree, but by changing - this option you can point it elsewhere, such as /lib/firmware/ or - some other directory containing the firmware files. config FW_LOADER_USER_HELPER bool |