X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.28;h=4c6bff6a0931bf856038f1cada81ac7d5c6c3587;hb=c9f872691c0c71ef58ba69b745c01d3dfb63d18c;hp=a2044ce1e3ef64a900a624c44080a57de3e8204e;hpb=f4ed8aa367b05d4b4cccf7adeecf496f7a0186bc;p=releases.git diff --git a/deblob-2.6.28 b/deblob-2.6.28 index a2044ce1e3ef..4c6bff6a0931 100755 --- a/deblob-2.6.28 +++ b/deblob-2.6.28 @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright (C) 2008 Jeff Moe # Copyright (C) 2008, 2009 Alexandre Oliva +# Copyright (C) 2008 Jeff Moe # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -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=: @@ -140,6 +140,16 @@ drop_fw_file () { clean_kconfig () { #$1 = filename $2 = things to remove + case $1 in + -f) + shift + ;; + *) + if $have_check; then + return + fi + ;; + esac echo Marking config $2 as depending on NONFREE in $1 sed "/^config \\($2\\)\$/{p;i\ depends on NONFREE @@ -161,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" } @@ -215,7 +226,7 @@ done # Identify the tarball. clean_sed "s,^EXTRAVERSION.*,&-libre$extra," Makefile -# Add reject_firmware and check_reject_firmware +# Add reject_firmware and maybe_reject_firmware cat >> include/linux/firwmare.h <<\EOF #ifndef _LINUX_LIBRE_FIRMWARE_H #define _LINUX_LIBRE_FIRMWARE_H @@ -282,14 +293,14 @@ announce ATM_AMBASSADOR - Madge Ambassador, Collage PCI 155 Server reject_firmware drivers/atm/ambassador.c clean_blob drivers/atm/ambassador.c clean_fw firmware/atmsar11.HEX firmware/atmsar11.fw -$have_check || clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR' +clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR' clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile announce ATM_FORE200E_PCA, ATM_FORE200E_SBA - SBA-200E reject_firmware drivers/atm/fore200e.c clean_blob drivers/atm/fore200e.c clean_blob Documentation/networking/fore200e.txt -$have_check || clean_kconfig drivers/atm/Kconfig 'ATM_FORE.*' +clean_kconfig drivers/atm/Kconfig 'ATM_FORE.*' clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile @@ -297,24 +308,51 @@ clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile # Removed char Drivers # ######################## -# COMPUTONE - Computone IntelliPort Plus serial +announce COMPUTONE - Computone IntelliPort Plus serial drop_fw_file firmware/intelliport2.bin.ihex firmware/intelliport2.bin +reject_firmware drivers/char/ip2/ip2main.c +clean_blob drivers/char/ip2/ip2main.c clean_kconfig drivers/char/Kconfig 'COMPUTONE' clean_mk CONFIG_COMPUTONE drivers/char/Makefile # gpu drm -# DRM_MGA - Matrox g200/g400 +announce DRM_MGA - Matrox g200/g400 clean_blob drivers/gpu/drm/mga/mga_ucode.h +clean_blob drivers/gpu/drm/mga/mga_warp.c clean_kconfig drivers/gpu/drm/Kconfig 'DRM_MGA' clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile -# DRM_R128 - ATI Rage 128 +announce DRM_R128 - ATI Rage 128 +clean_sed '/^static int r128_do_init_cce(/,/^}$/{ + /^ r128_cce_load_microcode(dev_priv);$/{ + i\ + DRM_ERROR("Missing Free microcode!\\n");\ + dev->dev_private = (void *)dev_priv;\ + r128_do_cleanup_cce(dev);\ + return -EINVAL; + } +}' drivers/gpu/drm/r128/r128_cce.c clean_blob drivers/gpu/drm/r128/r128_cce.c clean_kconfig drivers/gpu/drm/Kconfig 'DRM_R128' clean_mk CONFIG_DRM_R128 drivers/gpu/drm/Makefile -# DRM_RADEON - ATI Radeon +announce DRM_RADEON - ATI Radeon +clean_sed '/^static int radeon_do_init_cce(/,/^}$/{ + /^ radeon_cp_load_microcode(dev_priv);$/{ + i\ + DRM_ERROR("Missing Free microcode!\\n");\ + radeon_do_cleanup_cp(dev);\ + return -EINVAL; + } +} +/^static int radeon_do_resume_cp(/,/^}$/{ + /^ radeon_cp_load_microcode(dev_priv);$/{ + i\ + DRM_ERROR("Missing Free microcode!\\n");\ + return -EINVAL; + } +}' drivers/gpu/drm/radeon/radeon_cp.c clean_blob drivers/gpu/drm/radeon/radeon_microcode.h clean_kconfig drivers/gpu/drm/Kconfig 'DRM_RADEON' clean_mk CONFIG_DRM_RADEON drivers/gpu/drm/Makefile @@ -325,97 +363,89 @@ clean_mk CONFIG_DRM_RADEON drivers/gpu/drm/Makefile ######################### -# dvb/dvb-usb -clean_blob drivers/media/dvb/dvb-usb/af9005-script.h +announce DVB non-Free firmware scripts and documentation +clean_blob Documentation/dvb/get_dvb_firmware +clean_blob Documentation/dvb/avermedia.txt +clean_blob Documentation/dvb/opera-firmware.txt +clean_blob Documentation/dvb/ttusb-dec.txt + +announce DVB_USB_AF9005 - Afatech AF9005 DVB-T USB1.1 +clean_file drivers/media/dvb/dvb-usb/af9005-script.h +clean_sed 's,^ deb_info("load init script\\n");$, {\n err("Missing Free init script\\n");\n return scriptlen = ret = -EINVAL;\n ,' drivers/media/dvb/dvb-usb/af9005-fe.c +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 -# DVB_TDA10021 - Philips TDA10021 based -clean_blob drivers/media/dvb/frontends/tda10021.c -clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_TDA10021' -clean_mk CONFIG_DVB_TDA10021 drivers/media/dvb/frontends/Makefile - -# DVB_TDA8083 - Philips TDA8083 based -clean_blob drivers/media/dvb/frontends/tda8083.c -clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_TDA8083' -clean_mk CONFIG_DVB_TDA8083 drivers/media/dvb/frontends/Makefile - -# DVB_VES1820 - VLSI VES1820 based -clean_blob drivers/media/dvb/frontends/ves1820.c -clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_VES1820' -clean_mk CONFIG_DVB_VES1820 drivers/media/dvb/frontends/Makefile +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 -# DVB_VES1X93 - VLSI VES1893 or VES1993 based -clean_blob drivers/media/dvb/frontends/ves1x93.c -clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_VES1X93' -clean_mk CONFIG_DVB_VES1X93 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 -# DVB_AV7110 - AV7110 cards +announce DVB_AV7110 - AV7110 cards +# The bootcode is actually Free Software under GPLv2, but since it's +# being distributed without source code, we're taking it out for now. +clean_sed 's,^ \/\* boot \*\/$, printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): Missing Free bootcode\\n");\n return -EINVAL;\n\n&,' drivers/media/dvb/ttpci/av7110_hw.c +clean_sed 's,mwdebi(.*bootcode.*$,/* & */,' drivers/media/dvb/ttpci/av7110_hw.c clean_blob drivers/media/dvb/ttpci/av7110_hw.c +clean_sed '/^static int get_firmware(/,/^}$/s, request_firmware(, reject_firmware(,' drivers/media/dvb/ttpci/av7110.c +clean_sed '/^static int alps_tdlb7_request_firmware(/,/^}$/s, request_firmware(, maybe_reject_firmware(,' drivers/media/dvb/ttpci/av7110.c 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 @@ -424,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