Commit 4528e429 authored by David Woodhouse's avatar David Woodhouse
Browse files

Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card" 



This reverts a hunk of commit 4b29631d
which seems to have been an accident, and which re-introduced a
previously fixed bug.

Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 556b0f58

firmware/Makefile

+14 −2
Original line number Diff line number Diff line
@@ -180,15 +180,27 @@ $(patsubst %,$(obj)/%.gen.o, $(fw-external-y)): $(obj)/%.gen.o: $(fwdir)/% 
$(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %)

	$(call cmd,ihex)



# Don't depend on ihex2fw if we're installing and it already exists.

# Putting it after | in the dependencies doesn't seem sufficient when

# we're installing after a cross-compile, because ihex2fw has dependencies

# on stuff like /usr/lib/gcc/ppc64-redhat-linux/4.3.0/include/stddef.h and 

# thus wants to be rebuilt. Which it can't be, if the prebuilt kernel tree

# is exported read-only for someone to run 'make install'.

ifeq ($(INSTALL):$(wildcard $(obj)/ihex2fw),install:$(obj)/ihex2fw)

ihex2fw_dep :=

else

ihex2fw_dep := $(obj)/ihex2fw

endif



# .HEX is also Intel HEX, but where the offset and length in each record

# 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

# more compact binary representation of ihex records (<linux/ihex.h>)

$(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)

$(obj)/%.fw: $(obj)/%.HEX $(ihex2fw_dep) | $(objtree)/$(obj)/$$(dir %)

	$(call cmd,ihex2fw)



# .H16 is our own modified form of Intel HEX, with 16-bit length for records.

$(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)

$(obj)/%.fw: $(obj)/%.H16 $(ihex2fw_dep) | $(objtree)/$(obj)/$$(dir %)

	$(call cmd,h16tofw)



$(firmware-dirs):