diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 14:17:19 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 14:26:30 -0400 |
| commit | 44463f7dd6c8039904333e4374e5c6e9ad83006f (patch) | |
| tree | c6fb967b9723ae3534f115cbe4fc4b9f4aeb7858 | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
| download | op-kernel-dev-44463f7dd6c8039904333e4374e5c6e9ad83006f.zip op-kernel-dev-44463f7dd6c8039904333e4374e5c6e9ad83006f.tar.gz | |
firmware: create firmware binaries during 'make modules'.
This means that we no longer need write access to the source tree while
doing 'make modules_install'.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | scripts/Makefile.fwinst | 10 |
2 files changed, 7 insertions, 4 deletions
@@ -1061,6 +1061,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order @echo ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild # Target to prepare building external modules diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst index c972c0f..f63a663 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: |
