summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2008-06-25 16:56:07 +0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-07-10 17:47:20 +0400
commitd172e7f5c67f2d41f453c7aa83d3bdb405ef8ba5 (patch)
tree43d926fd28d710d75a9364430af24ca243b0b122 /firmware
parent4d2acfbfdf68257e846aaa355edd10fc35ba0feb (diff)
downloadlinux-d172e7f5c67f2d41f453c7aa83d3bdb405ef8ba5.tar.xz
firmware: Add CONFIG_FIRMWARE_IN_KERNEL option.
This will control whether we build firmware into the kernel image for _every_ driver which we convert to request_firmware(), to avoid a proliferation of 'CONFIG_XXX_FIRMWARE' options for each one. Default to 'y' for now, which is the wrong thing to do but people seem to be insisting on it and refusing to even review patches until it's done. And it does preserve the existing behaviour for built-in drivers. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'firmware')
-rw-r--r--firmware/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index e69461f9362b..cc25f5600d5d 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -9,6 +9,11 @@ fwabs := $(addprefix $(srctree)/,$(filter-out /%,$(fwdir)))$(filter /%,$(fwdir))
fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+# If CONFIG_FIRMWARE_IN_KERNEL is not set, then don't include any firmware
+ifneq ($(CONFIG_FIRMWARE_IN_KERNEL),y)
+fw-shipped-y :=
+endif
+
firmware-y := $(fw-external-y) $(fw-shipped-y)
firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(firmware-y) $(fw-shipped-))))