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'.
amtssp · Jul 25, 2008 · 762b829 · 762b829
2 parents c6af5e9 + 7dcf2a9
commit 762b829
Show file tree

Hide file tree

Showing 24 changed files with 11 additions and 109 deletions.
diff --git a/Makefile b/Makefile
@@ -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/include/asm-alpha/kvm.h b/include/asm-alpha/kvm.h
diff --git a/include/asm-arm/kvm.h b/include/asm-arm/kvm.h
diff --git a/include/asm-avr32/kvm.h b/include/asm-avr32/kvm.h
diff --git a/include/asm-blackfin/kvm.h b/include/asm-blackfin/kvm.h
diff --git a/include/asm-cris/kvm.h b/include/asm-cris/kvm.h
diff --git a/include/asm-frv/kvm.h b/include/asm-frv/kvm.h
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
@@ -1,4 +1,6 @@
+ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
 header-y  += kvm.h
+endif
 
 ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
 unifdef-y += a.out.h

diff --git a/include/asm-h8300/kvm.h b/include/asm-h8300/kvm.h
diff --git a/include/asm-m32r/kvm.h b/include/asm-m32r/kvm.h
diff --git a/include/asm-m68k/kvm.h b/include/asm-m68k/kvm.h
diff --git a/include/asm-m68knommu/kvm.h b/include/asm-m68knommu/kvm.h
diff --git a/include/asm-mips/kvm.h b/include/asm-mips/kvm.h
diff --git a/include/asm-mn10300/kvm.h b/include/asm-mn10300/kvm.h
diff --git a/include/asm-parisc/kvm.h b/include/asm-parisc/kvm.h
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild
@@ -7,7 +7,6 @@ header-y += tape390.h
 header-y += ucontext.h
 header-y += vtoc.h
 header-y += zcrypt.h
-header-y += kvm.h
 header-y += chsc.h
 
 unifdef-y += cmb.h

diff --git a/include/asm-sh/kvm.h b/include/asm-sh/kvm.h
diff --git a/include/asm-sparc/kvm.h b/include/asm-sparc/kvm.h
diff --git a/include/asm-sparc64/kvm.h b/include/asm-sparc64/kvm.h
diff --git a/include/asm-um/kvm.h b/include/asm-um/kvm.h
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
@@ -3,7 +3,6 @@ include include/asm-generic/Kbuild.asm
 header-y += boot.h
 header-y += bootparam.h
 header-y += debugreg.h
-header-y += kvm.h
 header-y += ldt.h
 header-y += msr-index.h
 header-y += prctl.h

diff --git a/include/asm-xtensa/kvm.h b/include/asm-xtensa/kvm.h
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
@@ -255,7 +255,9 @@ unifdef-y += kd.h
 unifdef-y += kernelcapi.h
 unifdef-y += kernel.h
 unifdef-y += keyboard.h
+ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
 unifdef-y += kvm.h
+endif
 unifdef-y += llc.h
 unifdef-y += loop.h
 unifdef-y += lp.h

diff --git 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: