[kernel] r19759 - in dists/trunk/firmware-nonfree: debian linux-nonfree

[Ben Hutchings]

Author: benh
Date: Sun Jan 20 17:06:30 2013
New Revision: 19759

Log:
linux-nonfree: Add Conexant CX231xx, CX23418 (Closes: #697008) and CX23885 firmware

Added:
   dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx231xx-avcore-01.fw   (contents, props changed)
   dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx23418-apu.fw   (contents, props changed)
   dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx23418-cpu.fw   (contents, props changed)
   dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx23418-dig.fw   (contents, props changed)
   dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx23885-avcore-01.fw   (contents, props changed)
   dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx23885-enc.fw   (contents, props changed)
Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/linux-nonfree/LICENSE
   dists/trunk/firmware-nonfree/linux-nonfree/defines

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Sun Jan 20 16:33:48 2013	(r19758)
+++ dists/trunk/firmware-nonfree/debian/changelog	Sun Jan 20 17:06:30 2013	(r19759)
@@ -4,6 +4,8 @@
     (Closes: #697535)
   * ivtv, linux-nonfree: Replace Hauppauge's version of v4l-cx25840.fw with
     a version licenced directly by Conexant, in firmware-linux-nonfree
+  * linux-nonfree: Add Conexant CX231xx, CX23418 (Closes: #697008) and
+    CX23885 firmware
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 06 Jan 2013 18:19:39 +0000
 

Modified: dists/trunk/firmware-nonfree/linux-nonfree/LICENSE
==============================================================================
--- dists/trunk/firmware-nonfree/linux-nonfree/LICENSE	Sun Jan 20 16:33:48 2013	(r19758)
+++ dists/trunk/firmware-nonfree/linux-nonfree/LICENSE	Sun Jan 20 17:06:30 2013	(r19759)
@@ -391,3 +391,13 @@
  Permission is hereby granted for the distribution of this firmware
  data in hexadecimal or equivalent format, provided this copyright
  notice is accompanying it.
+
+Files: linux-nonfree/v4l-cx*.fw
+License: Binary redistribution (Conexant)
+ Conexant grants permission to use and redistribute these firmware
+ files for use with Conexant devices, but not as a part of the Linux
+ kernel or in any other form which would require these files themselves
+ to be covered by the terms of the GNU General Public License.
+ These firmware files are distributed in the hope that they will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Modified: dists/trunk/firmware-nonfree/linux-nonfree/defines
==============================================================================
--- dists/trunk/firmware-nonfree/linux-nonfree/defines	Sun Jan 20 16:33:48 2013	(r19758)
+++ dists/trunk/firmware-nonfree/linux-nonfree/defines	Sun Jan 20 17:06:30 2013	(r19759)
@@ -130,7 +130,13 @@
  tigon/tg3_tso.bin
  tigon/tg3.bin
  tigon/tg3_tso5.bin
+ v4l-cx231xx-avcore-01.fw
+ v4l-cx23418-apu.fw
+ v4l-cx23418-cpu.fw
+ v4l-cx23418-dig.fw
  v4l-cx25840.fw
+ v4l-cx23885-avcore-01.fw
+ v4l-cx23885-enc.fw
  vntwusb.fw
 support: initramfs-tools
 uri: http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
@@ -503,8 +509,26 @@
 [tigon/tg3_tso5.bin_base]
 desc: Broadcom BCM5705 TSO firmware
 
+[v4l-cx231xx-avcore-01.fw_base]
+desc: Conexant CX231xx core firmware
+
+[v4l-cx23418-apu.fw_base]
+desc: Conexant CX23418 APU firmware
+
+[v4l-cx23418-cpu.fw_base]
+desc: Conexant CX23418 CPU firmware
+
+[v4l-cx23418-dig.fw_base]
+desc: Conexant CX23418 ADEC firmware
+
 [v4l-cx25840.fw_base]
-desc: Conexant CX25840 MPEG codec
+desc: Conexant CX25840 firmware
+
+[v4l-cx23885-avcore-01.fw_base]
+desc: Conexant CX23885 core firmware
+
+[v4l-cx23885-enc.fw_base]
+desc: Conexant CX23885 encoder firmware
 
 [vntwusb.fw_base]
 desc: VIA VT6656 firmware

Added: dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx231xx-avcore-01.fw
==============================================================================
Binary file. No diff available.

Added: dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx23418-apu.fw
==============================================================================
Binary file. No diff available.

Added: dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx23418-cpu.fw
==============================================================================
Binary file. No diff available.

Added: dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx23418-dig.fw
==============================================================================
Binary file. No diff available.

Added: dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx23885-avcore-01.fw
==============================================================================
Binary file. No diff available.

Added: dists/trunk/firmware-nonfree/linux-nonfree/v4l-cx23885-enc.fw
==============================================================================
Binary file. No diff available.