X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.29;h=4fdec795fad4d4c3b34a9976c66636e20c8d9dff;hb=d7f8ffd6945e762f59be5031698883772005cbd3;hp=30bd133b338e49c60050ab8d207e8767e697e9df;hpb=ab3f05f8ec731d2c3c0ed3ec9c086c5a400bcca8;p=releases.git

diff --git a/deblob-2.6.29 b/deblob-2.6.29
index 30bd133b338e..4fdec795fad4 100755
--- a/deblob-2.6.29
+++ b/deblob-2.6.29
@@ -190,7 +190,7 @@ clean_sed () {
   filetest $2 || return
   sed -e "$1" "$2" > "$2".deblob || {
     die $2: failed: ${3-applied sed script $1} && return 1; }
-  check_changed $2 && echo $2: ${3-applied sed script $1} 
+  check_changed $2 && echo $2: ${3-applied sed script $1}
 }
 
 reject_firmware () {
@@ -973,15 +973,31 @@ clean_kconfig drivers/net/Kconfig 'SPIDER_NET'
 clean_mk CONFIG_SPIDER_NET drivers/net/Makefile
 
 announce SXG - "Alacritech SLIC Technology Non-Accelerated 10Gbe cards"
-clean_blob drivers/staging/sxg/saharadbgdownload.h
-clean_blob drivers/staging/sxg/sxgphycode.h
+clean_file drivers/staging/sxg/saharadbgdownload.h
+clean_file drivers/staging/sxg/sxgphycode.h
 clean_sed '
+/^static bool sxg_download_microcode(/,/^}$/{
+  /^{$/{
+    p
+    i\
+#if 1\
+	printk(KERN_ERR KBUILD_MODNAME ": missing Free firmware\\n");\
+	return (FALSE);\
+#else
+    d
+  }
+  /^}/{
+    i\
+#endif
+  }
+}
 /^static int sxg_phy_init(/,/^}$/{
   /for (p = PhyUcode/i\
-		printk("%s: missing Free firmware\n");\
+		printk(KERN_ERR KBUILD_MODNAME ": missing Free firmware\\n");\
 		return (STATUS_FAILURE);\
-#define PhyUcode NULL		
+#define PhyUcode NULL
 }' drivers/staging/sxg/sxg.c 'report missing Free firmware'
+clean_blob drivers/staging/sxg/sxg.c
 clean_kconfig drivers/staging/sxg/Kconfig 'SXG'
 clean_mk CONFIG_SXG drivers/staging/sxg/Makefile
 
@@ -1402,6 +1418,14 @@ clean_mk CONFIG_SERIAL_QE drivers/serial/Makefile
 announce ME4000 - "Meilhaus ME-4000 I/O board"
 clean_file drivers/staging/me4000/me4000_firmware.h
 clean_file drivers/staging/me4000/me4610_firmware.h
+clean_sed '
+/^static int me4000_xilinx_download([^;]*$/,/^}$/{
+  /firm = .*xilinx_firm.*/i\
+	printk(KERN_ERR "me4000: Missing Free firmware\\n");\
+	return -EIO;
+}
+' drivers/staging/me4000/me4000.c 'report missing Free firmware'
+clean_blob drivers/staging/me4000/me4000.c
 clean_kconfig drivers/staging/me4000/Kconfig 'ME4000'
 clean_mk CONFIG_ME4000 drivers/staging/me4000/Makefile