X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.28;h=4c6bff6a0931bf856038f1cada81ac7d5c6c3587;hb=c9f872691c0c71ef58ba69b745c01d3dfb63d18c;hp=113eeaa93c5155124f53df05e2a991ed11bdf550;hpb=a46d5a6ae7b0742d18a23a373c668543509f9ac5;p=releases.git diff --git a/deblob-2.6.28 b/deblob-2.6.28 index 113eeaa93c51..4c6bff6a0931 100755 --- a/deblob-2.6.28 +++ b/deblob-2.6.28 @@ -53,7 +53,7 @@ esac check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check if [ ! -f $check ] ; then - echo optional deblob-check missing, will remove entire files >&2 + die deblob-check script missing, will remove entire files have_check=false else have_check=: @@ -171,6 +171,7 @@ clean_mk () { clean_sed () { #$1 = sed-script $2 = file + echo Cleaning "$2" with sed script "$1" sed -e "$1" "$2" > "$2".deblob check_changed "$2" } @@ -375,6 +376,20 @@ clean_blob drivers/media/dvb/dvb-usb/af9005-fe.c clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' clean_mk CONFIG_DVB_USB_AF9005 drivers/media/dvb/dvb-usb/Makefile +# dvb/frontends + +announce DVB_SP8870 - Spase sp8870 +clean_sed 's,SP8870_DEFAULT_FIRMWARE,NONFREE_FIRMWARE,g' drivers/media/dvb/frontends/sp8870.c +clean_blob drivers/media/dvb/frontends/sp8870.c +clean_kconfig drivers/media/dvb/frontends 'DVB_SP8870' +clean_mk CONFIG_DVB_SP8870 drivers/media/dvb/frontends/Makefile + +announce DVB_TDA1004X - Philips TDA10045H/TDA10046H +clean_sed 's,TDA1004[56]_DEFAULT_FIRMWARE,NONFREE_FIRMWARE,g' drivers/media/dvb/frontends/tda1004x.c +clean_blob drivers/media/dvb/frontends/tda1004x.c +clean_kconfig drivers/media/dvb/frontends 'DVB_TDA1004X' +clean_mk CONFIG_DVB_TDA1004X drivers/media/dvb/frontends/Makefile + # dvb/ttpci announce DVB_AV7110 - AV7110 cards @@ -389,62 +404,48 @@ clean_blob drivers/media/dvb/ttpci/av7110.c clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_AV7110' clean_mk CONFIG_DVB_AV7110 drivers/media/dvb/ttpci/Makefile -# DVB_BUDGET_AV - Budget cards with analog video inputs -clean_blob drivers/media/dvb/ttpci/budget-av.c -clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_AV' -clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_PATCH' -clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET' -clean_mk CONFIG_DVB_BUDGET_AV drivers/media/dvb/ttpci/Makefile -clean_mk CONFIG_DVB_BUDGET_PATCH drivers/media/dvb/ttpci/Makefile -clean_mk CONFIG_DVB_BUDGET drivers/media/dvb/ttpci/Makefile +announce DVB_BUDGET - Budget cards +clean_sed '/^static int alps_tdhd1_204_request_firmware(/,/^}$/s, request_firmware(, maybe_reject_firmware(,' drivers/media/dvb/ttpci/budget.c -# DVB_BUDGET_CI - Budget cards with onboard CI connector -clean_blob drivers/media/dvb/ttpci/budget-ci.c -clean_kconfig drivers/media/dvb/ttpci/Kconfig 'DVB_BUDGET_CI' -clean_mk CONFIG_DVB_BUDGET_CI drivers/media/dvb/ttpci/Makefile +announce DVB_BUDGET_AV - Budget cards with analog video inputs +clean_sed '/^static int philips_tu1216_request_firmware(/,/^}$/s, request_firmware(, maybe_reject_firmware(,' drivers/media/dvb/ttpci/budget-av.c + +announce DVB_BUDGET_CI - Budget cards with onboard CI connector +clean_sed '/^static int philips_tdm1316l_request_firmware(/,/^}$/s, request_firmware(, maybe_reject_firmware(,' drivers/media/dvb/ttpci/budget-ci.c # dvb/ttusb-budget -# DVB_TTUSB_BUDGET - Technotrend/Hauppauge Nova-USB devices +announce DVB_TTUSB_BUDGET - Technotrend/Hauppauge Nova-USB devices drop_fw_file firmware/ttusb-budget/dspbootcode.bin.ihex firmware/ttusb-budget/dspbootcode.bin +clean_sed '/^static int philips_tdm1316l_request_firmware(/,/^}$/s, request_firmware(, maybe_reject_firmware(,' drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +reject_firmware drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c clean_blob drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c clean_kconfig drivers/media/dvb/ttusb-budget/Kconfig 'DVB_TTUSB_BUDGET' clean_mk CONFIG_DVB_TTUSB_BUDGET drivers/media/dvb/ttusb-budget/Makefile # video -# USB_PWC - USB Philips Cameras -clean_blob drivers/media/video/pwc/pwc-kiara.c -clean_blob drivers/media/video/pwc/pwc-timon.c -clean_kconfig drivers/media/video/pwc/Kconfig 'USB_PWC' -clean_mk CONFIG_USB_PWC drivers/media/video/Makefile - -# VIDEO_CPIA - CPiA Video For Linux +announce VIDEO_CPIA2 - CPiA2 Video For Linux clean_fw firmware/cpia2/stv0672_vp4.bin.ihex firmware/cpia2/stv0672_vp4.bin -clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA' -clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA_PP' -clean_kconfig drivers/media/video/Kconfig 'VIDEO_CPIA_USB' +reject_firmware drivers/media/video/cpia2/cpia2_core.c +clean_blob drivers/media/video/cpia2/cpia2_core.c clean_kconfig drivers/media/video/cpia2/Kconfig 'VIDEO_CPIA2' -clean_mk CONFIG_VIDEO_CPIA drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA_PP drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA_USB drivers/media/video/Makefile -clean_mk CONFIG_VIDEO_CPIA2 drivers/media/video/Makefile +clean_mk CONFIG_VIDEO_CPIA2 drivers/media/video/cpia2/Makefile -# USB_DABUSB - DABUSB driver +announce USB_DABUSB - DABUSB driver clean_fw firmware/dabusb/bitstream.bin.ihex firmware/dabusb/bitstream.bin clean_fw firmware/dabusb/firmware.HEX firmware/dabusb/firmware.fw +reject_firmware drivers/media/video/dabusb.c +clean_blob drivers/media/video/dabusb.c clean_kconfig drivers/media/Kconfig 'USB_DABUSB' clean_mk CONFIG_USB_DABUSB drivers/media/video/Makefile # video/usbvideo -# USB_IBMCAM - USB IBM (Xirlink) C-it Camera support -clean_blob drivers/media/video/usbvideo/ibmcam.c -clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_IBMCAM' -clean_mk CONFIG_USB_IBMCAM drivers/media/video/usbvideo/Makefile - -# USB_VICAM - USB 3com HomeConnect (aka vicam) +announce USB_VICAM - USB 3com HomeConnect, AKA vicam drop_fw_file firmware/vicam/firmware.H16 firmware/vicam/firmware.fw +reject_firmware drivers/media/video/vicam.c +clean_blob drivers/media/video/vicam.c clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_VICAM' clean_mk CONFIG_USB_VICAM drivers/media/video/usbvideo/Makefile @@ -453,54 +454,92 @@ 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 -# BNX2 - Broadcom NetXtremeII -clean_blob drivers/net/bnx2_fw.h -clean_blob drivers/net/bnx2_fw2.h +announce BNX2 - Broadcom NetXtremeII +clean_file drivers/net/bnx2_fw.h +clean_file drivers/net/bnx2_fw2.h +clean_sed '/ bnx2_init_cpus(/i\ + printk (KERN_ERR "%s: Missing Free firmware\\n", bp->dev->name);\ + return -EINVAL;\ +#define bnx2_init_cpus(bp) (-EINVAL)' drivers/net/bnx2.c +clean_blob drivers/net/bnx2.c clean_kconfig drivers/net/Kconfig 'BNX2' clean_mk CONFIG_BNX2 drivers/net/Makefile +announce BNX2X - Broadcom NetXtremeII 10Gb support clean_blob drivers/net/bnx2x_init_values.h +clean_blob drivers/net/bnx2x_init.h +clean_sed '/^#include "bnx2x_init\.h"/,/^$/ {/^$/i\ +#define bnx2x_init_block(bp, start, end) \\\ + return printk(KERN_ERR PFX "%s: Missing Free firmware\\n", bp->dev->name),\ + -EINVAL; +}' drivers/net/bnx2x_main.c clean_kconfig drivers/net/Kconfig 'BNX2X' clean_mk CONFIG_BNX2X drivers/net/Makefile -# CASSINI - Sun Cassini +announce CASSINI - Sun Cassini drop_fw_file firmware/sun/cassini.bin.ihex firmware/sun/cassini.bin +reject_firmware drivers/net/cassini.c +clean_blob drivers/net/cassini.c clean_kconfig drivers/net/Kconfig 'CASSINI' clean_mk CONFIG_CASSINI drivers/net/Makefile -# CHELSIO_T3 - Chelsio AEL 2005 support +announce CHELSIO_T3 - Chelsio AEL 2005 support +clean_sed '/^static int ael2005_setup_\(sr\|twinax\)_edc(/,/^}$/ { + /for.*ARRAY_SIZE(\(sr\|twinax\)_edc)/i\ +}\ + CH_ERR(phy->adapter, "Missing Free firwmare\\n");\ + err = -EINVAL; +}' drivers/net/cxgb3/ael1002.c clean_blob drivers/net/cxgb3/ael1002.c -if $have_check; then - : -else - clean_kconfig drivers/net/Kconfig 'CHELSIO_T3' - clean_mk CONFIG_CHELSIO_T3 drivers/net/cxgb3/Makefile -fi - -# E100 - Intel(R) PRO/100+ +clean_kconfig drivers/net/Kconfig 'CHELSIO_T3' +clean_mk CONFIG_CHELSIO_T3 drivers/net/cxgb3/Makefile + +announce E100 - Intel PRO/100+ +clean_sed '/^static void e100_setup_ucode(/,/^}$/ { + /^ } ucode_opts\[\] = {$/,/^ }[,;]/ { + s,D[^,]*_RCVBUNDLE_UCODE,/*DEBLOBBED*/{0},g; + s,D[^,]*_CPUSAVER_\(TIMER\|BUNDLE\|MIN_SIZE\)_DWORD,/*DEBLOBBED*/0,g; + } + /^ for ([^;]*ucode_opts[^{]*) {$/,/^ }$/ { + /^ }$/ i\ + }\ + DPRINTK(DRV, ERR, "Missing Free firmware\\n");\ + /* ??? We should error out somehow. */\ + goto noloaducode; + } +} +' drivers/net/e100.c clean_blob drivers/net/e100.c -if $have_check; then - sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/e100.c -else - clean_kconfig drivers/net/Kconfig 'E100' - clean_mk CONFIG_E100 drivers/net/Makefile -fi +clean_kconfig drivers/net/Kconfig 'E100' +clean_mk CONFIG_E100 drivers/net/Makefile # MYRI_SBUS - MyriCOM Gigabit Ethernet clean_blob drivers/net/myri_code.h