Commit 556b0f58 authored by David Woodhouse's avatar David Woodhouse

Revert "fix modules_install via NFS"

This reverts commit 8b249b68.

This 'fix' is not necessary; we just need to undo the damage caused
accidentally by Igor/Mauro in 4b29631d
("V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card")
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 8e320d02
...@@ -3,3 +3,4 @@ ...@@ -3,3 +3,4 @@
*.bin *.bin
*.csp *.csp
*.dsp *.dsp
ihex2fw
...@@ -118,10 +118,10 @@ quiet_cmd_ihex = IHEX $@ ...@@ -118,10 +118,10 @@ quiet_cmd_ihex = IHEX $@
cmd_ihex = $(OBJCOPY) -Iihex -Obinary $< $@ cmd_ihex = $(OBJCOPY) -Iihex -Obinary $< $@
quiet_cmd_ihex2fw = IHEX2FW $@ quiet_cmd_ihex2fw = IHEX2FW $@
cmd_ihex2fw = $(objtree)/scripts/ihex2fw $< $@ cmd_ihex2fw = $(objtree)/$(obj)/ihex2fw $< $@
quiet_cmd_h16tofw = H16TOFW $@ quiet_cmd_h16tofw = H16TOFW $@
cmd_h16tofw = $(objtree)/scripts/ihex2fw -w $< $@ cmd_h16tofw = $(objtree)/$(obj)/ihex2fw -w $< $@
quiet_cmd_fwbin = MK_FW $@ quiet_cmd_fwbin = MK_FW $@
cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)"; \ cmd_fwbin = FWNAME="$(patsubst firmware/%.gen.S,%,$@)"; \
...@@ -184,11 +184,11 @@ $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %) ...@@ -184,11 +184,11 @@ $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %)
# is actually meaningful, because the firmware has to be loaded in a certain # is actually meaningful, because the firmware has to be loaded in a certain
# order rather than as a single binary blob. Thus, we convert them into our # order rather than as a single binary blob. Thus, we convert them into our
# more compact binary representation of ihex records (<linux/ihex.h>) # more compact binary representation of ihex records (<linux/ihex.h>)
$(obj)/%.fw: $(obj)/%.HEX | $(objtree)/$(obj)/$$(dir %) $(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
$(call cmd,ihex2fw) $(call cmd,ihex2fw)
# .H16 is our own modified form of Intel HEX, with 16-bit length for records. # .H16 is our own modified form of Intel HEX, with 16-bit length for records.
$(obj)/%.fw: $(obj)/%.H16 | $(objtree)/$(obj)/$$(dir %) $(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
$(call cmd,h16tofw) $(call cmd,h16tofw)
$(firmware-dirs): $(firmware-dirs):
...@@ -205,3 +205,5 @@ targets := $(fw-shipped-) $(patsubst $(obj)/%,%, \ ...@@ -205,3 +205,5 @@ targets := $(fw-shipped-) $(patsubst $(obj)/%,%, \
# Without this, built-in.o won't be created when it's empty, and the # Without this, built-in.o won't be created when it's empty, and the
# final vmlinux link will fail. # final vmlinux link will fail.
obj-n := dummy obj-n := dummy
hostprogs-y := ihex2fw
# #
# Generated files # Generated files
# #
ihex2fw
conmakehash conmakehash
kallsyms kallsyms
pnmtologo pnmtologo
......
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
# scripts contains sources for various helper programs used throughout # scripts contains sources for various helper programs used throughout
# the kernel for the build process. # the kernel for the build process.
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# ihex2fw: Parser/loader for IHEX formatted data
# kallsyms: Find all symbols in vmlinux # kallsyms: Find all symbols in vmlinux
# pnmttologo: Convert pnm files to logo files # pnmttologo: Convert pnm files to logo files
# conmakehash: Create chartable
# conmakehash: Create arrays for initializing the kernel console tables # conmakehash: Create arrays for initializing the kernel console tables
hostprogs-y := ihex2fw
hostprogs-$(CONFIG_KALLSYMS) += kallsyms hostprogs-$(CONFIG_KALLSYMS) += kallsyms
hostprogs-$(CONFIG_LOGO) += pnmtologo hostprogs-$(CONFIG_LOGO) += pnmtologo
hostprogs-$(CONFIG_VT) += conmakehash hostprogs-$(CONFIG_VT) += conmakehash
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment