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'.
author: Linus Torvalds <torvalds@linux-foundation.org> 2008-07-25 15:01:37 -0400
committer: Linus Torvalds <torvalds@linux-foundation.org> 2008-07-25 15:01:37 -0400
commit: 762b8291be6944bd891fbe2c8976a2b2e5bbc726 (patch)
tree: 4ce2572c050d473bd8dcde8bfbaad0ab830b1b1c
parent: c6af5e9f8a57467df2e55e428316a43480174521 (diff)
parent: 7dcf2a9fced59e58e4694cdcf15850c01fdba89b (diff)
24 files changed, 11 insertions, 109 deletions
diff --git a/Makefile b/Makefile
index 4bcd1cf90cb1..3cad7db5eba7 100644
--- 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
deleted file mode 100644
index b9daec429689..000000000000
--- a/include/asm-alpha/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_ALPHA_H
-#define __LINUX_KVM_ALPHA_H
-/* alpha does not support KVM */
-#endif
diff --git a/include/asm-arm/kvm.h b/include/asm-arm/kvm.h
deleted file mode 100644
index cb3c08cbcb9e..000000000000
--- a/include/asm-arm/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_ARM_H
-#define __LINUX_KVM_ARM_H
-/* arm does not support KVM */
-#endif
diff --git a/include/asm-avr32/kvm.h b/include/asm-avr32/kvm.h
deleted file mode 100644
index 8c5777020e2c..000000000000
--- a/include/asm-avr32/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_AVR32_H
-#define __LINUX_KVM_AVR32_H
-/* avr32 does not support KVM */
-#endif
diff --git a/include/asm-blackfin/kvm.h b/include/asm-blackfin/kvm.h
deleted file mode 100644
index e3477d77c014..000000000000
--- a/include/asm-blackfin/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_BLACKFIN_H
-#define __LINUX_KVM_BLACKFIN_H
-/* blackfin does not support KVM */
-#endif
diff --git a/include/asm-cris/kvm.h b/include/asm-cris/kvm.h
deleted file mode 100644
index c860f51149f0..000000000000
--- a/include/asm-cris/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_CRIS_H
-#define __LINUX_KVM_CRIS_H
-/* cris does not support KVM */
-#endif
diff --git a/include/asm-frv/kvm.h b/include/asm-frv/kvm.h
deleted file mode 100644
index 9c8a4f08d0a9..000000000000
--- a/include/asm-frv/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_FRV_H
-#define __LINUX_KVM_FRV_H
-/* frv does not support KVM */
-#endif
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index 7cd25b8e7c9a..1170dc60e638 100644
--- 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
deleted file mode 100644
index bdbed7b987e1..000000000000
--- a/include/asm-h8300/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_H8300_H
-#define __LINUX_KVM_H8300_H
-/* h8300 does not support KVM */
-#endif
diff --git a/include/asm-m32r/kvm.h b/include/asm-m32r/kvm.h
deleted file mode 100644
index 99a40515b77e..000000000000
--- a/include/asm-m32r/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_M32R_H
-#define __LINUX_KVM_M32R_H
-/* m32r does not support KVM */
-#endif
diff --git a/include/asm-m68k/kvm.h b/include/asm-m68k/kvm.h
deleted file mode 100644
index 7ed27fce5240..000000000000
--- a/include/asm-m68k/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_M68K_H
-#define __LINUX_KVM_M68K_H
-/* m68k does not support KVM */
-#endif
diff --git a/include/asm-m68knommu/kvm.h b/include/asm-m68knommu/kvm.h
deleted file mode 100644
index b49d4258dabb..000000000000
--- a/include/asm-m68knommu/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_M68KNOMMU_H
-#define __LINUX_KVM_M68KNOMMU_H
-/* m68knommu does not support KVM */
-#endif
diff --git a/include/asm-mips/kvm.h b/include/asm-mips/kvm.h
deleted file mode 100644
index 093a5b7f796b..000000000000
--- a/include/asm-mips/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_MIPS_H
-#define __LINUX_KVM_MIPS_H
-/* mips does not support KVM */
-#endif
diff --git a/include/asm-mn10300/kvm.h b/include/asm-mn10300/kvm.h
deleted file mode 100644
index f6b609ff4a57..000000000000
--- a/include/asm-mn10300/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_MN10300_H
-#define __LINUX_KVM_MN10300_H
-/* mn10300 does not support KVM */
-#endif
diff --git a/include/asm-parisc/kvm.h b/include/asm-parisc/kvm.h
deleted file mode 100644
index 00cc45812547..000000000000
--- a/include/asm-parisc/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_PARISC_H
-#define __LINUX_KVM_PARISC_H
-/* parisc does not support KVM */
-#endif
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild
index bb5e9edb9825..63a23415fba6 100644
--- 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
deleted file mode 100644
index 6af51dbab2d0..000000000000
--- a/include/asm-sh/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_SH_H
-#define __LINUX_KVM_SH_H
-/* sh does not support KVM */
-#endif
diff --git a/include/asm-sparc/kvm.h b/include/asm-sparc/kvm.h
deleted file mode 100644
index 2e5478da3819..000000000000
--- a/include/asm-sparc/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_SPARC_H
-#define __LINUX_KVM_SPARC_H
-/* sparc does not support KVM */
-#endif
diff --git a/include/asm-sparc64/kvm.h b/include/asm-sparc64/kvm.h
deleted file mode 100644
index 53564ad86b15..000000000000
--- a/include/asm-sparc64/kvm.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/kvm.h>
diff --git a/include/asm-um/kvm.h b/include/asm-um/kvm.h
deleted file mode 100644
index 66aa77094551..000000000000
--- a/include/asm-um/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_UM_H
-#define __LINUX_KVM_UM_H
-/* um does not support KVM */
-#endif
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
index 00473f7dd819..4a8e80cdcfa5 100644
--- 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
deleted file mode 100644
index bda4e331e98c..000000000000
--- a/include/asm-xtensa/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_XTENSA_H
-#define __LINUX_KVM_XTENSA_H
-/* xtensa does not support KVM */
-#endif
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index a18008ce7aba..4c4142c5aa6e 100644
--- 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
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:
author	Linus Torvalds <torvalds@linux-foundation.org>	2008-07-25 15:01:37 -0400
committer	Linus Torvalds <torvalds@linux-foundation.org>	2008-07-25 15:01:37 -0400
commit	762b8291be6944bd891fbe2c8976a2b2e5bbc726 (patch)
tree	4ce2572c050d473bd8dcde8bfbaad0ab830b1b1c
parent	c6af5e9f8a57467df2e55e428316a43480174521 (diff)
parent	7dcf2a9fced59e58e4694cdcf15850c01fdba89b (diff)

diff --git a/Makefile b/Makefile index 4bcd1cf90cb1..3cad7db5eba7 100644 --- a/Makefile +++ b/Makefile
@@ -1061,6 +1061,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
1061	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order	1061	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
1062	@echo ' Building modules, stage 2.';	1062	@echo ' Building modules, stage 2.';
1063	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost	1063	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
		1064	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
1064		1065
1065		1066
1066	# Target to prepare building external modules	1067	# Target to prepare building external modules


diff --git a/include/asm-alpha/kvm.h b/include/asm-alpha/kvm.h deleted file mode 100644 index b9daec429689..000000000000 --- a/include/asm-alpha/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_ALPHA_H
2	#define __LINUX_KVM_ALPHA_H
3
4	/* alpha does not support KVM */
5
6	#endif


diff --git a/include/asm-arm/kvm.h b/include/asm-arm/kvm.h deleted file mode 100644 index cb3c08cbcb9e..000000000000 --- a/include/asm-arm/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_ARM_H
2	#define __LINUX_KVM_ARM_H
3
4	/* arm does not support KVM */
5
6	#endif


diff --git a/include/asm-avr32/kvm.h b/include/asm-avr32/kvm.h deleted file mode 100644 index 8c5777020e2c..000000000000 --- a/include/asm-avr32/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_AVR32_H
2	#define __LINUX_KVM_AVR32_H
3
4	/* avr32 does not support KVM */
5
6	#endif


diff --git a/include/asm-blackfin/kvm.h b/include/asm-blackfin/kvm.h deleted file mode 100644 index e3477d77c014..000000000000 --- a/include/asm-blackfin/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_BLACKFIN_H
2	#define __LINUX_KVM_BLACKFIN_H
3
4	/* blackfin does not support KVM */
5
6	#endif


diff --git a/include/asm-cris/kvm.h b/include/asm-cris/kvm.h deleted file mode 100644 index c860f51149f0..000000000000 --- a/include/asm-cris/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_CRIS_H
2	#define __LINUX_KVM_CRIS_H
3
4	/* cris does not support KVM */
5
6	#endif


diff --git a/include/asm-frv/kvm.h b/include/asm-frv/kvm.h deleted file mode 100644 index 9c8a4f08d0a9..000000000000 --- a/include/asm-frv/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_FRV_H
2	#define __LINUX_KVM_FRV_H
3
4	/* frv does not support KVM */
5
6	#endif


diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm index 7cd25b8e7c9a..1170dc60e638 100644 --- a/include/asm-generic/Kbuild.asm +++ b/include/asm-generic/Kbuild.asm
@@ -1,4 +1,6 @@
		1	ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
1	header-y += kvm.h	2	header-y += kvm.h
		3	endif
2		4
3	ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)	5	ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
4	unifdef-y += a.out.h	6	unifdef-y += a.out.h


diff --git a/include/asm-h8300/kvm.h b/include/asm-h8300/kvm.h deleted file mode 100644 index bdbed7b987e1..000000000000 --- a/include/asm-h8300/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_H8300_H
2	#define __LINUX_KVM_H8300_H
3
4	/* h8300 does not support KVM */
5
6	#endif


diff --git a/include/asm-m32r/kvm.h b/include/asm-m32r/kvm.h deleted file mode 100644 index 99a40515b77e..000000000000 --- a/include/asm-m32r/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_M32R_H
2	#define __LINUX_KVM_M32R_H
3
4	/* m32r does not support KVM */
5
6	#endif


diff --git a/include/asm-m68k/kvm.h b/include/asm-m68k/kvm.h deleted file mode 100644 index 7ed27fce5240..000000000000 --- a/include/asm-m68k/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_M68K_H
2	#define __LINUX_KVM_M68K_H
3
4	/* m68k does not support KVM */
5
6	#endif


diff --git a/include/asm-m68knommu/kvm.h b/include/asm-m68knommu/kvm.h deleted file mode 100644 index b49d4258dabb..000000000000 --- a/include/asm-m68knommu/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_M68KNOMMU_H
2	#define __LINUX_KVM_M68KNOMMU_H
3
4	/* m68knommu does not support KVM */
5
6	#endif


diff --git a/include/asm-mips/kvm.h b/include/asm-mips/kvm.h deleted file mode 100644 index 093a5b7f796b..000000000000 --- a/include/asm-mips/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_MIPS_H
2	#define __LINUX_KVM_MIPS_H
3
4	/* mips does not support KVM */
5
6	#endif


diff --git a/include/asm-mn10300/kvm.h b/include/asm-mn10300/kvm.h deleted file mode 100644 index f6b609ff4a57..000000000000 --- a/include/asm-mn10300/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_MN10300_H
2	#define __LINUX_KVM_MN10300_H
3
4	/* mn10300 does not support KVM */
5
6	#endif


diff --git a/include/asm-parisc/kvm.h b/include/asm-parisc/kvm.h deleted file mode 100644 index 00cc45812547..000000000000 --- a/include/asm-parisc/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_PARISC_H
2	#define __LINUX_KVM_PARISC_H
3
4	/* parisc does not support KVM */
5
6	#endif


diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild index bb5e9edb9825..63a23415fba6 100644 --- a/include/asm-s390/Kbuild +++ b/include/asm-s390/Kbuild
@@ -7,7 +7,6 @@ header-y += tape390.h
7	header-y += ucontext.h	7	header-y += ucontext.h
8	header-y += vtoc.h	8	header-y += vtoc.h
9	header-y += zcrypt.h	9	header-y += zcrypt.h
10	header-y += kvm.h
11	header-y += chsc.h	10	header-y += chsc.h
12		11
13	unifdef-y += cmb.h	12	unifdef-y += cmb.h


diff --git a/include/asm-sh/kvm.h b/include/asm-sh/kvm.h deleted file mode 100644 index 6af51dbab2d0..000000000000 --- a/include/asm-sh/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_SH_H
2	#define __LINUX_KVM_SH_H
3
4	/* sh does not support KVM */
5
6	#endif


diff --git a/include/asm-sparc/kvm.h b/include/asm-sparc/kvm.h deleted file mode 100644 index 2e5478da3819..000000000000 --- a/include/asm-sparc/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_SPARC_H
2	#define __LINUX_KVM_SPARC_H
3
4	/* sparc does not support KVM */
5
6	#endif


diff --git a/include/asm-sparc64/kvm.h b/include/asm-sparc64/kvm.h deleted file mode 100644 index 53564ad86b15..000000000000 --- a/include/asm-sparc64/kvm.h +++ /dev/null
@@ -1 +0,0 @@
1	#include <asm-sparc/kvm.h>


diff --git a/include/asm-um/kvm.h b/include/asm-um/kvm.h deleted file mode 100644 index 66aa77094551..000000000000 --- a/include/asm-um/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_UM_H
2	#define __LINUX_KVM_UM_H
3
4	/* um does not support KVM */
5
6	#endif


diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild index 00473f7dd819..4a8e80cdcfa5 100644 --- a/include/asm-x86/Kbuild +++ b/include/asm-x86/Kbuild
@@ -3,7 +3,6 @@ include include/asm-generic/Kbuild.asm
3	header-y += boot.h	3	header-y += boot.h
4	header-y += bootparam.h	4	header-y += bootparam.h
5	header-y += debugreg.h	5	header-y += debugreg.h
6	header-y += kvm.h
7	header-y += ldt.h	6	header-y += ldt.h
8	header-y += msr-index.h	7	header-y += msr-index.h
9	header-y += prctl.h	8	header-y += prctl.h


diff --git a/include/asm-xtensa/kvm.h b/include/asm-xtensa/kvm.h deleted file mode 100644 index bda4e331e98c..000000000000 --- a/include/asm-xtensa/kvm.h +++ /dev/null
@@ -1,6 +0,0 @@
1	#ifndef __LINUX_KVM_XTENSA_H
2	#define __LINUX_KVM_XTENSA_H
3
4	/* xtensa does not support KVM */
5
6	#endif


diff --git a/include/linux/Kbuild b/include/linux/Kbuild index a18008ce7aba..4c4142c5aa6e 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild
@@ -255,7 +255,9 @@ unifdef-y += kd.h
255	unifdef-y += kernelcapi.h	255	unifdef-y += kernelcapi.h
256	unifdef-y += kernel.h	256	unifdef-y += kernel.h
257	unifdef-y += keyboard.h	257	unifdef-y += keyboard.h
		258	ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
258	unifdef-y += kvm.h	259	unifdef-y += kvm.h
		260	endif
259	unifdef-y += llc.h	261	unifdef-y += llc.h
260	unifdef-y += loop.h	262	unifdef-y += loop.h
261	unifdef-y += lp.h	263	unifdef-y += lp.h


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
17		17
18	include scripts/Makefile.host	18	include scripts/Makefile.host
19		19
20	mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-m))	20	mod-fw := $(fw-shipped-m)
21
22	# If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the	21	# If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the
23	# firmware for in-kernel drivers too.	22	# firmware for in-kernel drivers too.
24	ifndef CONFIG_FIRMWARE_IN_KERNEL	23	ifndef CONFIG_FIRMWARE_IN_KERNEL
25	mod-fw += $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-y))	24	mod-fw += $(fw-shipped-y)
26	endif	25	endif
27		26
		27	installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
		28
28	installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))	29	installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
29	installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.	30	installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
30		31
@@ -49,7 +50,8 @@ PHONY += __fw_install __fw_modinst FORCE
49	.PHONY: $(PHONY)	50	.PHONY: $(PHONY)
50		51
51	__fw_install: $(installed-fw)	52	__fw_install: $(installed-fw)
52	__fw_modinst: $(mod-fw)	53	__fw_modinst: $(installed-mod-fw)
		54	__fw_modbuild: $(addprefix $(obj)/,$(mod-fw))
53		55
54	FORCE:	56	FORCE:
55		57