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

This reverts a hunk of commit 4b29631db33292d416dc395c56122ea865e7635c which seems to have been an accident, and which re-introduced a previously fixed bug. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card"
This reverts a hunk of commit 4b29631db33292d416dc395c56122ea865e7635c which seems to have been an accident, and which re-introduced a previously fixed bug. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
David Woodhouse
1 parent 556b0f58bb
Showing 1 changed file with 14 additions and 2 deletions Side-by-side Diff
firmware/Makefile
@@ -180,15 +180,27 @@
 $(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):
...	...	@@ -180,15 +180,27 @@
180	180	$(obj)/%: $(obj)/%.ihex \| $(objtree)/$(obj)/$$(dir %)
181	181	$(call cmd,ihex)
182	182
	183	+# Don't depend on ihex2fw if we're installing and it already exists.
	184	+# Putting it after \| in the dependencies doesn't seem sufficient when
	185	+# we're installing after a cross-compile, because ihex2fw has dependencies
	186	+# on stuff like /usr/lib/gcc/ppc64-redhat-linux/4.3.0/include/stddef.h and
	187	+# thus wants to be rebuilt. Which it can't be, if the prebuilt kernel tree
	188	+# is exported read-only for someone to run 'make install'.
	189	+ifeq ($(INSTALL):$(wildcard $(obj)/ihex2fw),install:$(obj)/ihex2fw)
	190	+ihex2fw_dep :=
	191	+else
	192	+ihex2fw_dep := $(obj)/ihex2fw
	193	+endif
	194	+
183	195	# .HEX is also Intel HEX, but where the offset and length in each record
184	196	# is actually meaningful, because the firmware has to be loaded in a certain
185	197	# order rather than as a single binary blob. Thus, we convert them into our
186	198	# more compact binary representation of ihex records (<linux/ihex.h>)
187		-$(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw \| $(objtree)/$(obj)/$$(dir %)
	199	+$(obj)/%.fw: $(obj)/%.HEX $(ihex2fw_dep) \| $(objtree)/$(obj)/$$(dir %)
188	200	$(call cmd,ihex2fw)
189	201
190	202	# .H16 is our own modified form of Intel HEX, with 16-bit length for records.
191		-$(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw \| $(objtree)/$(obj)/$$(dir %)
	203	+$(obj)/%.fw: $(obj)/%.H16 $(ihex2fw_dep) \| $(objtree)/$(obj)/$$(dir %)
192	204	$(call cmd,h16tofw)
193	205
194	206	$(firmware-dirs):