firmware: Restore support for built-in firmware

PATCH In review Markus Trippelsdorf 2 participants 2 messages Sep 16, 2017

Subsystems (2)

Kbuild Driver core

lore

Share & tools

lore

Markus Trippelsdorf

author

2017-09-16 09:01 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 Makefile             |  2 +-
 drivers/base/Kconfig |  5 +----
 firmware/.gitignore  |  6 +++++
 firmware/Makefile    | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 firmware/.gitignore
 create mode 100644 firmware/Makefile

Makefile +1 -1

index 7e2ca4971a39..9f86816c41fd 100644
@@ -562,7 +562,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
 
 # Objects we will link into vmlinux / subdirs we need to visit
 init-y		:= init/
-drivers-y	:= drivers/ sound/
+drivers-y	:= drivers/ sound/ firmware/
 net-y		:= net/
 libs-y		:= lib/
 core-y		:= usr/

drivers/base/Kconfig +1 -4

index f046d21de57d..1a5f6a157a57 100644
@@ -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

firmware/.gitignore new file +6 -0

new file mode 100644
index 000000000000..d9c69017bc9a
@@ -0,0 +1,6 @@
+*.gen.S
+*.fw
+*.bin
+*.csp
+*.dsp
+ihex2fw

firmware/Makefile new file +63 -0

63 lines not on this page · raw message

Signature · 1 line

Markus

Greg KH

maintainer

2017-09-16 16:57 UTC #1 lore raw

Quoted 3 lines · Markus Trippelsdorf

Commit 5620a0d1aac ("firmware: delete in-kernel firmware") removed the entire firmware directory. Unfortunately it thereby also removed the support for built-in firmware.

The goal was to delete the in-kernel firmware, why do you want to add it back?

Quoted 3 lines

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/.

But what firmware is this fixing the build for?

As I asked in the other email, I don't understand the problem here, but it's early, and the Plumbers closing party lasted really late...

thanks,

greg k-h