The patch number 8420 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
Complete firmware compilation scripts
This patch completes firmware compilation scripts:
- linux/firmware/Makefile is just a copy of kernel script make file. It is not
currently used by the building system;
- Added two new targets for firmware compilation and instalation;
- Fixes the COPYING file to explicitly state that the firmwares aren't covered
by GPL;
- make distclean will also cleanup the firmwares.
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
COPYING | 7 +++++
INSTALL | 9 +++++++
linux/firmware/Makefile | 47 ++++++++++++++++++++++++++++++++++++++++
v4l/Makefile | 6 ++++-
v4l/firmware/Makefile | 30 ++++++++++++++++++++-----
5 files changed, 92 insertions(+), 7 deletions(-)
diff -r 2e1b00693b1b -r a609b798c204 COPYING
--- a/COPYING Sun Jul 20 00:00:30 2008 -0300
+++ b/COPYING Sun Jul 20 00:37:25 2008 -0300
@@ -1,3 +1,10 @@
+ NOTE! This copyright does *not* cover the firmware hex files contained
+ under linux/firmware and v4l/firmware directories. Those firmwares are here
+ just as a convenience to make easier to develop and test V4L/DVB drivers.
+
+ Mauro Carvalho Chehab
+
+----------------------------------------
NOTE! This copyright does *not* cover user programs that use kernel
services by normal system calls - this is merely considered normal use
diff -r 2e1b00693b1b -r a609b798c204 INSTALL
--- a/INSTALL Sun Jul 20 00:00:30 2008 -0300
+++ b/INSTALL Sun Jul 20 00:37:25 2008 -0300
@@ -35,6 +35,15 @@ rminstall - cleans previous installation
sound-install - installs the sound modules related to V4L/DVB
tree.
+
+======================
+Firmware rules:
+
+firmware - Create the firmware files that are enclosed at the
+ tree.
+ Notice: Only a very few firmwares are currently here
+
+firmware_install- Install firmware files under /lib/firmware
=======================
Module selection rules:
diff -r 2e1b00693b1b -r a609b798c204 linux/firmware/Makefile
--- a/linux/firmware/Makefile Sun Jul 20 00:00:30 2008 -0300
+++ b/linux/firmware/Makefile Sun Jul 20 00:37:25 2008 -0300
@@ -20,8 +20,55 @@ fw-external-y := $(subst ",,$(CONFIG_EXT
# accurate. In the latter case it doesn't matter -- it'll use
$(fw-shipped-all).
# But be aware that the config file might not be included at all.
+fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
+fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
+fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
+fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin
+fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
+fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
+ ess/maestro3_assp_minisrc.fw
+fw-shipped-$(CONFIG_SND_SB16_CSP) += sb16/mulaw_main.csp sb16/alaw_main.csp \
+ sb16/ima_adpcm_init.csp \
+ sb16/ima_adpcm_playback.csp \
+ sb16/ima_adpcm_capture.csp
+fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
+ yamaha/ds1e_ctrl.fw
fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
+fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
+ emi26/bitstream.fw
+fw-shipped-$(CONFIG_USB_EMI62) += emi62/loader.fw emi62/bitstream.fw \
+ emi62/spdif.fw emi62/midi.fw
+fw-shipped-$(CONFIG_USB_KAWETH) += kaweth/new_code.bin kaweth/trigger_code.bin
\
+ kaweth/new_code_fix.bin \
+ kaweth/trigger_code_fix.bin
+ifdef CONFIG_FIRMWARE_IN_KERNEL
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_MPR) += keyspan/mpr.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA18X) += keyspan/usa18x.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19) += keyspan/usa19.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19QI) += keyspan/usa19qi.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19QW) += keyspan/usa19qw.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19W) += keyspan/usa19w.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28) += keyspan/usa28.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28XA) += keyspan/usa28xa.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28XB) += keyspan/usa28xb.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28X) += keyspan/usa28x.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA49W) += keyspan/usa49w.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA49WLC) += keyspan/usa49wlc.fw
+else
+fw-shipped- += keyspan/mpr.fw keyspan/usa18x.fw keyspan/usa19.fw \
+ keyspan/usa19qi.fw keyspan/usa19qw.fw keyspan/usa19w.fw \
+ keyspan/usa28.fw keyspan/usa28xa.fw keyspan/usa28xb.fw \
+ keyspan/usa28x.fw keyspan/usa49w.fw keyspan/usa49wlc.fw
+endif
+fw-shipped-$(CONFIG_USB_SERIAL_TI) += ti_3410.fw ti_5052.fw
+fw-shipped-$(CONFIG_USB_SERIAL_EDGEPORT) += edgeport/boot.fw edgeport/boot2.fw
\
+ edgeport/down.fw edgeport/down2.fw
+fw-shipped-$(CONFIG_USB_SERIAL_EDGEPORT_TI) += edgeport/down3.bin
+fw-shipped-$(CONFIG_USB_SERIAL_WHITEHEAT) += whiteheat_loader.fw whiteheat.fw \
+ # whiteheat_loader_debug.fw
+fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_PDA) += keyspan_pda/keyspan_pda.fw
+fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw
fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin
diff -r 2e1b00693b1b -r a609b798c204 v4l/Makefile
--- a/v4l/Makefile Sun Jul 20 00:00:30 2008 -0300
+++ b/v4l/Makefile Sun Jul 20 00:37:25 2008 -0300
@@ -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
@@ -205,6 +205,9 @@ install:: media-install
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 -r 2e1b00693b1b -r a609b798c204 v4l/firmware/Makefile
--- a/v4l/firmware/Makefile Sun Jul 20 00:00:30 2008 -0300
+++ b/v4l/firmware/Makefile Sun Jul 20 00:37:25 2008 -0300
@@ -1,27 +1,45 @@ TARGETS = ihex2fw ttusb-budget vicam.fw
-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 $< $@
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/a609b798c204bb6b969b49d732c6cf9a1d616bc5
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
