Re-enable ACENIC and STARFIRE with no-firmware reporting.

2 files changed, 23 insertions, 4 deletions

diff --git a/scripts/deblob-2.6.28 b/scripts/deblob-2.6.28
index 63686440b..651a45357 100755
--- a/scripts/deblob-2.6.28
+++ b/scripts/deblob-2.6.28
@@ -454,19 +454,31 @@ 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
 
@@ -476,6 +488,7 @@ clean_blob drivers/net/bnx2_fw2.h
 clean_kconfig drivers/net/Kconfig 'BNX2'
 clean_mk CONFIG_BNX2 drivers/net/Makefile
 
+# BNX2X - Broadcom NetXtremeII 10Gb support
 clean_blob drivers/net/bnx2x_init_values.h
 clean_kconfig drivers/net/Kconfig 'BNX2X'
 clean_mk CONFIG_BNX2X drivers/net/Makefile
diff --git a/scripts/deblob-check b/scripts/deblob-check
index 65491719c..b8ea7e8bb 100755
--- a/scripts/deblob-check
+++ b/scripts/deblob-check
@@ -929,6 +929,12 @@ set_except () {
 
     blobna 'dabusb\/\(firmware\.fw\|bitstream\.bin\)' drivers/media/video/dabusb.c
 
+    blob 'static u32 tigon2\?Fw\(Text\|Rodata\|Data\)\[(MAX_\(TEXT\|RODATA\|DATA\)_LEN\/4) + 1\] __devinitdata = {[^}]*};\([\n]static u32 tigon2\?Fw\(Text\|Rodata\|Data\)\[(MAX_\(TEXT\|RODATA\|DATA\)_LEN\/4) + 1\] __devinitdata = {[^}]*};\)*' drivers/net/acenic_firwmare.h
+    blob '#define tigon2\?Fw[^ ]*\(Addr\|Len\) 0x[^\n]*\([\n]#define tigon2\?Fw[^ ]*\(Addr\|Len\) 0x[^\n]*\)\+' drivers/net/acenic_firmware.h
+    blob '\([/][*]\([^/]*\|[^*/][/]*\)*Do not try to clear\([^/]*\|[^*/][/]*\)*[*][/][\n]	\)\?ace_clear[^;]*;[\n]\([^}]*{[^}]*ace_copy[^}]*tigon2\?Fw[^}]*}\)*[\n]\+	return 0;[\n]}'
+
+    blob '#include "starfire_firmware\.h"' drivers/net/starfire.c
+    blob '[/][*]\([^/]*\|[^*/][/]*\)*Load Rx\/Tx firmware\([^/]*\|[^*/][/]*\)*[*][/]\([\n]	for ([^)]*FIRMWARE_[RT]X_SIZE[^)]*)[\n]		writel[^;]*firmware_[rt]x[^;]*;\)\+' drivers/net/starfire.c
 
     blobna '\(agere\|prism\)_\(sta\|ap\)_fw\.bin' drivers/net/wireless/orinoco.c
     blobna 'symbol_sp24t_\(prim\|sec\)_fw' drivers/net/wireless/orinoco.c