tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Revert "fix modules_install via NFS"

This reverts commit 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6.

This 'fix' is not necessary; we just need to undo the damage caused
accidentally by Igor/Mauro in 4b29631db33292d416dc395c56122ea865e7635c
("V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card")

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

David Woodhouse 556b0f58 8e320d02

+8 -7
+1
firmware/.gitignore
··· 3 3 *.bin 4 4 *.csp 5 5 *.dsp 6 + ihex2fw
+6 -4
firmware/Makefile
··· 118 118 cmd_ihex = $(OBJCOPY) -Iihex -Obinary $< $@ 119 119 120 120 quiet_cmd_ihex2fw = IHEX2FW $@ 121 - cmd_ihex2fw = $(objtree)/scripts/ihex2fw $< $@ 121 + cmd_ihex2fw = $(objtree)/$(obj)/ihex2fw $< $@ 122 122 123 123 quiet_cmd_h16tofw = H16TOFW $@ 124 - cmd_h16tofw = $(objtree)/scripts/ihex2fw -w $< $@ 124 + cmd_h16tofw = $(objtree)/$(obj)/ihex2fw -w $< $@ 125 125 126 126 quiet_cmd_fwbin = MK_FW $@ 127 127 cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)"; \ ··· 184 184 # is actually meaningful, because the firmware has to be loaded in a certain 185 185 # order rather than as a single binary blob. Thus, we convert them into our 186 186 # more compact binary representation of ihex records (<linux/ihex.h>) 187 - $(obj)/%.fw: $(obj)/%.HEX | $(objtree)/$(obj)/$$(dir %) 187 + $(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %) 188 188 $(call cmd,ihex2fw) 189 189 190 190 # .H16 is our own modified form of Intel HEX, with 16-bit length for records. 191 - $(obj)/%.fw: $(obj)/%.H16 | $(objtree)/$(obj)/$$(dir %) 191 + $(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %) 192 192 $(call cmd,h16tofw) 193 193 194 194 $(firmware-dirs): ··· 205 205 # Without this, built-in.o won't be created when it's empty, and the 206 206 # final vmlinux link will fail. 207 207 obj-n := dummy 208 + 209 + hostprogs-y := ihex2fw
-1
scripts/.gitignore
··· 1 1 # 2 2 # Generated files 3 3 # 4 - ihex2fw 5 4 conmakehash 6 5 kallsyms 7 6 pnmtologo
+1 -2
scripts/Makefile
··· 2 2 # scripts contains sources for various helper programs used throughout 3 3 # the kernel for the build process. 4 4 # --------------------------------------------------------------------------- 5 - # ihex2fw: Parser/loader for IHEX formatted data 6 5 # kallsyms: Find all symbols in vmlinux 7 6 # pnmttologo: Convert pnm files to logo files 7 + # conmakehash: Create chartable 8 8 # conmakehash: Create arrays for initializing the kernel console tables 9 9 10 - hostprogs-y := ihex2fw 11 10 hostprogs-$(CONFIG_KALLSYMS) += kallsyms 12 11 hostprogs-$(CONFIG_LOGO) += pnmtologo 13 12 hostprogs-$(CONFIG_VT) += conmakehash
scripts/ihex2fw.c firmware/ihex2fw.c