Fix deblobbing of VT6656 on 2.6.39, and of WLAGS49_H2 and WLAGS49_H25 from 2.6.33...

[releases.git] / deblob-2.6.36

diff --git a/deblob-2.6.36 b/deblob-2.6.36
index df8159119266b050c307d63797675c28c5ca5d10..1a56a4567dd769774f8af5bf28f8555c9faecfc0 100755 (executable)
--- a/deblob-2.6.36
+++ b/deblob-2.6.36
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#    Copyright (C) 2008, 2009, 2010 Alexandre Oliva <lxoliva@fsfla.org>
+#    Copyright (C) 2008, 2009, 2010, 2011 Alexandre Oliva <lxoliva@fsfla.org>
 #    Copyright (C) 2008 Jeff Moe
 #    Copyright (C) 2009 Rubén Rodríguez <ruben@gnu.org>
 #
@@ -1292,15 +1292,24 @@ clean_mk CONFIG_ORINOCO_USB drivers/net/wireless/orinoco/Makefile
 announce WLAGS49_H2 - 'Agere Systems HERMES II Wireless PC Card Model 0110'
 # Some pieces of the firmware images are most definitely data, but
 # others seem to be code.
-clean_file drivers/staging/wlags49_h2/ap_h2.c
-clean_file drivers/staging/wlags49_h2/sta_h2.c
+clean_blob drivers/staging/wlags49_h2/ap_h2.c
+clean_blob drivers/staging/wlags49_h2/sta_h2.c
+echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/ap_h2.c
+echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/sta_h2.c
 clean_blob drivers/staging/wlags49_h2/wl_profile.c
+clean_sed '
+  s,\(.*hcf_status = \)dhf_download_fw(.*&fw_image );,//& /*(DEBLOBBED)*/\n\1HCF_ERR_INCOMP_FW;,
+' drivers/staging/wlags49_h2/wl_main.c 'reject built-in non-Free firmware'
 clean_kconfig drivers/staging/wlags49_h2/Kconfig 'WLAGS49_H2'
 clean_mk CONFIG_WLAGS49_H2 drivers/staging/Makefile
 
 announce WLAGS49_H25 - 'Linksys Systems HERMES II.5 Wireless-G_CompactFlash_Card'
-clean_file drivers/staging/wlags49_h2/ap_h25.c
-clean_file drivers/staging/wlags49_h2/sta_h25.c
+# Some pieces of the firmware images are most definitely data, but
+# others seem to be code.
+clean_blob drivers/staging/wlags49_h2/ap_h25.c
+clean_blob drivers/staging/wlags49_h2/sta_h25.c
+echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/ap_h25.c
+echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/sta_h25.c
 clean_kconfig drivers/staging/wlags49_h25/Kconfig 'WLAGS49_H25'
 clean_mk CONFIG_WLAGS49_H25 drivers/staging/Makefile
 
@@ -1686,7 +1695,7 @@ clean_mk CONFIG_SERIAL_QE drivers/serial/Makefile
 announce TOUCHSCREEN_QT602240 - "QT602240 I2C Touchscreen"
 reject_firmware drivers/input/touchscreen/qt602240_ts.c
 clean_blob drivers/input/touchscreen/qt602240_ts.c
-clean_kconfig drivers/net/Kconfig 'TOUCHSCREEN_QT602240'
+clean_kconfig drivers/input/touchscreen/Kconfig 'TOUCHSCREEN_QT602240'
 clean_mk CONFIG_TOUCHSCREEN_QT602240 drivers/input/touchscreen/Makefile
 
 announce LIRC_ZILOG - "Zilog/Hauppauge IR Transmitter"