X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.37;h=56ea6a69da0bf8ee4ac0a1bba5188baf842ccec1;hb=536972110257d65fd73347cee40597b832be1c81;hp=001224aa65353fe092dfe5d30a695f5ba7dee0d8;hpb=f22adcd39f32ac216dd573bb3c10863340a0ee17;p=releases.git

diff --git a/deblob-2.6.37 b/deblob-2.6.37
index 001224aa6535..56ea6a69da0b 100755
--- a/deblob-2.6.37
+++ b/deblob-2.6.37
@@ -1011,7 +1011,7 @@ clean_blob drivers/net/starfire.c
 clean_kconfig drivers/net/Kconfig 'ADAPTEC_STARFIRE'
 clean_mk CONFIG_ADAPTEC_STARFIRE drivers/net/Makefile
 
-announce CONFIG_BNA - "Brocade 1010/1020 10Gb Ethernet Driver support"
+announce BNA - "Brocade 1010/1020 10Gb Ethernet Driver support"
 clean_blob drivers/net/bna/bnad.c
 clean_blob drivers/net/bna/cna.h
 reject_firmware drivers/net/bna/cna_fwimg.c
@@ -1362,18 +1362,27 @@ clean_blob drivers/net/wireless/orinoco/orinoco_usb.c
 clean_kconfig drivers/net/wireless/orinoco/Kconfig 'ORINOCO_USB'
 clean_mk CONFIG_ORINOCO_USB drivers/net/wireless/orinoco/Makefile
 
-announce WLAGS49_H2 - 'Agere Systems HERMES II Wireless PC Card Model 0110'
+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
+announce WLAGS49_H25 - "Linksys Systems HERMES II.5 Wireless-G_CompactFlash_Card"
+# 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
 
@@ -1477,7 +1486,7 @@ clean_blob drivers/net/wireless/libertas_tf/if_usb.c
 clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_THINFIRM_USB'
 clean_mk CONFIG_LIBERTAS_THINFIRM_USB drivers/net/wireless/libertas_tf/Makefile
 
-announce MWL8K - 'Marvell 88W8xxx PCI/PCIe Wireless support'
+announce MWL8K - "Marvell 88W8xxx PCI/PCIe Wireless support"
 reject_firmware drivers/net/wireless/mwl8k.c
 clean_blob drivers/net/wireless/mwl8k.c
 clean_kconfig drivers/net/wireless/Kconfig 'MWL8K'
@@ -1530,7 +1539,7 @@ clean_blob drivers/net/wireless/p54/p54usb.h
 clean_kconfig drivers/net/wireless/p54/Kconfig 'P54_USB'
 clean_mk CONFIG_P54_USB drivers/net/wireless/p54/Makefile
 
-announce PRISM54 - 'Intersil Prism GT/Duette/Indigo PCI/Cardbus'
+announce PRISM54 - "Intersil Prism GT/Duette/Indigo PCI/Cardbus"
 reject_firmware drivers/net/wireless/prism54/islpci_dev.c
 clean_blob drivers/net/wireless/prism54/islpci_dev.c
 clean_kconfig drivers/net/wireless/Kconfig 'PRISM54'