diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-04-19 20:37:33 +0100 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-04-19 20:37:33 +0100 |
commit | 3a9cf53b3ae80c3ba09dbe95233e5601f6340c1f (patch) | |
tree | fb5faf17878e436238dcd89e83ca1eece177346f | |
parent | a652b0792187224ddd3ac424c38d34fc6d28c496 (diff) | |
parent | aeb537e9d7ed7cc9c04b9e48d0e16c667527b0ca (diff) | |
download | linux-firmware-backup-3a9cf53b3ae80c3ba09dbe95233e5601f6340c1f.tar.gz |
Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware
Conflicts:
WHENCE
-rw-r--r-- | WHENCE | 70 | ||||
-rw-r--r-- | av7110/bootcode.bin | bin | 0 -> 212 bytes | |||
-rw-r--r-- | bnx2/bnx2-mips-06-4.6.16.fw | bin | 0 -> 92628 bytes | |||
-rw-r--r-- | bnx2/bnx2-mips-09-4.6.17.fw | bin | 0 -> 92760 bytes | |||
-rw-r--r-- | bnx2/bnx2-rv2p-06-4.6.16.fw | bin | 0 -> 6872 bytes | |||
-rw-r--r-- | bnx2/bnx2-rv2p-09-4.6.15.fw | bin | 0 -> 7672 bytes | |||
-rw-r--r-- | myricom/lanai.bin | bin | 0 -> 76258 bytes | |||
-rw-r--r-- | yamaha/yss225_registers.bin | bin | 0 -> 15946 bytes |
8 files changed, 70 insertions, 0 deletions
@@ -8,6 +8,24 @@ kernel. -------------------------------------------------------------------------- +Driver: ambassador -- Madge Ambassador (Collage PCI 155 Server) ATM NIC. + +File: firmware/atmsar11.fw + +Licence: Allegedly GPLv2+, but no source visible. Marked: + + Madge Ambassador ATM Adapter microcode. + Copyright (C) 1995-1999 Madge Networks Ltd. + + This microcode data is placed under the terms of the GNU General + Public License. The GPL is contained in /usr/doc/copyright/GPL on a + Debian system and in the file COPYING in the Linux kernel source. + + We would prefer you not to distribute modified versions without + consultation and not to ask for assembly/other microcode source. + +-------------------------------------------------------------------------- + Driver: korg1212 -- Korg 1212 IO audio device File: korg/k1212.dsp @@ -797,3 +815,55 @@ Licence: Unknown Found in hex form in kernel source. +-------------------------------------------------------------------------- + +Driver: MYRI_SBUS - MyriCOM Gigabit Ethernet + +File: myricom/lanai.bin + +Licence: Unknown + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + +Driver: BNX2 - Broadcom NetXtremeII + +File: bnx2/bnx2-mips-06-4.6.16.fw +File: bnx2/bnx2-rv2p-06-4.6.16.fw +File: bnx2/bnx2-mips-09-4.6.17.fw +File: bnx2/bnx2-rv2p-09-4.6.15.fw + +Licence: + + This file contains firmware data derived from proprietary unpublished + source code, Copyright (c) 2004 - 2009 Broadcom Corporation. + + Permission is hereby granted for the distribution of this firmware data + in hexadecimal or equivalent format, provided this copyright notice is + accompanying it. + +Found in hex form in kernel source. + +-------------------------------------------------------------------------- + +Driver: DVB AV7110 -- AV7110 cards + +File: av7110/bootcode.bin + +Licence: GPLv2 or later + +ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S + +-------------------------------------------------------------------------- + +Driver: wavefront - ISA WaveFront sound card + +File: yamaha/yss225_registers.bin + +Licence: Allegedly GPLv2+, but no source visible. + +Found in hex form in kernel source, with the following comment: + Copyright (c) 1998-2002 by Paul Davis <pbd@op.net> + +-------------------------------------------------------------------------- diff --git a/av7110/bootcode.bin b/av7110/bootcode.bin Binary files differnew file mode 100644 index 00000000..f3157759 --- /dev/null +++ b/av7110/bootcode.bin diff --git a/bnx2/bnx2-mips-06-4.6.16.fw b/bnx2/bnx2-mips-06-4.6.16.fw Binary files differnew file mode 100644 index 00000000..0ff4f5ad --- /dev/null +++ b/bnx2/bnx2-mips-06-4.6.16.fw diff --git a/bnx2/bnx2-mips-09-4.6.17.fw b/bnx2/bnx2-mips-09-4.6.17.fw Binary files differnew file mode 100644 index 00000000..2736b4a8 --- /dev/null +++ b/bnx2/bnx2-mips-09-4.6.17.fw diff --git a/bnx2/bnx2-rv2p-06-4.6.16.fw b/bnx2/bnx2-rv2p-06-4.6.16.fw Binary files differnew file mode 100644 index 00000000..bea33c32 --- /dev/null +++ b/bnx2/bnx2-rv2p-06-4.6.16.fw diff --git a/bnx2/bnx2-rv2p-09-4.6.15.fw b/bnx2/bnx2-rv2p-09-4.6.15.fw Binary files differnew file mode 100644 index 00000000..bdb5d104 --- /dev/null +++ b/bnx2/bnx2-rv2p-09-4.6.15.fw diff --git a/myricom/lanai.bin b/myricom/lanai.bin Binary files differnew file mode 100644 index 00000000..ea096429 --- /dev/null +++ b/myricom/lanai.bin diff --git a/yamaha/yss225_registers.bin b/yamaha/yss225_registers.bin Binary files differnew file mode 100644 index 00000000..99e97900 --- /dev/null +++ b/yamaha/yss225_registers.bin |