Revamped cassini, cxgb3 and e100.

[releases.git] / deblob-2.6.28

diff --git a/deblob-2.6.28 b/deblob-2.6.28
index 63686440b1aeaf1ecb59fe2aa05060df8c7a1b9c..4c6bff6a0931bf856038f1cada81ac7d5c6c3587 100755 (executable)
--- a/deblob-2.6.28
+++ b/deblob-2.6.28
@@ -53,7 +53,7 @@ esac
 
 check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
 if [ ! -f $check ] ; then
-  echo optional deblob-check missing, will remove entire files >&2
+  die deblob-check script missing, will remove entire files
   have_check=false
 else
   have_check=:
@@ -454,54 +454,92 @@ clean_mk CONFIG_USB_VICAM drivers/media/video/usbvideo/Makefile
 # Removed net Drivers #
 #######################
 
-# ACENIC - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit
+announce ACENIC - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit
 clean_blob drivers/net/acenic_firmware.h
+clean_sed 's,  \(ace_load_firmware[^;]*\),     if ((ecode = \1)) goto init_error,' drivers/net/acenic.c
+clean_sed '/^static int __devinit ace_load_firmware(/,/^}$/ { /^}$/i\
+}\
+       printk(KERN_ERR "%s: Missing Free firwmare\\n", ap->name);\
+       return -EINVAL;
+}' drivers/net/acenic.c
+clean_blob drivers/net/acenic.c
 clean_kconfig drivers/net/Kconfig 'ACENIC'
 clean_mk CONFIG_ACENIC drivers/net/Makefile
 
-# ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support
-
+announce ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support
 # This file requires prior acceptance of the GPL before you can even
 # run the code in it.  It's not clear whether this is a further
 # requirement that would make the distribution incompatible with the
 # GPL, but since nothing remains after we remove the blob, it's
 # irrelevant whether the explicit acceptance would be a problem.
-clean_blob drivers/net/starfire_firmware.h
+clean_file drivers/net/starfire_firmware.h
+clean_file drivers/net/starfire_firmware.pl
+clean_sed '/Load Rx\/Tx firmware/i\
+       printk (KERN_ERR "%s: Missing Free firmware\\n", dev->name);\
+       return -EINVAL;
+' drivers/net/starfire.c
+clean_blob drivers/net/starfire.c
 clean_kconfig drivers/net/Kconfig 'ADAPTEC_STARFIRE'
 clean_mk CONFIG_ADAPTEC_STARFIRE drivers/net/Makefile
 
-# BNX2 - Broadcom NetXtremeII
-clean_blob drivers/net/bnx2_fw.h
-clean_blob drivers/net/bnx2_fw2.h
+announce BNX2 - Broadcom NetXtremeII
+clean_file drivers/net/bnx2_fw.h
+clean_file drivers/net/bnx2_fw2.h
+clean_sed '/ bnx2_init_cpus(/i\
+       printk (KERN_ERR "%s: Missing Free firmware\\n", bp->dev->name);\
+       return -EINVAL;\
+#define bnx2_init_cpus(bp) (-EINVAL)' drivers/net/bnx2.c
+clean_blob drivers/net/bnx2.c
 clean_kconfig drivers/net/Kconfig 'BNX2'
 clean_mk CONFIG_BNX2 drivers/net/Makefile
 
+announce BNX2X - Broadcom NetXtremeII 10Gb support
 clean_blob drivers/net/bnx2x_init_values.h
+clean_blob drivers/net/bnx2x_init.h
+clean_sed '/^#include "bnx2x_init\.h"/,/^$/ {/^$/i\
+#define bnx2x_init_block(bp, start, end) \\\
+  return printk(KERN_ERR PFX "%s: Missing Free firmware\\n", bp->dev->name),\
+        -EINVAL;
+}' drivers/net/bnx2x_main.c
 clean_kconfig drivers/net/Kconfig 'BNX2X'
 clean_mk CONFIG_BNX2X drivers/net/Makefile
 
-# CASSINI - Sun Cassini
+announce CASSINI - Sun Cassini
 drop_fw_file firmware/sun/cassini.bin.ihex firmware/sun/cassini.bin
+reject_firmware drivers/net/cassini.c
+clean_blob drivers/net/cassini.c
 clean_kconfig drivers/net/Kconfig 'CASSINI'
 clean_mk CONFIG_CASSINI drivers/net/Makefile
 
-# CHELSIO_T3 - Chelsio AEL 2005 support
+announce CHELSIO_T3 - Chelsio AEL 2005 support
+clean_sed '/^static int ael2005_setup_\(sr\|twinax\)_edc(/,/^}$/ {
+  /for.*ARRAY_SIZE(\(sr\|twinax\)_edc)/i\
+}\
+       CH_ERR(phy->adapter, "Missing Free firwmare\\n");\
+       err = -EINVAL;
+}' drivers/net/cxgb3/ael1002.c
 clean_blob drivers/net/cxgb3/ael1002.c
-if $have_check; then
-  :
-else
-  clean_kconfig drivers/net/Kconfig 'CHELSIO_T3'
-  clean_mk CONFIG_CHELSIO_T3 drivers/net/cxgb3/Makefile
-fi
-
-# E100 - Intel(R) PRO/100+
+clean_kconfig drivers/net/Kconfig 'CHELSIO_T3'
+clean_mk CONFIG_CHELSIO_T3 drivers/net/cxgb3/Makefile
+
+announce E100 - Intel PRO/100+
+clean_sed '/^static void e100_setup_ucode(/,/^}$/ {
+  /^   } ucode_opts\[\] = {$/,/^       }[,;]/ {
+    s,D[^,]*_RCVBUNDLE_UCODE,/*DEBLOBBED*/{0},g;
+    s,D[^,]*_CPUSAVER_\(TIMER\|BUNDLE\|MIN_SIZE\)_DWORD,/*DEBLOBBED*/0,g;
+  }
+  /^   for ([^;]*ucode_opts[^{]*) {$/,/^       }$/ {
+    /^ }$/ i\
+       }\
+               DPRINTK(DRV, ERR, "Missing Free firmware\\n");\
+               /* ??? We should error out somehow.  */\
+               goto noloaducode;
+  }
+}
+' drivers/net/e100.c
 clean_blob drivers/net/e100.c
-if $have_check; then
-  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/e100.c
-else
-  clean_kconfig drivers/net/Kconfig 'E100'
-  clean_mk CONFIG_E100 drivers/net/Makefile
-fi
+clean_kconfig drivers/net/Kconfig 'E100'
+clean_mk CONFIG_E100 drivers/net/Makefile
 
 # MYRI_SBUS - MyriCOM Gigabit Ethernet
 clean_blob drivers/net/myri_code.h