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'.
This commit is contained in:
commit
762b8291be
24 changed files with 11 additions and 109 deletions
1
Makefile
1
Makefile
|
@ -1061,6 +1061,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
|
||||||
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
|
$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
|
||||||
@echo ' Building modules, stage 2.';
|
@echo ' Building modules, stage 2.';
|
||||||
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
|
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
|
||||||
|
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
|
||||||
|
|
||||||
|
|
||||||
# Target to prepare building external modules
|
# Target to prepare building external modules
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_ALPHA_H
|
|
||||||
#define __LINUX_KVM_ALPHA_H
|
|
||||||
|
|
||||||
/* alpha does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_ARM_H
|
|
||||||
#define __LINUX_KVM_ARM_H
|
|
||||||
|
|
||||||
/* arm does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_AVR32_H
|
|
||||||
#define __LINUX_KVM_AVR32_H
|
|
||||||
|
|
||||||
/* avr32 does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_BLACKFIN_H
|
|
||||||
#define __LINUX_KVM_BLACKFIN_H
|
|
||||||
|
|
||||||
/* blackfin does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_CRIS_H
|
|
||||||
#define __LINUX_KVM_CRIS_H
|
|
||||||
|
|
||||||
/* cris does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_FRV_H
|
|
||||||
#define __LINUX_KVM_FRV_H
|
|
||||||
|
|
||||||
/* frv does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,4 +1,6 @@
|
||||||
|
ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
|
||||||
header-y += kvm.h
|
header-y += kvm.h
|
||||||
|
endif
|
||||||
|
|
||||||
ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
|
ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
|
||||||
unifdef-y += a.out.h
|
unifdef-y += a.out.h
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_H8300_H
|
|
||||||
#define __LINUX_KVM_H8300_H
|
|
||||||
|
|
||||||
/* h8300 does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_M32R_H
|
|
||||||
#define __LINUX_KVM_M32R_H
|
|
||||||
|
|
||||||
/* m32r does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_M68K_H
|
|
||||||
#define __LINUX_KVM_M68K_H
|
|
||||||
|
|
||||||
/* m68k does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_M68KNOMMU_H
|
|
||||||
#define __LINUX_KVM_M68KNOMMU_H
|
|
||||||
|
|
||||||
/* m68knommu does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_MIPS_H
|
|
||||||
#define __LINUX_KVM_MIPS_H
|
|
||||||
|
|
||||||
/* mips does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_MN10300_H
|
|
||||||
#define __LINUX_KVM_MN10300_H
|
|
||||||
|
|
||||||
/* mn10300 does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_PARISC_H
|
|
||||||
#define __LINUX_KVM_PARISC_H
|
|
||||||
|
|
||||||
/* parisc does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -7,7 +7,6 @@ header-y += tape390.h
|
||||||
header-y += ucontext.h
|
header-y += ucontext.h
|
||||||
header-y += vtoc.h
|
header-y += vtoc.h
|
||||||
header-y += zcrypt.h
|
header-y += zcrypt.h
|
||||||
header-y += kvm.h
|
|
||||||
header-y += chsc.h
|
header-y += chsc.h
|
||||||
|
|
||||||
unifdef-y += cmb.h
|
unifdef-y += cmb.h
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_SH_H
|
|
||||||
#define __LINUX_KVM_SH_H
|
|
||||||
|
|
||||||
/* sh does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_SPARC_H
|
|
||||||
#define __LINUX_KVM_SPARC_H
|
|
||||||
|
|
||||||
/* sparc does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1 +0,0 @@
|
||||||
#include <asm-sparc/kvm.h>
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_UM_H
|
|
||||||
#define __LINUX_KVM_UM_H
|
|
||||||
|
|
||||||
/* um does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -3,7 +3,6 @@ include include/asm-generic/Kbuild.asm
|
||||||
header-y += boot.h
|
header-y += boot.h
|
||||||
header-y += bootparam.h
|
header-y += bootparam.h
|
||||||
header-y += debugreg.h
|
header-y += debugreg.h
|
||||||
header-y += kvm.h
|
|
||||||
header-y += ldt.h
|
header-y += ldt.h
|
||||||
header-y += msr-index.h
|
header-y += msr-index.h
|
||||||
header-y += prctl.h
|
header-y += prctl.h
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __LINUX_KVM_XTENSA_H
|
|
||||||
#define __LINUX_KVM_XTENSA_H
|
|
||||||
|
|
||||||
/* xtensa does not support KVM */
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -255,7 +255,9 @@ unifdef-y += kd.h
|
||||||
unifdef-y += kernelcapi.h
|
unifdef-y += kernelcapi.h
|
||||||
unifdef-y += kernel.h
|
unifdef-y += kernel.h
|
||||||
unifdef-y += keyboard.h
|
unifdef-y += keyboard.h
|
||||||
|
ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
|
||||||
unifdef-y += kvm.h
|
unifdef-y += kvm.h
|
||||||
|
endif
|
||||||
unifdef-y += llc.h
|
unifdef-y += llc.h
|
||||||
unifdef-y += loop.h
|
unifdef-y += loop.h
|
||||||
unifdef-y += lp.h
|
unifdef-y += lp.h
|
||||||
|
|
|
@ -17,14 +17,15 @@ include $(srctree)/$(obj)/Makefile
|
||||||
|
|
||||||
include scripts/Makefile.host
|
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
|
# If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the
|
||||||
# firmware for in-kernel drivers too.
|
# firmware for in-kernel drivers too.
|
||||||
ifndef CONFIG_FIRMWARE_IN_KERNEL
|
ifndef CONFIG_FIRMWARE_IN_KERNEL
|
||||||
mod-fw += $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-y))
|
mod-fw += $(fw-shipped-y)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
|
||||||
|
|
||||||
installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
|
installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
|
||||||
installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
|
installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
|
||||||
|
|
||||||
|
@ -49,7 +50,8 @@ PHONY += __fw_install __fw_modinst FORCE
|
||||||
.PHONY: $(PHONY)
|
.PHONY: $(PHONY)
|
||||||
|
|
||||||
__fw_install: $(installed-fw)
|
__fw_install: $(installed-fw)
|
||||||
__fw_modinst: $(mod-fw)
|
__fw_modinst: $(installed-mod-fw)
|
||||||
|
__fw_modbuild: $(addprefix $(obj)/,$(mod-fw))
|
||||||
|
|
||||||
FORCE:
|
FORCE:
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue