summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 08:31:29 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 08:31:29 -0300
commite8a23e1bfafeb7752ae02907ef694c3389757a16 (patch)
tree289e0fa56f8d18180d283184d8f013157343c639 /v4l
parent31850509c7d6893733ef50bb76047fb38cf42cc2 (diff)
parentd0baed8b7fb1bb59c7ddba31d4b0bab930d050de (diff)
downloadmediapointer-dvb-s2-e8a23e1bfafeb7752ae02907ef694c3389757a16.tar.gz
mediapointer-dvb-s2-e8a23e1bfafeb7752ae02907ef694c3389757a16.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Makefile6
-rw-r--r--v4l/firmware/Makefile30
2 files changed, 29 insertions, 7 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index 579b85f88..b43b59867 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -39,7 +39,7 @@ endif # TOPDIR
#################################################
# default compilation rule
-default:: config-compat.h Makefile.media links oss # firmware
+default:: config-compat.h Makefile.media links oss
@echo Kernel build directory is $(OUTDIR)
$(MAKE) -C $(OUTDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
./scripts/rmmod.pl check
@@ -206,6 +206,9 @@ install:: media-install
remove rminstall:: media-rminstall
+firmware_install::
+ make -C firmware install
+
#################################################
# Compiling preparation rules
@@ -287,6 +290,7 @@ distclean:: clean
-rm -f scripts/lxdialog scripts/kconfig oss
@find .. -name '*.orig' -exec rm '{}' \;
@find .. -name '*.rej' -exec rm '{}' \;
+ $(MAKE) -C firmware distclean
#################################################
# Kernel module insert/removal rules
diff --git a/v4l/firmware/Makefile b/v4l/firmware/Makefile
index c3624004c..e018ad92a 100644
--- a/v4l/firmware/Makefile
+++ b/v4l/firmware/Makefile
@@ -1,27 +1,45 @@
-TARGETS = ihex2fw ttusb-budget vicam.fw dabusb_bitstream dabusb.fw stv0672_v4
+DIRS = vicam dabusb ttusb-budget cpia2
+
+TARGETS = ihex2fw vicam/firmware.fw dabusb/firmware.fw dabusb/bitstream.bin ttusb-budget/dspbootcode.bin cpia2/stv0672_vp4.bin
+
+####
default: $(TARGETS)
clean:
-rm $(TARGETS)
+distclean: clean
+ -rmdir $(DIRS)
+
+install: default
+ -for i in $(DIRS); do mkdir /lib/firmware/$$i; done
+ -for i in $(TARGETS); do cp $$i /lib/firmware/$$i; done
+
+
+######
+
+mkdir:
+ -mkdir $(DIRS)
+
ihex2fw: ../../linux/firmware/ihex2fw.c
gcc -Wall -o $@ $<
-vicam.fw: ../../linux/firmware/vicam/firmware.H16
+vicam/firmware.fw: ../../linux/firmware/vicam/firmware.H16 mkdir
+ -mkdir vicam
./ihex2fw -w $< $@
-dabusb.fw: ../../linux/firmware/dabusb/firmware.HEX
+dabusb/firmware.fw: ../../linux/firmware/dabusb/firmware.HEX mkdir
./ihex2fw $< $@
-ttusb-budget: ../../linux/firmware/ttusb-budget/dspbootcode.bin.ihex
+ttusb-budget/dspbootcode.bin: ../../linux/firmware/ttusb-budget/dspbootcode.bin.ihex mkdir
objcopy -Iihex -Obinary $< $@
-dabusb_bitstream: ../../linux/firmware/dabusb/bitstream.bin.ihex
+dabusb/bitstream.bin: ../../linux/firmware/dabusb/bitstream.bin.ihex mkdir
objcopy -Iihex -Obinary $< $@
-stv0672_v4: ../../linux/firmware/cpia2/stv0672_vp4.bin.ihex
+cpia2/stv0672_vp4.bin: ../../linux/firmware/cpia2/stv0672_vp4.bin.ihex mkdir
objcopy -Iihex -Obinary $< $@