Updated for 2.6.34-rc5.

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@6820 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-2.6.34 b/deblob-2.6.34
index 2f7fee646184dff0e506c529bf55ea775f03bf1b..180c1b08d5dda887df4c1a249f88df55d25d5a85 100755 (executable)
--- a/deblob-2.6.34
+++ b/deblob-2.6.34
@@ -987,6 +987,12 @@ clean_blob drivers/net/cxgb3/cxgb3_main.c
 clean_kconfig drivers/net/Kconfig 'CHELSIO_T3'
 clean_mk CONFIG_CHELSIO_T3 drivers/net/cxgb3/Makefile
 
+announce CHELSIO_T4 - "Chelsio Communications T4 Ethernet support"
+reject_firmware drivers/net/cxgb4/cxgb4_main.c
+clean_blob drivers/net/cxgb4/cxgb4_main.c
+clean_kconfig drivers/net/Kconfig 'CHELSIO_T4'
+clean_mk CONFIG_CHELSIO_T4 drivers/net/cxgb4/Makefile
+
 announce E100 - "Intel PRO/100+"
 drop_fw_file firmware/e100/d101m_ucode.bin.ihex firmware/e100/d101m_ucode.bin
 drop_fw_file firmware/e100/d101s_ucode.bin.ihex firmware/e100/d101s_ucode.bin

diff --git a/deblob-check b/deblob-check
index c18157af36fa5c653c947895cb592b69325158bd..12c9be206e427aef348a87ea79ca0ce3294b664b 100755 (executable)
--- a/deblob-check
+++ b/deblob-check
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# deblob-check version 2010-04-18
+# deblob-check version 2010-04-19
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -2449,6 +2449,10 @@ set_except () {
 
   */patch*2.6.34-rc*)
     # New in 2.6.34, should be duplicated in the main pattern set.
+    blobname 'cxgb4[/]t4fw\.bin' drivers/net/cxgb4/cxgb4_main.c
+    defsnc '[  ]static[ ]const[ ]unsigned[ ]int[ ]reg_ranges\[\][ ]=' drivers/net/cxgb4/cxgb4_main.c
+    defsnc '[  ]static[ ]const[ ]unsigned[ ]int[ ]avg_pkts\[NCCTRL_WIN\][ ]=' drivers/net/cxgb4/t4_hw.c
+    # above in -rc5
     defsnc 'static[ ]u32[ ]epll_div\[\]\[5\][ ]=' arch/arm/mach-s5p6440/clock.c
     accept '[  ]aru->firmware[ ]=[ ]fw[;]' drivers/net/wireless/ath/ar9170/usb.c
     accept '[  ]err[ ]=[ ]request_firmware[(][&]fw_entry,[ ]["]broadsheet\.wbf["],[ ]dev[)][;]' drivers/video/broadsheetfb.c
@@ -2525,6 +2529,7 @@ set_except () {
     accept '[  ]\(err[ ]=\|return\)[ ]request_firmware\(_nowait\)\?[(][^\n]*["]ar9170\(-[12]\)\?\.fw["],' drivers/net/wireless/ar9170/usb.c
     accept '[  ]err[ ]=[ ]ar9170_usb_request_firmware[(]' drivers/net/wireless/ar9170/usb.c
     blobname '%s%[du]%s["],[\n         ]*name_pre,[ ]\(priv->fw_\)\?index,[ ]["]\.ucode' 'drivers/net/iwlwifi/iwl\(3945-base\|-agn\).c'
+    accept '#include[ ]["]ixp2400_[rt]x\.ucode["]' drivers/net/ixp2000/ixpdev.c
     ;;
 
   */patch*2.6.33-rc*)