Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/linux...

Conflicts:
	WHENCE

diff --git a/WHENCE b/WHENCE
index a27c9d5cd2dc44360d22080b9f432de8bedd05d0..877e1b3055cc057f793552bdbaee88f32b630756 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -373,6 +373,88 @@ License: Redistributable. See LICENCE.atheros_firmware for details
 
 --------------------------------------------------------------------------
 
+Driver: CASSINI - Sun Cassini
+
+File: sun/cassini.bin
+
+Licence: Unknown
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
+
+Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter
+
+File: cxgb3/t3b_psram-1.1.0.bin.ihex
+File: cxgb3/t3c_psram-1.1.0.bin.ihex
+file: cxgb3/t3fw-7.0.0.bin.ihex
+
+License: GPLv2 or OpenIB.org BSD license, no source visible
+
+--------------------------------------------------------------------------
+
+Driver: e100 -- Intel PRO/100 Ethernet NIC
+
+File: e100/d101m_ucode.bin
+File: e100/d101s_ucode.bin
+File: e100/d102e_ucode.bin
+
+Licence: Unknown
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
+
+Driver: acenic -- Alteon AceNIC Gigabit Ethernet card
+
+File: acenic/tg1.bin
+File: acenic/tg2.bin
+
+Licence: Unknown
+
+Found in hex form in kernel source, but source allegedly available at
+http://alteon.shareable.org/
+
+--------------------------------------------------------------------------
+
+Driver: tigon3 -- Broadcom Tigon3 based gigabit Ethernet cards
+
+File: tigon/tg3.bin
+File: tigon/tg3_tso.bin
+File: tigon/tg3_tso5.bin
+
+Licence:
+ * Firmware is:
+ *     Derived from proprietary unpublished source code,
+ *     Copyright (C) 2000-2003 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: ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support
+
+File: adaptec/starfire_rx.bin
+File: adaptec/starfire_tx.bin
+
+Licence: Allegedly GPLv2, but no source visible.
+
+Found in hex form in kernel source, with the following notice:
+
+ BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE IT IS LICENSED "AS IS" AND
+ THERE IS NO WARRANTY FOR THE PROGRAM, INCLUDING BUT NOT LIMITED TO THE
+ IMPLIED WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ (TO THE EXTENT PERMITTED BY APPLICABLE LAW). USE OF THE PROGRAM IS AT YOUR
+ OWN RISK. IN NO EVENT WILL ADAPTEC OR ITS LICENSORS BE LIABLE TO YOU FOR
+ DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.
+
+--------------------------------------------------------------------------
+
 Driver: i2400m-usb - Intel 2400 Wireless WiMAX Connection over USb
 
 File: i2400m-fw-usb-1.3.sbcf
@@ -380,3 +462,5 @@ File: i2400m-fw-usb-1.3.sbcf
 License: Redistributable. See LICENCE.i2400m for details
 
 Also available from http://linuxwimax.org/Download
+
+--------------------------------------------------------------------------

diff --git a/acenic/tg1.bin b/acenic/tg1.bin
new file mode 100644 (file)
index 0000000..6a714fa
Binary files /dev/null and b/acenic/tg1.bin differ

diff --git a/acenic/tg2.bin b/acenic/tg2.bin
new file mode 100644 (file)
index 0000000..689981e
Binary files /dev/null and b/acenic/tg2.bin differ

diff --git a/adaptec/starfire_rx.bin b/adaptec/starfire_rx.bin
new file mode 100644 (file)
index 0000000..5abd88f
Binary files /dev/null and b/adaptec/starfire_rx.bin differ

diff --git a/adaptec/starfire_tx.bin b/adaptec/starfire_tx.bin
new file mode 100644 (file)
index 0000000..5abd88f
Binary files /dev/null and b/adaptec/starfire_tx.bin differ

diff --git a/cxgb3/t3b_psram-1.1.0.bin b/cxgb3/t3b_psram-1.1.0.bin
new file mode 100644 (file)
index 0000000..14d4369
Binary files /dev/null and b/cxgb3/t3b_psram-1.1.0.bin differ

diff --git a/cxgb3/t3c_psram-1.1.0.bin b/cxgb3/t3c_psram-1.1.0.bin
new file mode 100644 (file)
index 0000000..fe58712
Binary files /dev/null and b/cxgb3/t3c_psram-1.1.0.bin differ

diff --git a/cxgb3/t3fw-7.0.0.bin b/cxgb3/t3fw-7.0.0.bin
new file mode 100644 (file)
index 0000000..cb48e4a
Binary files /dev/null and b/cxgb3/t3fw-7.0.0.bin differ

diff --git a/dsp56k/bootstrap.asm b/dsp56k/bootstrap.asm
index 10d891929cd37d8e898a86215bf6b2aaa000263b..a411047e6db35b4b91727f23ce180bc6053ca112 100644 (file)
--- a/dsp56k/bootstrap.asm
+++ b/dsp56k/bootstrap.asm
@@ -51,19 +51,19 @@ start   jmp     <$40
         ; Copy DSP program control
         move    #real,r0
         move    #upload,r1
-        do      #upload_end-upload,<_copy
-        move    P:(r0)+,x0
-        move    x0,P:(r1)+
-_copy   movep   #>4,X:<<M_HCR
-        movep   #>$c00,X:<<M_IPR
+        do      #upload_end-upload,_copy
+        movem    P:(r0)+,x0
+        movem    x0,P:(r1)+
+_copy   movep   #4,X:<<M_HCR
+        movep   #$c00,X:<<M_IPR
         and     #<$fe,mr
         jmp     upload
 
 real
         org     P:$7ea9
 upload
-        movep   #>1,X:<<M_PBC
-        movep   #>0,X:<<M_BCR
+        movep   #1,X:<<M_PBC
+        movep   #0,X:<<M_BCR
 
 next    jclr    #0,X:<<M_HSR,*
         movep   X:<<M_HRX,A
@@ -81,18 +81,18 @@ _get_length
         cmp     x0,A
         jeq     load_Y
 
-load_P  do      y0,_load
+load_P  do      y0,_load_P
         jclr    #0,X:<<M_HSR,*
         movep   X:<<M_HRX,P:(r0)+
-_load   jmp     next
-load_X  do      y0,_load
+_load_P jmp     next
+load_X  do      y0,_load_X
         jclr    #0,X:<<M_HSR,*
         movep   X:<<M_HRX,X:(r0)+
-_load   jmp     next
-load_Y  do      y0,_load
+_load_X jmp     next
+load_Y  do      y0,_load_Y
         jclr    #0,X:<<M_HSR,*
         movep   X:<<M_HRX,Y:(r0)+
-_load   jmp     next
+_load_Y jmp     next
 
 upload_end
         end

diff --git a/e100/d101m_ucode.bin b/e100/d101m_ucode.bin
new file mode 100644 (file)
index 0000000..b700b75
Binary files /dev/null and b/e100/d101m_ucode.bin differ

diff --git a/e100/d101s_ucode.bin b/e100/d101s_ucode.bin
new file mode 100644 (file)
index 0000000..d869e06
Binary files /dev/null and b/e100/d101s_ucode.bin differ

diff --git a/e100/d102e_ucode.bin b/e100/d102e_ucode.bin
new file mode 100644 (file)
index 0000000..3cfc65b
Binary files /dev/null and b/e100/d102e_ucode.bin differ

diff --git a/sun/cassini.bin b/sun/cassini.bin
new file mode 100644 (file)
index 0000000..c8cdfad
Binary files /dev/null and b/sun/cassini.bin differ

diff --git a/tigon/tg3.bin b/tigon/tg3.bin
new file mode 100644 (file)
index 0000000..0b8ae5a
Binary files /dev/null and b/tigon/tg3.bin differ

diff --git a/tigon/tg3_tso.bin b/tigon/tg3_tso.bin
new file mode 100644 (file)
index 0000000..3c481c9
Binary files /dev/null and b/tigon/tg3_tso.bin differ

diff --git a/tigon/tg3_tso5.bin b/tigon/tg3_tso5.bin
new file mode 100644 (file)
index 0000000..fb77f0f
Binary files /dev/null and b/tigon/tg3_tso5.bin differ