X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.26;h=e86f0581fea77c19134cb2f8703e79ba81891314;hb=40e4f89f2d1f51071a7353c4ccf27e8dde6e3005;hp=5b8361177ea46345cf0f6399b1bf6296daa7c996;hpb=d7f8ffd6945e762f59be5031698883772005cbd3;p=releases.git diff --git a/deblob-2.6.26 b/deblob-2.6.26 index 5b8361177ea4..e86f0581fea7 100755 --- a/deblob-2.6.26 +++ b/deblob-2.6.26 @@ -1,9 +1,13 @@ #!/bin/sh -# Copyright (C) 2008, 2009 Alexandre Oliva +# Copyright (C) 2008-2013 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # +# This program is part of GNU Linux-libre, a GNU project that +# publishes scripts to clean up Linux so as to make it suitable for +# use in the GNU Project and in Free System Distributions. +# # 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 # the Free Software Foundation; either version 2 of the License, or @@ -37,15 +41,14 @@ # See also: # http://wiki.debian.org/KernelFirmwareLicensing # svn://svn.debian.org/kernel/dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 -# http://svn.gnewsense.svnhopper.net/gnewsense/builder/trunk/firmware/firmware-removed -# http://svn.gnewsense.svnhopper.net/gnewsense/builder/trunk/gen-kernel +# http://wiki.gnewsense.org/Builder gen-kernel # Thanks to Brian Brazil @ gnewsense # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. -kver=2.6.26 extra=2++WIP +kver=2.6.26 extra=0++WIP case $1 in --force) @@ -77,6 +80,7 @@ if [ ! -f $check ] ; then have_check=false else have_check=: + [ -x $check ] || check="/bin/sh $check" fi filetest () { @@ -113,48 +117,19 @@ clean_blob () { name=$1 set fnord "$@" -d shift 2 - $check "$@" -i linux-$kver $name > $name.deblob + if $check "$@" -i linux-$kver $name > $name.deblob; then + if [ ! -s $name.deblob ]; then + die got an empty file after removing blobs from $name + fi + else + die failed removing blobs from $name + fi check_changed $name && echo $name: removed blobs else clean_file $1 fi } -# *** drop this -dummy_blob () { - #$1 = filename - if test -f $1; then - die $1 exists, something is wrong && return - elif test ! -f firmware/Makefile; then - die firmware/Makefile does not exist, something is wrong && return - fi - - clean_sed "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \ - firmware/Makefile "dropped $1" -} - -# *** drop this -clean_fw () { - #$1 = firmware text input, $2 = firmware output - filetest $1 || return - if test -f $2; then - die $2 exists, something is wrong && return - fi - clean_blob $1 -s 4 - dummy_blob $2 -} - -# *** drop this -drop_fw_file () { - #$1 = firmware text input, $2 = firmware output - filetest $1 || return - if test -f $2; then - die $2 exists, something is wrong && return - fi - clean_file $1 - dummy_blob $2 -} - clean_kconfig () { #$1 = filename $2 = things to remove case $1 in @@ -208,13 +183,21 @@ clean_sed () { } reject_firmware () { - #$1 = file + #$1 = file $2 = pre sed pattern filetest $1 || return - clean_sed ' + clean_sed "$2"' s,request\(_ihex\)\?_firmware\(_nowait\)\?,reject_firmware\2,g ' "$1" 'disabled non-Free firmware-loading machinery' } +maybe_reject_firmware () { + #$1 = file $2 = pre sed pattern + filetest $1 || return + clean_sed "$2"' +s,request_firmware\(_nowait\)\?,maybe_reject_firmware\1,g +' "$1" 'retain Free firmware-loading machinery, disabling non-Free one' +} + undefine_macro () { #$1 - macro name #$2 - substitution @@ -251,16 +234,14 @@ for f in \ drivers/net/wan/wanxlfw.S \ drivers/net/wireless/atmel.c \ drivers/net/wireless/atmel.c \ - drivers/scsi/53c700_d.h_shipped \ - drivers/scsi/53c700.scr \ drivers/scsi/aic7xxx/aic79xx_seq.h_shipped \ drivers/scsi/aic7xxx/aic79xx.seq \ drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped \ drivers/scsi/aic7xxx/aic7xxx.seq \ drivers/scsi/aic7xxx_old/aic7xxx_seq.c \ drivers/scsi/aic7xxx_old/aic7xxx.seq \ - drivers/scsi/53c7xx_d.h_shipped \ - drivers/scsi/53c7xx.scr \ + drivers/scsi/53c700_d.h_shipped \ + drivers/scsi/53c700.scr \ drivers/scsi/sym53c8xx_2/sym_fw1.h \ drivers/scsi/sym53c8xx_2/sym_fw1.h \ drivers/scsi/sym53c8xx_2/sym_fw2.h \ @@ -272,15 +253,52 @@ for f in \ sound/pci/cs46xx/imgs/cwcdma.h \ sound/pci/cs46xx/imgs/cwcdma.asp \ ; do - if test ! $f; then - die $f is not present, something is amiss && return - fi + filetest $f done # Identify the tarball. -grep -q 'EXTRAVERSION.*-libre' Makefile || -clean_sed "s,^EXTRAVERSION.*,&-libre$extra, -" Makefile 'added -libre to EXTRAVERSION' +grep -q 'EXTRAVERSION.*-gnu' Makefile || +clean_sed "s,^EXTRAVERSION.*,&-gnu$extra, +" Makefile 'added -gnu to EXTRAVERSION' + +grep -q Linux-libre README || +clean_sed ' +1,3 s,Linux kernel release.*kernel\.org.*,GNU Linux-libre , +2,5 s,Linux version [0-9.]*,GNU Linux-libre, +1,20 s,\(operating system \)\?Unix,Unix kernel, +/WHAT IS LINUX/i\ +WHAT IS GNU Linux-libre?\ +\ + GNU Linux-libre is a Free version of the kernel Linux (see below),\ + suitable for use with the GNU Operating System in 100% Free\ + GNU/Linux-libre System Distributions.\ + http://www.gnu.org/distros/\ +\ + It removes non-Free components from Linux, that are disguised as\ + source code or distributed in separate files. It also disables\ + run-time requests for non-Free components, shipped separately or as\ + part of Linux, and documentation pointing to them, so as to avoid\ + (Free-)baiting users into the trap of non-Free Software.\ + http://www.fsfla.org/anuncio/2010-11-Linux-2.6.36-libre-debait\ +\ + Linux-libre started within the gNewSense GNU/Linux distribution.\ + It was later adopted by Jeff Moe, who coined its name, and in 2008\ + it became a project maintained by FSF Latin America. In 2012, it\ + became part of the GNU Project.\ +\ + The GNU Linux-libre project takes a minimal-changes approach to\ + cleaning up Linux, making no effort to substitute components that\ + need to be removed with functionally equivalent Free ones.\ + Nevertheless, we encourage and support efforts towards doing so.\ + http://libreplanet.org/wiki/LinuxLibre:Devices_that_require_non-free_firmware\ +\ + Our mascot is Freedo, a light-blue penguin that has just come out\ + of the shower. Although we like penguins, GNU is a much greater\ + contribution to the entire system, so its mascot deserves more\ + promotion. See our web page for their images.\ + http://linux-libre.fsfla.org/\ + +' README 'added blurb about GNU Linux-libre' # Add reject_firmware and maybe_reject_firmware grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || @@ -392,9 +410,8 @@ clean_mk CONFIG_ARCH_NETX arch/arm/Makefile announce ATM_AMBASSADOR - "Madge Ambassador, Collage PCI 155 Server" clean_file drivers/atm/atmsar11.data -clean_file drivers/atm/atmsar11.regions -s 6 -clean_file drivers/atm/atmsar11.start -s 1 -# *** testme +clean_file drivers/atm/atmsar11.regions +clean_file drivers/atm/atmsar11.start clean_sed ' /^static int __devinit ucode_init *(/,/^}$/{ s,ucode_\(start\|regions\[i\]\.\(start\|count\)\|data\),0,g; @@ -417,7 +434,7 @@ clean_file drivers/atm/sba200e_ecd.data # *** testme clean_sed ' /^static const struct fore200e_bus fore200e_bus\[\] =/,/^};$/{ - s,[&]\?_fore200e_\(pca\|sba\)_fw_\(data\|size\),NULL,; + s,[&]\?_fore200e_\(pca\|sba\)_fw_\(data\|size\),NULL,g; }' drivers/atm/fore200e.c 'removed non-Free firmware' clean_sed ' /^fore200e_load_fw(/,/^}$/{ @@ -431,7 +448,7 @@ clean_sed ' }' drivers/atm/fore200e.c 'removed non-Free firmware' clean_blob drivers/atm/fore200e.c clean_blob Documentation/networking/fore200e.txt -clean_sed 's,\(\(\(pca\|sba\)200e\(\$(if.*,\)\?\(_ecd\)\?\.bin[12]\?\|fore200e_\(pca\|sba\)_fw\.o\)[ )]\?\)\+,/*(DEBLOBBED)*/,g' \ +clean_sed 's:\(\(\(pca\|sba\)200e\(\$(if.*[,]\)\?\(_ecd\)\?\.bin[12]\?\|fore200e_\(pca\|sba\)_fw\.o\)[ )]\?\)\+:/*(DEBLOBBED)*/:g' \ drivers/atm/Makefile 'removed non-Free firmware names' clean_kconfig drivers/atm/Kconfig 'ATM_FORE200E' clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile @@ -476,14 +493,15 @@ clean_mk CONFIG_MOXA_INTELLIO drivers/char/Makefile # gpu drm 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 -f drivers/gpu/drm/Kconfig 'DRM_MGA' -clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile +clean_blob drivers/char/drm/mga_ucode.h +clean_blob drivers/char/drm/mga_warp.c +clean_kconfig -f drivers/char/drm/Kconfig 'DRM_MGA' +clean_mk CONFIG_DRM_MGA drivers/char/drm/Makefile announce DRM_R128 - "ATI Rage 128" clean_sed ' -/^static void r128_cce_load_microcode(drm_r128_private_t \* dev_priv)/i\ +/^static void r128_cce_load_microcode(drm_r128_private_t \* dev_priv)/{ + i\ #define r128_cce_load_microcode(dev_priv) \\\ do { \\\ DRM_ERROR("Missing Free microcode!\\n"); \\\ @@ -491,22 +509,23 @@ clean_sed ' r128_do_cleanup_cce(dev); \\\ return -EINVAL; \\\ } while (0) -}' drivers/gpu/drm/r128/r128_cce.c 'report missing Free microcode' +}' drivers/char/drm/r128_cce.c 'report missing Free microcode' clean_blob drivers/char/drm/r128_cce.c clean_kconfig -f drivers/char/drm/Kconfig 'DRM_R128' clean_mk CONFIG_DRM_R128 drivers/char/drm/Makefile announce DRM_RADEON - "ATI Radeon" clean_sed ' -/^static void radeon_cp_load_microcode(drm_radeon_private_t \* dev_priv)/i\ +/^static void radeon_cp_load_microcode(drm_radeon_private_t \* dev_priv)/{ + i\ #define radeon_cp_load_microcode(dev_priv) \\\ do { \\\ DRM_ERROR("Missing Free microcode!\\n"); \\\ radeon_do_cleanup_cp(dev); \\\ return -EINVAL; \\\ } while (0) -}' drivers/char/drm/radeon/radeon_cp.c 'report missing Free microcode' -clean_blob drivers/char/drm/radeon/radeon_cp.c +}' drivers/char/drm/radeon_cp.c 'report missing Free microcode' +clean_blob drivers/char/drm/radeon_cp.c clean_blob drivers/char/drm/radeon_microcode.h clean_kconfig -f drivers/char/drm/Kconfig 'DRM_RADEON' clean_mk CONFIG_DRM_RADEON drivers/char/drm/Makefile @@ -544,15 +563,6 @@ reject_firmware drivers/media/dvb/dvb-usb/dvb-usb-firmware.c clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB' clean_mk CONFIG_DVB_USB drivers/media/dvb/dvb-usb/Makefile -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 'report missing Free init script' -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 - announce DVB_B2C2_FLEXCOP - "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters" reject_firmware drivers/media/dvb/b2c2/flexcop-fe-tuner.c @@ -565,6 +575,11 @@ clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_A800' clean_mk CONFIG_DVB_USB_A800 drivers/media/dvb/dvb-usb/Makefile announce DVB_USB_AF9005 - "Afatech AF9005 DVB-T USB1.1 support" +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 'report missing Free init script' +clean_blob drivers/media/dvb/dvb-usb/af9005-fe.c clean_blob drivers/media/dvb/dvb-usb/af9005.c clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9005' clean_mk CONFIG_DVB_USB_AF9005 drivers/media/dvb/dvb-usb/Makefile @@ -599,12 +614,6 @@ clean_blob drivers/media/dvb/dvb-usb/dtt200u.c clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_DTT200U' clean_mk CONFIG_DVB_USB_DTT200U drivers/media/dvb/dvb-usb/Makefile -announce DVB_USB_DW2102 - "DvbWorld DVB-S/S2 USB2.0 support" -reject_firmware drivers/media/dvb/dvb-usb/dw2102.c -clean_blob drivers/media/dvb/dvb-usb/dw2102.c -clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_DW2102' -clean_mk CONFIG_DVB_USB_DW2102 drivers/media/dvb/dvb-usb/Makefile - announce DVB_USB_GP8PSK - "GENPIX 8PSK->USB module support" reject_firmware drivers/media/dvb/dvb-usb/gp8psk.c clean_blob drivers/media/dvb/dvb-usb/gp8psk.c @@ -742,29 +751,14 @@ reject_firmware drivers/media/dvb/ttpci/budget-av.c announce DVB_BUDGET_CI - "Budget cards with onboard CI connector" reject_firmware drivers/media/dvb/ttpci/budget-ci.c -announce DVB_DRX397XD - "Micronas DRX3975D/DRX3977D based" -reject_firmware drivers/media/dvb/frontends/drx397xD.c -clean_blob drivers/media/dvb/frontends/drx397xD_fw.h -clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_DRX397XD' -clean_mk CONFIG_DVB_DRX397XD drivers/media/dvb/frontends/Makefile - announce DVB_PLUTO2 - "Pluto2 cards" reject_firmware drivers/media/dvb/pluto2/pluto2.c -announce DVB_SIANO_SMS1XXX - "Siano SMS1XXX USB dongle support" -reject_firmware drivers/media/dvb/siano/smscoreapi.c -reject_firmware drivers/media/dvb/siano/smsusb.c -clean_blob drivers/media/dvb/siano/smscoreapi.c -clean_blob drivers/media/dvb/siano/smsusb.c -clean_blob drivers/media/dvb/siano/sms-cards.c -clean_kconfig drivers/media/dvb/siano/Kconfig 'DVB_SIANO_SMS1XXX' -clean_mk CONFIG_DVB_SIANO_SMS1XXX drivers/media/dvb/siano/Makefile - announce DVB_TTUSB_BUDGET - "Technotrend/Hauppauge Nova-USB devices" # *** clean_blob drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h -drop_fw_file firmware/ttusb-budget/dspbootcode.bin.ihex firmware/ttusb-budget/dspbootcode.bin 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 @@ -772,6 +766,7 @@ clean_mk CONFIG_DVB_TTUSB_BUDGET drivers/media/dvb/ttusb-budget/Makefile announce DVB_TTUSB_DEC - "Technotrend/Hauppauge USB DEC devices" reject_firmware drivers/media/dvb/ttusb-dec/ttusb_dec.c clean_blob drivers/media/dvb/ttusb-dec/ttusb_dec.c +clean_blob Documentation/dvb/ttusb-dec.txt clean_kconfig drivers/media/dvb/ttusb-dec/Kconfig 'DVB_TTUSB_DEC' clean_mk CONFIG_DVB_TTUSB_DEC drivers/media/dvb/ttusb-dec/Makefile @@ -779,11 +774,14 @@ clean_mk CONFIG_DVB_TTUSB_DEC drivers/media/dvb/ttusb-dec/Makefile announce VIDEO_BT848 - "BT848 Video For Linux" reject_firmware drivers/media/video/bt8xx/bttv-cards.c +clean_blob drivers/media/video/bt8xx/bttv-cards.c +clean_blob Documentation/video4linux/bttv/README clean_kconfig drivers/media/video/bt8xx/Kconfig 'VIDEO_BT848' clean_mk CONFIG_VIDEO_BT848 drivers/media/video/bt8xx/Makefile announce VIDEO_CPIA2 - "CPiA2 Video For Linux" clean_blob drivers/media/video/cpia2/cpia2patch.h +# *** 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' @@ -861,7 +859,6 @@ clean_mk CONFIG_USB_IBMCAM drivers/media/video/usbvideo/Makefile announce USB_VICAM - "USB 3com HomeConnect, AKA vicam" # *** -drop_fw_file firmware/vicam/firmware.H16 firmware/vicam/firmware.fw reject_firmware drivers/media/video/usbvideo/vicam.c clean_blob drivers/media/video/usbvideo/vicam.c clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_VICAM' @@ -927,7 +924,7 @@ clean_sed ' #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 'report missing Free firmware' +}' drivers/net/bnx2x.c 'report missing Free firmware' clean_blob drivers/net/bnx2x_hsi.h clean_kconfig drivers/net/Kconfig 'BNX2X' clean_mk CONFIG_BNX2X drivers/net/Makefile @@ -1099,25 +1096,26 @@ clean_blob drivers/net/pcmcia/smc91c92_cs.c clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_SMC91C92' clean_mk CONFIG_PCMCIA_SMC91C92 drivers/net/pcmcia/Makefile -announce PCCARD - "PCCard (PCMCIA/CardBus) support" -reject_firmware drivers/pcmcia/ds.c -clean_kconfig drivers/pcmcia/Kconfig 'PCCARD' -clean_mk CONFIG_PCCARD drivers/pcmcia/Makefile +# CIS files are not software. +# announce PCCARD - "PCCard (PCMCIA/CardBus) support" +# reject_firmware drivers/pcmcia/ds.c +# clean_kconfig drivers/pcmcia/Kconfig 'PCCARD' +# clean_mk CONFIG_PCCARD drivers/pcmcia/Makefile -announce PCMCIA_3C574 - "3Com 3c574 PCMCIA support" -clean_blob drivers/net/pcmcia/3c574_cs.c -clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_3C574' -clean_mk CONFIG_PCMCIA_3C574 drivers/net/pcmcia/Makefile +# announce PCMCIA_3C574 - "3Com 3c574 PCMCIA support" +# clean_blob drivers/net/pcmcia/3c574_cs.c +# clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_3C574' +# clean_mk CONFIG_PCMCIA_3C574 drivers/net/pcmcia/Makefile -announce PCMCIA_3C589 - "3Com 3c589 PCMCIA support" -clean_blob drivers/net/pcmcia/3c589_cs.c -clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_3C589' -clean_mk CONFIG_PCMCIA_3C589 drivers/net/pcmcia/Makefile +# announce PCMCIA_3C589 - "3Com 3c589 PCMCIA support" +# clean_blob drivers/net/pcmcia/3c589_cs.c +# clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_3C589' +# clean_mk CONFIG_PCMCIA_3C589 drivers/net/pcmcia/Makefile -announce PCMCIA_PCNET - "NE2000 compatible PCMCIA support" -clean_blob drivers/net/pcmcia/pcnet_cs.c -clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_PCNET' -clean_mk CONFIG_PCMCIA_PCNET drivers/net/pcmcia/Makefile +# announce PCMCIA_PCNET - "NE2000 compatible PCMCIA support" +# clean_blob drivers/net/pcmcia/pcnet_cs.c +# clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_PCNET' +# clean_mk CONFIG_PCMCIA_PCNET drivers/net/pcmcia/Makefile # tokenring @@ -1140,8 +1138,6 @@ announce SMCTR - "SMC ISA/MCA adapter" # This file is not under the GPL, better remove it all. clean_file drivers/net/tokenring/smctr_firmware.h # *** -drop_fw_file firmware/tr_smctr.bin.ihex firmware/tr_smctr.bin -reject_firmware drivers/net/tokenring/smctr.c clean_blob drivers/net/tokenring/smctr.c clean_kconfig drivers/net/tokenring/Kconfig 'SMCTR' clean_mk CONFIG_SMCTR drivers/net/tokenring/Makefile @@ -1157,11 +1153,6 @@ clean_mk CONFIG_TMS380TR drivers/net/tokenring/Makefile announce USB_KAWETH - "USB KLSI KL5USB101-based ethernet device support" clean_blob drivers/net/usb/kawethfw.h # *** -drop_fw_file firmware/kaweth/new_code.bin.ihex firmware/kaweth/new_code.bin -drop_fw_file firmware/kaweth/new_code_fix.bin.ihex firmware/kaweth/new_code_fix.bin -drop_fw_file firmware/kaweth/trigger_code.bin.ihex firmware/kaweth/trigger_code.bin -drop_fw_file firmware/kaweth/trigger_code_fix.bin.ihex firmware/kaweth/trigger_code_fix.bin -reject_firmware drivers/net/usb/kaweth.c clean_blob drivers/net/usb/kaweth.c clean_kconfig drivers/net/usb/Kconfig 'USB_KAWETH' clean_mk CONFIG_USB_KAWETH drivers/net/usb/Makefile @@ -1211,21 +1202,11 @@ clean_blob drivers/net/wireless/iwlwifi/iwl-3945.c clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWL3945' clean_mk CONFIG_IWL3945 drivers/net/wireless/iwlwifi/Makefile -announce IWLAGN - "Intel Wireless WiFi Next Gen AGN" -reject_firmware drivers/net/wireless/iwlwifi/iwl-agn.c -clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWLAGN' -clean_mk CONFIG_IWLAGN drivers/net/wireless/iwlwifi/Makefile - announce IWL4965 - "Intel Wireless WiFi 4965AGN" clean_blob drivers/net/wireless/iwlwifi/iwl-4965.c clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWL4965' clean_mk CONFIG_IWL4965 drivers/net/wireless/iwlwifi/Makefile -announce IWL5000 - "Intel Wireless WiFi 5000AGN" -clean_blob drivers/net/wireless/iwlwifi/iwl-5000.c -clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWL5000' -clean_mk CONFIG_IWL5000 drivers/net/wireless/iwlwifi/Makefile - announce LIBERTAS_CS - "Marvell Libertas 8385 CompactFlash 802.11b/g cards" reject_firmware drivers/net/wireless/libertas/if_cs.c clean_blob drivers/net/wireless/libertas/if_cs.c @@ -1258,7 +1239,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_sed ' @@ -1332,10 +1313,11 @@ clean_mk CONFIG_ISDN_DIVAS drivers/isdn/hardware/eicon/Makefile # Serial # ########## -announce SERIAL_8250_CS - "8250/16550 PCMCIA device support" -clean_blob drivers/serial/serial_cs.c -clean_kconfig drivers/serial/Kconfig 'SERIAL_8250_CS' -clean_mk CONFIG_SERIAL_8250_CS drivers/serial/Makefile +# CIS files are not software. +# announce SERIAL_8250_CS - "8250/16550 PCMCIA device support" +# clean_blob drivers/serial/serial_cs.c +# clean_kconfig drivers/serial/Kconfig 'SERIAL_8250_CS' +# clean_mk CONFIG_SERIAL_8250_CS drivers/serial/Makefile announce SERIAL_ICOM - "IBM Multiport Serial Adapter" reject_firmware drivers/serial/icom.c @@ -1478,11 +1460,6 @@ announce USB_EMI26 - "EMI 2|6 USB Audio interface" # This file is not under the GPL, better remove it all. clean_file drivers/usb/misc/emi26_fw.h # *** -# These files are not under the GPL, better remove them all. -drop_fw_file firmware/emi26/bitstream.HEX firmware/emi26/bitstream.fw -drop_fw_file firmware/emi26/firmware.HEX firmware/emi26/firmware.fw -drop_fw_file firmware/emi26/loader.HEX firmware/emi26/loader.fw -reject_firmware drivers/usb/misc/emi26.c clean_blob drivers/usb/misc/emi26.c clean_kconfig drivers/usb/misc/Kconfig 'USB_EMI26' clean_mk CONFIG_USB_EMI26 drivers/usb/misc/Makefile @@ -1492,12 +1469,6 @@ announce USB_EMI62 - "EMI 6|2m USB Audio interface" clean_file drivers/usb/misc/emi62_fw_m.h clean_file drivers/usb/misc/emi62_fw_s.h # *** -# These files are probably not under the GPL, better remove them all. -drop_fw_file firmware/emi62/bitstream.HEX firmware/emi62/bitstream.fw -drop_fw_file firmware/emi62/loader.HEX firmware/emi62/loader.fw -drop_fw_file firmware/emi62/midi.HEX firmware/emi62/midi.fw -drop_fw_file firmware/emi62/spdif.HEX firmware/emi62/spdif.fw -reject_firmware drivers/usb/misc/emi62.c clean_blob drivers/usb/misc/emi62.c clean_kconfig drivers/usb/misc/Kconfig 'USB_EMI62' clean_mk CONFIG_USB_EMI62 drivers/usb/misc/Makefile @@ -1513,61 +1484,39 @@ clean_mk CONFIG_USB_ISIGHTFW drivers/usb/misc/Makefile # ***** announce USB_SERIAL_KEYSPAN - "USB Keyspan USA-xxx Serial Driver" clean_file drivers/usb/serial/keyspan_mpr_fw.h -drop_fw_file firmware/keyspan/mpr.HEX firmware/keyspan/mpr.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_MPR' clean_file drivers/usb/serial/keyspan_usa18x_fw.h -drop_fw_file firmware/keyspan/usa18x.HEX firmware/keyspan/usa18x.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA18X' clean_file drivers/usb/serial/keyspan_usa19_fw.h -drop_fw_file firmware/keyspan/usa19.HEX firmware/keyspan/usa19.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19' clean_file drivers/usb/serial/keyspan_usa19qi_fw.h -drop_fw_file firmware/keyspan/usa19qi.HEX firmware/keyspan/usa19qi.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QI' clean_file drivers/usb/serial/keyspan_usa19qw_fw.h -drop_fw_file firmware/keyspan/usa19qw.HEX firmware/keyspan/usa19qw.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QW' clean_file drivers/usb/serial/keyspan_usa19w_fw.h -drop_fw_file firmware/keyspan/usa19w.HEX firmware/keyspan/usa19w.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19W' clean_file drivers/usb/serial/keyspan_usa28_fw.h -drop_fw_file firmware/keyspan/usa28.HEX firmware/keyspan/usa28.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28' clean_file drivers/usb/serial/keyspan_usa28xa_fw.h -drop_fw_file firmware/keyspan/usa28xa.HEX firmware/keyspan/usa28xa.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XA' clean_file drivers/usb/serial/keyspan_usa28xb_fw.h -drop_fw_file firmware/keyspan/usa28xb.HEX firmware/keyspan/usa28xb.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XB' clean_file drivers/usb/serial/keyspan_usa28x_fw.h -drop_fw_file firmware/keyspan/usa28x.HEX firmware/keyspan/usa28x.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28X' clean_file drivers/usb/serial/keyspan_usa49w_fw.h -drop_fw_file firmware/keyspan/usa49w.HEX firmware/keyspan/usa49w.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49W' clean_file drivers/usb/serial/keyspan_usa49wlc_fw.h -drop_fw_file firmware/keyspan/usa49wlc.HEX firmware/keyspan/usa49wlc.fw clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49WLC' -reject_firmware drivers/usb/serial/keyspan.c +# *** clean_blob drivers/usb/serial/keyspan.c clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN' clean_mk CONFIG_USB_SERIAL_KEYSPAN drivers/usb/serial/Makefile -announce USB_SERIAL_KEYSPAN_PDA - "USB Keyspan PDA Single Port Serial Driver" -clean_sed ' -s,request_ihex_firmware,/*KEYSPAN_PDA*/&, -' drivers/usb/serial/keyspan_pda.c 'accept Free firmware' - announce USB_SERIAL_EDGEPORT - "USB Inside Out Edgeport Serial Driver" clean_file drivers/usb/serial/io_fw_boot.h clean_file drivers/usb/serial/io_fw_down.h clean_file drivers/usb/serial/io_fw_down2.h # *** -clean_fw firmware/edgeport/boot.H16 firmware/edgeport/boot.fw -clean_fw firmware/edgeport/boot2.H16 firmware/edgeport/boot2.fw -clean_fw firmware/edgeport/down.H16 firmware/edgeport/down.fw -clean_fw firmware/edgeport/down2.H16 firmware/edgeport/down2.fw -reject_firmware drivers/usb/serial/io_edgeport.c clean_blob drivers/usb/serial/io_edgeport.c clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT' clean_mk CONFIG_USB_SERIAL_EDGEPORT drivers/usb/serial/Makefile @@ -1576,8 +1525,6 @@ announce USB_SERIAL_EDGEPORT_TI - "USB Inside Out Edgeport Serial Driver (TI dev clean_file drivers/usb/serial/io_fw_boot2.h clean_file drivers/usb/serial/io_fw_down3.h # *** -clean_fw firmware/edgeport/down3.bin.ihex firmware/edgeport/down3.bin -reject_firmware drivers/usb/serial/io_ti.c clean_blob drivers/usb/serial/io_ti.c clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT_TI' clean_mk CONFIG_USB_SERIAL_EDGEPORT_TI drivers/usb/serial/Makefile @@ -1586,9 +1533,6 @@ announce USB_SERIAL_TI - "USB TI 3410/5052 Serial Driver" clean_blob drivers/usb/serial/ti_fw_3410.h clean_blob drivers/usb/serial/ti_fw_5052.h # *** -drop_fw_file firmware/ti_3410.fw.ihex firmware/ti_3410.fw -drop_fw_file firmware/ti_5052.fw.ihex firmware/ti_5052.fw -reject_firmware drivers/usb/serial/ti_usb_3410_5052.c clean_blob drivers/usb/serial/ti_usb_3410_5052.c clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_TI' clean_mk CONFIG_USB_SERIAL_TI drivers/usb/serial/Makefile @@ -1653,7 +1597,6 @@ clean_blob sound/pci/korg1212/korg1212-firmware.h clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL clean_kconfig sound/pci/Kconfig 'SND_KORG1212_FIRMWARE_IN_KERNEL' # *** -drop_fw_file firmware/korg/k1212.dsp.ihex firmware/korg/k1212.dsp reject_firmware sound/pci/korg1212/korg1212.c clean_blob sound/pci/korg1212/korg1212.c clean_kconfig sound/pci/Kconfig 'SND_KORG1212' @@ -1663,8 +1606,6 @@ announce SND_MAESTRO3 - "ESS Allegro/Maestro3" clean_ifdef sound/pci/maestro3.c CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL clean_kconfig sound/pci/Kconfig 'SND_MAESTRO3_FIRMWARE_IN_KERNEL' # *** -drop_fw_file firmware/ess/maestro3_assp_kernel.fw.ihex firmware/ess/maestro3_assp_kernel.fw -drop_fw_file firmware/ess/maestro3_assp_minisrc.fw.ihex firmware/ess/maestro3_assp_minisrc.fw reject_firmware sound/pci/maestro3.c clean_blob sound/pci/maestro3.c clean_kconfig sound/pci/Kconfig 'SND_MAESTRO3' @@ -1675,9 +1616,6 @@ clean_blob sound/pci/ymfpci/ymfpci_image.h clean_ifdef sound/pci/ymfpci/ymfpci_main.c CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL clean_kconfig sound/pci/Kconfig 'SND_YMFPCI_FIRMWARE_IN_KERNEL' # *** -drop_fw_file firmware/yamaha/ds1_ctrl.fw.ihex firmware/yamaha/ds1_ctrl.fw -drop_fw_file firmware/yamaha/ds1_dsp.fw.ihex firmware/yamaha/ds1_dsp.fw -drop_fw_file firmware/yamaha/ds1e_ctrl.fw.ihex firmware/yamaha/ds1e_ctrl.fw reject_firmware sound/pci/ymfpci/ymfpci_main.c clean_blob sound/pci/ymfpci/ymfpci_main.c clean_kconfig sound/pci/Kconfig 'SND_YMFPCI' @@ -1687,11 +1625,6 @@ announce SND_SB16_CSP - "SB16 Advanced Signal Processor" clean_blob sound/isa/sb/sb16_csp_codecs.h clean_kconfig sound/isa/Kconfig 'SND_SB16_CSP_FIRMWARE_IN_KERNEL' # *** -drop_fw_file firmware/sb16/alaw_main.csp.ihex firmware/sb16/alaw_main.csp -drop_fw_file firmware/sb16/mulaw_main.csp.ihex firmware/sb16/mulaw_main.csp -drop_fw_file firmware/sb16/ima_adpcm_init.csp.ihex firmware/sb16/ima_adpcm_init.csp -drop_fw_file firmware/sb16/ima_adpcm_capture.csp.ihex firmware/sb16/ima_adpcm_capture.csp -drop_fw_file firmware/sb16/ima_adpcm_playback.csp.ihex firmware/sb16/ima_adpcm_playback.csp reject_firmware sound/isa/sb/sb16_csp.c clean_blob sound/isa/sb/sb16_csp.c clean_kconfig sound/isa/Kconfig 'SND_SB16_CSP' @@ -1882,15 +1815,13 @@ clean_mk CONFIG_SOUND_PSS sound/oss/Makefile announce Documentation - "non-Free firmware scripts and documentation" clean_blob Documentation/dvb/avermedia.txt clean_blob Documentation/dvb/opera-firmware.txt -clean_blob Documentation/dvb/ttusb-dec.txt clean_blob Documentation/sound/alsa/ALSA-Configuration.txt clean_blob Documentation/sound/oss/MultiSound clean_blob Documentation/sound/oss/PSS clean_blob Documentation/sound/oss/PSS-updates +clean_blob Documentation/sound/oss/README.OSS clean_file Documentation/dvb/get_dvb_firmware clean_file Documentation/video4linux/extract_xc3028.pl -clean_sed s,usb8388,whatever,g drivers/base/Kconfig 'removed blob name' -clean_blob firmware/WHENCE if $errors; then echo errors above were ignored because of --force >&2