summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 12:01:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 12:01:37 -0700
commit762b8291be6944bd891fbe2c8976a2b2e5bbc726 (patch)
tree4ce2572c050d473bd8dcde8bfbaad0ab830b1b1c /scripts
parentc6af5e9f8a57467df2e55e428316a43480174521 (diff)
parent7dcf2a9fced59e58e4694cdcf15850c01fdba89b (diff)
downloadlinux-stable-762b8291be6944bd891fbe2c8976a2b2e5bbc726.tar.gz
linux-stable-762b8291be6944bd891fbe2c8976a2b2e5bbc726.tar.bz2
linux-stable-762b8291be6944bd891fbe2c8976a2b2e5bbc726.zip
Merge git://git.infradead.org/~dwmw2/random-2.6
* git://git.infradead.org/~dwmw2/random-2.6: remove dummy asm/kvm.h files firmware: create firmware binaries during 'make modules'.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.fwinst10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
index c972c0f54ce0..f63a663de158 100644
--- a/scripts/Makefile.fwinst
+++ b/scripts/Makefile.fwinst
@@ -17,14 +17,15 @@ include $(srctree)/$(obj)/Makefile
include scripts/Makefile.host
-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-m))
-
+mod-fw := $(fw-shipped-m)
# If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the
# firmware for in-kernel drivers too.
ifndef CONFIG_FIRMWARE_IN_KERNEL
-mod-fw += $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-y))
+mod-fw += $(fw-shipped-y)
endif
+installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
+
installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
@@ -49,7 +50,8 @@ PHONY += __fw_install __fw_modinst FORCE
.PHONY: $(PHONY)
__fw_install: $(installed-fw)
-__fw_modinst: $(mod-fw)
+__fw_modinst: $(installed-mod-fw)
+__fw_modbuild: $(addprefix $(obj)/,$(mod-fw))
FORCE: