deblob-2.6.28-libre1 scripts/v2.6.28-libre1
authorJason Self <j@jxself.org>
Tue, 5 Feb 2019 02:19:19 +0000 (18:19 -0800)
committerJason Self <j@jxself.org>
Tue, 5 Feb 2019 02:19:19 +0000 (18:19 -0800)
deblob-2.6.28
deblob-check
deblob-main

index 9d1484103beb09f97028c3ff3c1b7afcf7000fd9..5f6b2970c88f7d6f613d29ba29880eb3817e5f2b 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
+#    Copyright (C) 2008, 2009 Alexandre Oliva <lxoliva@fsfla.org>
 #    Copyright (C) 2008 Jeff Moe
-#    Copyright (C) 2008 Alexandre Oliva <lxoliva@fsfla.org>
 #
 #    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
 
 # 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.28 extra=
+kver=2.6.28 extra=1
+
+fatal () {
+  echo "$@"
+  exit 1
+}
 
 case $1 in
---force) die () { echo ERROR: "$@": ignored >&2; }; shift;;
-*) die () { echo "$@" >&2; exit 1; };;
+--force) die () { echo ERROR: "$@": ignored >&2; }; forced=:; shift;;
+*) die () { fatal "$@"; }; forced=false;;
 esac
 
 check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
 if [ ! -f $check ] ; then
-  echo optional deblob-check missing, will remove entire files >&2
+  if $forced; then
+    die deblob-check script missing, will remove entire files
+  else
+    die deblob-check script missing
+  fi
   have_check=false
 else
   have_check=:
 fi
 
-function clean_file {
+announce () {
+       echo
+       echo "$@"
+}
+
+clean_file () {
        #$1 = filename
        if test ! -f $1; then
                die $1 does not exist, something is wrong
        fi
-       rm -v $1
+       rm $1
+       echo $1: removed
 }
 
-function check_changed {
+check_changed () {
        if test ! -f $1; then
                die $1 does not exist, something is wrong
        elif cmp $1.deblob $1 > /dev/null; then
@@ -76,76 +91,81 @@ function check_changed {
        mv $1.deblob $1
 }
 
-function clean_blob {
+clean_blob () {
        #$1 = filename
        if $have_check; then
            if test ! -f $1; then
                die $1 does not exist, something is wrong
            fi
            name=$1
-           echo Removing blobs from $name
            set fnord "$@" -d
            shift 2
-           $check "$@" $name > $name.deblob
+           $check "$@" -i linux-$kver $name > $name.deblob
+           echo $name: removed blobs
            check_changed $name
        else
            clean_file $1
        fi
 }
 
-function dummy_blob {
+dummy_blob () {
        #$1 = filename
        if test -f $1; then
-           echo $1 exists, something is wrong >&2
-           exit 1
+           fatal $1 exists, something is wrong
        elif test ! -f firmware/Makefile; then
-           echo firmware/Makefile does not exist, something is wrong >&2
-           exit 1
+           fatal firmware/Makefile does not exist, something is wrong
        fi
 
-       sed -i "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \
-         firmware/Makefile
+       clean_sed "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \
+         firmware/Makefile "dropped $1"
 }
 
-function clean_fw {
+clean_fw () {
        #$1 = firmware text input, $2 = firmware output
        if test ! -f $1; then
-               echo $1 does not exist, something is wrong >&2
-               exit 1
+               fatal $1 does not exist, something is wrong
        elif test -f $2; then
-               echo $2 exists, something is wrong >&2
-               exit 1
+               fatal $2 exists, something is wrong
        fi
        clean_blob $1 -s 4
        dummy_blob $2
 }
 
-function drop_fw_file {
+drop_fw_file () {
        #$1 = firmware text input, $2 = firmware output
        if test ! -f $1; then
-               echo $1 does not exist, something is wrong >&2
-               exit 1
+               fatal $1 does not exist, something is wrong
        elif test -f $2; then
-               echo $2 exists, something is wrong >&2
-               exit 1
+               fatal $2 exists, something is wrong
        fi
        clean_file $1
        dummy_blob $2
 }
 
-function clean_kconfig {
+clean_kconfig () {
         #$1 = filename $2 = things to remove
-        echo Marking config $2 as depending on NONFREE in $1
+       case $1 in
+       -f)
+               shift
+               ;;
+       *)
+               if $have_check; then
+                       return
+               fi
+               ;;
+       esac
        sed "/^config \\($2\\)\$/{p;i\
        depends on NONFREE
 d;}" $1 > $1.deblob
+       echo $1: marked config $2 as depending on NONFREE
        check_changed $1
 }
 
-function clean_mk {
+clean_mk () {
        #$1 = config $2 = Makefile name
        # We don't clean up Makefiles any more --lxoliva
        # sed -i "/\\($1\\)/d" $2
+       # echo $2: removed $1 support
        # check_changed $2
        if sed -n "/\\($1\\)/p" $2 | grep . > /dev/null; then
            :
@@ -154,7 +174,41 @@ function clean_mk {
        fi
 }
 
+clean_sed () {
+       #$1 = sed-script $2 = file $3 = comment
+       sed -e "$1" "$2" > "$2".deblob
+       echo $2: ${3-applied sed script $1}
+       check_changed "$2"
+}
+
+reject_firmware () {
+       #$1 = file
+       clean_sed '
+s,request\(_ihex\)\?_firmware\(_nowait\)\?,reject_firmware\2,g
+' "$1" 'disabled non-Free firmware-loading machinery'
+}
+
+undefine_macro () {
+  #$1 - macro name
+  #$2 - substitution
+  #$3 - message
+  #rest - file names
+  macro=$1 repl=$2 msg=$3; shift 3
+  for f in "$@"; do
+    clean_sed "
+  s,^#define $macro .*\$,/*(DEBLOBBED)*/,;
+  s,$macro,$repl,g;
+" "$f" "$msg"
+  done
+}
 
+undefault_firmware () {
+  #$1 - pattern such that $1_DEFAULT_FIRMWARE is #defined to non-Free firmware
+  #$@ other than $1 - file names
+  macro="$1"_DEFAULT_FIRMWARE; shift
+  undefine_macro "$macro" "\"/*(DEBLOBBED)*/\"" \
+    "disabled non-Free firmware" "$@"
+}
 
 # First, check that files that contain firmwares and their
 # corresponding sources are present.
@@ -190,7 +244,7 @@ for f in \
     firmware/keyspan_pda/keyspan_pda.S \
   firmware/keyspan_pda/xircom_pgs.HEX \
     firmware/keyspan_pda/xircom_pgs.S \
-  sound/pci/cs46xx/imgs/cwcbinhack.h \
+  sound/pci/cs46xx/imgs/cwcdma.h \
     sound/pci/cs46xx/imgs/cwcdma.asp \
 ; do
   if test ! $f; then
@@ -199,538 +253,1564 @@ for f in \
 done
 
 # Identify the tarball.
-sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
-
-#######################
-# Removed ATM Drivers #
-#######################
-
-# ATM_AMBASSADOR -  Madge Ambassador (Collage PCI 155 Server)
+clean_sed "
+s,^EXTRAVERSION.*,&-libre$extra,
+" Makefile 'added -libre to EXTRAVERSION'
+
+# Add reject_firmware and maybe_reject_firmware
+clean_sed '
+$i\
+#ifndef _LINUX_LIBRE_FIRMWARE_H\
+#define _LINUX_LIBRE_FIRMWARE_H\
+\
+#include <linux/device.h>\
+\
+#define NONFREE_FIRMWARE "/*(DEBLOBBED)*/"\
+\
+static inline int\
+report_missing_free_firmware(const char *name, const char *what)\
+{\
+       printk(KERN_ERR "%s: Missing Free %s\\n", name,\
+              what ? what : "firmware");\
+       return -EINVAL;\
+}\
+static inline int\
+reject_firmware(const struct firmware **fw,\
+               const char *name, struct device *device)\
+{\
+       const struct firmware *xfw = NULL;\
+       int retval;\
+       report_missing_free_firmware(dev_name(device), NULL);\
+       retval = request_firmware(&xfw, NONFREE_FIRMWARE, device);\
+       if (!retval)\
+               release_firmware(xfw);\
+       return -EINVAL;\
+}\
+static inline int\
+maybe_reject_firmware(const struct firmware **fw,\
+                     const char *name, struct device *device)\
+{\
+       if (strstr (name, NONFREE_FIRMWARE))\
+               return reject_firmware(fw, name, device);\
+       else\
+               return request_firmware(fw, name, device);\
+}\
+static inline void\
+discard_rejected_firmware(const struct firmware *fw, void *context)\
+{\
+       release_firmware(fw);\
+}\
+static inline int\
+reject_firmware_nowait(struct module *module, int uevent,\
+                      const char *name, struct device *device,\
+                      void *context,\
+                      void (*cont)(const struct firmware *fw,\
+                                   void *context))\
+{\
+       int retval;\
+       report_missing_free_firmware(dev_name(device), NULL);\
+       retval = request_firmware_nowait(module, uevent, NONFREE_FIRMWARE,\
+                                        device, NULL,\
+                                        discard_rejected_firmware);\
+       if (retval)\
+               return retval;\
+       return -EINVAL;\
+}\
+static inline int\
+maybe_reject_firmware_nowait(struct module *module, int uevent,\
+                            const char *name, struct device *device,\
+                            void *context,\
+                            void (*cont)(const struct firmware *fw,\
+                                         void *context))\
+{\
+       if (strstr (name, NONFREE_FIRMWARE))\
+               return reject_firmware_nowait(module, uevent, name,\
+                                             device, context, cont);\
+       else\
+               return request_firmware_nowait(module, uevent, name,\
+                                              device, context, cont);\
+}\
+\
+#endif /* _LINUX_LIBRE_FIRMWARE_H */\
+' include/linux/firmware.h 'added non-Free firmware notification support'
+
+########
+# Arch #
+########
+
+# x86
+
+announce MICROCODE_AMD - "AMD microcode patch loading support"
+reject_firmware arch/x86/kernel/microcode_amd.c
+clean_blob arch/x86/kernel/microcode_amd.c
+clean_kconfig arch/x86/Kconfig 'MICROCODE_AMD'
+clean_mk CONFIG_MICROCODE_AMD arch/x86/kernel/Makefile
+
+announce MICROCODE_INTEL - "Intel microcode patch loading support"
+reject_firmware arch/x86/kernel/microcode_intel.c
+clean_blob arch/x86/kernel/microcode_intel.c
+clean_kconfig arch/x86/Kconfig 'MICROCODE_INTEL'
+clean_mk CONFIG_MICROCODE_INTEL arch/x86/kernel/Makefile
+
+# arm
+
+announce IXP4XX_NPE - "IXP4xx Network Processor Engine support"
+reject_firmware arch/arm/mach-ixp4xx/ixp4xx_npe.c
+clean_blob Documentation/arm/IXP4xx
+
+announce ARCH_NETX - "Hilscher NetX based"
+clean_sed '
+s,\([" ]\)request_firmware(,\1reject_firmware(,
+' arch/arm/mach-netx/xc.c 'disabled non-Free firmware-loading machinery'
+
+
+#######
+# ATM #
+#######
+
+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
-
-# ATM_FORE200E_PCA
-# ATM_FORE200E_SBA - SBA-200E
-clean_kconfig drivers/atm/Kconfig 'ATM_FORE.*'
-clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile
-
 clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR'
 clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile
 
+announce ATM_FORE200E - "FORE Systems 200E-series"
+reject_firmware drivers/atm/fore200e.c
+clean_blob drivers/atm/fore200e.c
+clean_blob Documentation/networking/fore200e.txt
+clean_kconfig drivers/atm/Kconfig 'ATM_FORE200E'
+clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile
+
 
-########################
-# Removed char Drivers #
-########################
+########
+# char #
+########
 
-# 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
 
+announce CYCLADES - "Cyclades async mux support"
+reject_firmware drivers/char/cyclades.c
+clean_blob drivers/char/cyclades.c
+clean_kconfig drivers/char/Kconfig 'CYCLADES'
+clean_mk CONFIG_CYCLADES drivers/char/Makefile
+
+announce ISI - "Multi-Tech multiport card support"
+reject_firmware drivers/char/isicom.c
+clean_blob drivers/char/isicom.c
+clean_kconfig drivers/char/Kconfig 'ISI'
+clean_mk CONFIG_ISI drivers/char/Makefile
+
+announce MOXA_INTELLIO - "Moxa Intellio support"
+reject_firmware drivers/char/moxa.c
+clean_blob drivers/char/moxa.c
+clean_kconfig drivers/char/Kconfig 'MOXA_INTELLIO'
+clean_mk CONFIG_MOXA_INTELLIO 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 'report missing Free microcode'
 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_cp([^;]*$/,/^}$/{
+  /^   radeon_cp_load_microcode(dev_priv);$/{
+    i\
+       DRM_ERROR("Missing Free microcode!\\n");\
+       radeon_do_cleanup_cp(dev);\
+       return -EINVAL;
+  }
+}' drivers/gpu/drm/radeon/radeon_cp.c 'report missing Free microcode on init'
+clean_sed '
+/^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 'report missing Free microcode on resume'
+clean_blob 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
 
 
-#########################
-# Removed Media Drivers #
-#########################
-
-
-# dvb/dvb-usb
-clean_blob drivers/media/dvb/dvb-usb/af9005-script.h
+#########
+# Media #
+#########
+
+# media/tuner
+
+announce MEDIA_TUNER_XC2028 - "XCeive xc2028/xc3028 tuners"
+undefault_firmware 'XC\(2028\|3028L\)' \
+  drivers/media/common/tuners/tuner-xc2028.h \
+  drivers/media/video/saa7134/saa7134-cards.c \
+  drivers/media/video/ivtv/ivtv-driver.c \
+  drivers/media/video/cx18/cx18-driver.c \
+  drivers/media/video/cx23885/cx23885-dvb.c \
+  drivers/media/video/cx88/cx88-dvb.c \
+  drivers/media/video/cx88/cx88-cards.c \
+  drivers/media/video/em28xx/em28xx-cards.c \
+  drivers/media/dvb/dvb-usb/dib0700_devices.c \
+  drivers/media/dvb/dvb-usb/cxusb.c
+reject_firmware drivers/media/common/tuners/tuner-xc2028.c
+clean_kconfig drivers/media/common/tuners/Kconfig 'MEDIA_TUNER_XC2028'
+clean_mk CONFIG_MEDIA_TUNER_XC2028 drivers/media/common/tuners/Makefile
+
+announce MEDIA_TUNER_XC5000 - "Xceive XC5000 silicon tuner"
+undefine_macro 'XC5000_DEFAULT_FIRMWARE_SIZE' 0 \
+  'removed non-Free firmware size' drivers/media/common/tuners/xc5000.c
+undefault_firmware 'XC5000' drivers/media/common/tuners/xc5000.c
+reject_firmware drivers/media/common/tuners/xc5000.c
+clean_kconfig drivers/media/common/tuners/Kconfig 'MEDIA_TUNER_XC5000'
+clean_mk CONFIG_MEDIA_TUNER_XC5000 drivers/media/common/tuners/Makefile
+
+announce DVB_USB - "Support for various USB DVB devices"
+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
 
-# dvb/frontends
+announce DVB_B2C2_FLEXCOP - "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
+reject_firmware drivers/media/dvb/b2c2/flexcop-fe-tuner.c
 
-# 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
+announce DVB_BT8XX - "BT8xx based PCI cards"
+reject_firmware drivers/media/dvb/bt8xx/dvb-bt8xx.c
 
-# 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
+announce DVB_USB_A800 - "AVerMedia AverTV DVB-T USB 2.0 (A800)"
+clean_blob drivers/media/dvb/dvb-usb/a800.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_A800'
+clean_mk CONFIG_DVB_USB_A800 drivers/media/dvb/dvb-usb/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_USB_AF9005 - "Afatech AF9005 DVB-T USB1.1 support"
+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
 
-# 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_USB_AF9015 - "Afatech AF9015 DVB-T USB2.0 support"
+clean_blob drivers/media/dvb/dvb-usb/af9015.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_AF9015'
+clean_mk CONFIG_DVB_USB_AF9015 drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_CXUSB - "Conexant USB2.0 hybrid reference design support"
+clean_blob drivers/media/dvb/dvb-usb/cxusb.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_CXUSB'
+clean_mk CONFIG_DVB_USB_CXUSB drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_DIB0700 - "DiBcom DiB0700 USB DVB devices"
+clean_blob drivers/media/dvb/dvb-usb/dib0700_devices.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_DIB0700'
+clean_mk CONFIG_DVB_USB_DIB0700 drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_DIBUSB_MB - "DiBcom USB DVB-T devices (based on the DiB3000M-B)"
+clean_blob drivers/media/dvb/dvb-usb/dibusb-mb.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_DIBUSB_MB'
+clean_mk CONFIG_DVB_USB_DIBUSB_MB drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_DIBUSB_MC - "DiBcom USB DVB-T devices (based on the DiB3000M-C/P)"
+clean_blob drivers/media/dvb/dvb-usb/dibusb-mc.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_DIBUSB_MC'
+clean_mk CONFIG_DVB_USB_DIBUSB_MC drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_DIGITV - "Nebula Electronics uDigiTV DVB-T USB2.0 support"
+clean_blob drivers/media/dvb/dvb-usb/digitv.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_DIGITV'
+clean_mk CONFIG_DVB_USB_DIGITV drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_DTT200U - "WideView WT-200U and WT-220U (pen) DVB-T USB2.0 support (Yakumo/Hama/Typhoon/Yuan)"
+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
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_GP8PSK'
+clean_mk CONFIG_DVB_USB_GP8PSK drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_M920X - "Uli m920x DVB-T USB2.0 support"
+reject_firmware drivers/media/dvb/dvb-usb/m920x.c
+clean_blob drivers/media/dvb/dvb-usb/m920x.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_M920X'
+clean_mk CONFIG_DVB_USB_M920X drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_NOVA_T_USB2 - "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"
+clean_blob drivers/media/dvb/dvb-usb/nova-t-usb2.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_NOVA_T_USB2'
+clean_mk CONFIG_DVB_USB_NOVA_T_USB2 drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_OPERA1 - "Opera1 DVB-S USB2.0 receiver"
+reject_firmware drivers/media/dvb/dvb-usb/opera1.c
+clean_blob drivers/media/dvb/dvb-usb/opera1.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_OPERA1'
+clean_mk CONFIG_DVB_USB_OPERA1 drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_TTUSB2 - "Pinnacle 400e DVB-S USB2.0 support"
+clean_blob drivers/media/dvb/dvb-usb/ttusb2.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_TTUSB2'
+clean_mk CONFIG_DVB_USB_TTUSB2 drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_UMT_010 - "HanfTek UMT-010 DVB-T USB2.0 support"
+clean_blob drivers/media/dvb/dvb-usb/umt-010.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_UMT_010'
+clean_mk CONFIG_DVB_USB_UMT_010 drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_VP702X - "TwinhanDTV StarBox and clones DVB-S USB2.0 support"
+clean_blob drivers/media/dvb/dvb-usb/vp702x.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_VP702X'
+clean_mk CONFIG_DVB_USB_VP702X drivers/media/dvb/dvb-usb/Makefile
+
+announce DVB_USB_VP7045 - "TwinhanDTV Alpha/MagicBoxII, DNTV tinyUSB2, Beetle USB2.0 support"
+clean_blob drivers/media/dvb/dvb-usb/vp7045.c
+clean_kconfig drivers/media/dvb/dvb-usb/Kconfig 'DVB_USB_VP7045'
+clean_mk CONFIG_DVB_USB_VP7045 drivers/media/dvb/dvb-usb/Makefile
 
-# dvb/ttpci
+# dvb/frontends
 
-# DVB_AV7110 - AV7110 cards
+announce DVB_AF9013 - "Afatech AF9013 demodulator"
+undefault_firmware 'AF9013' drivers/media/dvb/frontends/af9013.c
+reject_firmware drivers/media/dvb/frontends/af9013.c
+clean_blob drivers/media/dvb/frontends/af9013_priv.h
+clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_AF9013'
+clean_mk CONFIG_DVB_AF9013 drivers/media/dvb/frontends/Makefile
+
+announce DVB_BCM3510 - "Broadcom BCM3510"
+undefault_firmware 'BCM3510' drivers/media/dvb/frontends/bcm3510.c
+reject_firmware drivers/media/dvb/frontends/bcm3510.c
+reject_firmware drivers/media/dvb/frontends/bcm3510.h
+clean_sed '
+/You.ll need a firmware/,/dvb-fe-bcm/d;
+' drivers/media/dvb/frontends/bcm3510.c \
+  "removed non-Free firmware notes"
+clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_BCM3510'
+clean_mk CONFIG_DVB_BCM3510 drivers/media/dvb/frontends/Makefile
+
+announce DVB_NXT200X - "NxtWave Communications NXT2002/NXT2004 based"
+undefault_firmware 'NXT200[24]' drivers/media/dvb/frontends/nxt200x.c
+reject_firmware drivers/media/dvb/frontends/nxt200x.c
+clean_blob drivers/media/dvb/frontends/nxt200x.c
+clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_NXT200X'
+clean_mk CONFIG_DVB_NXT200X drivers/media/dvb/frontends/Makefile
+
+announce DVB_OR51132 - "Oren OR51132 based"
+reject_firmware drivers/media/dvb/frontends/or51132.c
+clean_blob drivers/media/dvb/frontends/or51132.c
+clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_OR51132'
+clean_mk CONFIG_DVB_OR51132 drivers/media/dvb/frontends/Makefile
+
+announce DVB_OR51211 - "Oren OR51211 based"
+undefault_firmware 'OR51211' drivers/media/dvb/frontends/or51211.c
+reject_firmware drivers/media/dvb/frontends/or51211.c
+reject_firmware drivers/media/dvb/frontends/or51211.h
+clean_blob drivers/media/dvb/frontends/or51211.c
+clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_OR51211'
+clean_mk CONFIG_DVB_OR51211 drivers/media/dvb/frontends/Makefile
+
+announce DVB_SP8870 - "Spase sp8870"
+undefault_firmware 'SP8870' drivers/media/dvb/frontends/sp8870.c
+reject_firmware drivers/media/dvb/frontends/sp8870.c
+reject_firmware drivers/media/dvb/frontends/sp8870.h
+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_CX24116 - "Conexant CX24116 based"
+undefault_firmware CX24116 drivers/media/dvb/frontends/cx24116.c
+reject_firmware drivers/media/dvb/frontends/cx24116.c
+clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_CX24116'
+clean_mk CONFIG_DVB_CX24116 drivers/media/dvb/frontends/Makefile
+
+announce DVB_SP887X - "Spase sp887x based"
+undefault_firmware 'SP887X' drivers/media/dvb/frontends/sp887x.c
+reject_firmware drivers/media/dvb/frontends/sp887x.c
+reject_firmware drivers/media/dvb/frontends/sp887x.h
+clean_blob drivers/media/dvb/frontends/sp887x.c
+clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_SP887X'
+clean_mk CONFIG_DVB_SP887X drivers/media/dvb/frontends/Makefile
+
+announce DVB_TDA10048 - "Philips TDA10048HN based"
+undefine_macro 'TDA10048_DEFAULT_FIRMWARE_SIZE' 0 \
+  'removed non-Free firmware size' drivers/media/dvb/frontends/tda10048.c
+undefault_firmware 'TDA10048' drivers/media/dvb/frontends/tda10048.c
+reject_firmware drivers/media/dvb/frontends/tda10048.c
+clean_kconfig drivers/media/dvb/frontends/Kconfig 'DVB_TDA10048'
+clean_mk CONFIG_DVB_TDA10048 drivers/media/dvb/frontends/Makefile
+
+announce DVB_TDA1004X - "Philips TDA10045H/TDA10046H"
+undefault_firmware 'TDA1004[56]' drivers/media/dvb/frontends/tda1004x.c
+reject_firmware drivers/media/dvb/frontends/tda1004x.c
+reject_firmware drivers/media/dvb/frontends/tda1004x.h
+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
+
+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 'report missing Free bootcode'
+clean_sed '
+s,mwdebi(.*bootcode.*$,/* & */,
+' drivers/media/dvb/ttpci/av7110_hw.c 'adjust bootcode loader'
 clean_blob drivers/media/dvb/ttpci/av7110_hw.c
+reject_firmware drivers/media/dvb/ttpci/av7110.c
 clean_blob drivers/media/dvb/ttpci/av7110.c
+clean_sed '
+/^config DVB_AV7110_FIRMWARE_FILE$/, /^config / {
+  /^   default.*dvb-ttpci-01/ s,".*","/*(DEBLOBBED)*/",;
+}' drivers/media/dvb/ttpci/Kconfig 'removed default firmware'
+clean_kconfig -f drivers/media/dvb/ttpci/Kconfig 'DVB_AV7110_FIRMWARE'
 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"
+reject_firmware drivers/media/dvb/ttpci/budget.c
+reject_firmware drivers/media/dvb/frontends/tdhd1.h
 
-# 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"
+reject_firmware drivers/media/dvb/ttpci/budget-av.c
 
-# dvb/ttusb-budget
+announce DVB_BUDGET_CI - "Budget cards with onboard CI connector"
+reject_firmware drivers/media/dvb/ttpci/budget-ci.c
 
-# DVB_TTUSB_BUDGET - Technotrend/Hauppauge Nova-USB devices
+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_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"
 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
 
+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_kconfig drivers/media/dvb/ttusb-dec/Kconfig 'DVB_TTUSB_DEC'
+clean_mk CONFIG_DVB_TTUSB_DEC drivers/media/dvb/ttusb-dec/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
+announce VIDEO_BT848 - "BT848 Video For Linux"
+reject_firmware drivers/media/video/bt8xx/bttv-cards.c
+clean_kconfig drivers/media/video/bt8xx/Kconfig 'VIDEO_BT848'
+clean_mk CONFIG_VIDEO_BT848 drivers/media/video/bt8xx/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
-
-# USB_DABUSB - DABUSB driver
+clean_mk CONFIG_VIDEO_CPIA2 drivers/media/video/cpia2/Makefile
+
+announce VIDEO_CX18 - "Conexant cx23418 MPEG encoder support"
+reject_firmware drivers/media/video/cx18/cx18-av-firmware.c
+reject_firmware drivers/media/video/cx18/cx18-firmware.c
+clean_blob drivers/media/video/cx18/cx18-av-firmware.c
+clean_kconfig drivers/media/video/cx18/Kconfig 'VIDEO_CX18'
+clean_mk CONFIG_VIDEO_CX18 drivers/media/video/cx18/Makefile
+
+announce VIDEO_CX23885 - "Conexant cx23885 (2388x successor) support"
+reject_firmware drivers/media/video/cx23885/cx23885-417.c
+clean_blob drivers/media/video/cx23885/cx23885-417.c
+clean_kconfig drivers/media/video/cx23885/Kconfig 'VIDEO_CX23885'
+clean_mk CONFIG_VIDEO_CX23885 drivers/media/video/cx23885/Makefile
+
+announce VIDEO_CX25840 - "Conexant CX2584x audio/video decoders"
+reject_firmware drivers/media/video/cx25840/cx25840-firmware.c
+clean_blob drivers/media/video/cx25840/cx25840-firmware.c
+clean_kconfig drivers/media/video/cx25840/Kconfig 'VIDEO_CX25840'
+clean_mk CONFIG_VIDEO_CX25840 drivers/media/video/cx25840/Makefile
+
+announce VIDEO_CX88_BLACKBIRD - "Blackbird MPEG encoder support (cx2388x + cx23416)"
+reject_firmware drivers/media/video/cx88/cx88-blackbird.c
+clean_kconfig drivers/media/video/cx88/Kconfig 'VIDEO_CX88_BLACKBIRD'
+clean_mk CONFIG_VIDEO_CX88_BLACKBIRD drivers/media/video/cx88/Makefile
+
+announce VIDEO_IVTV - "Conexant cx23416/cx23415 MPEG encoder/decoder support"
+reject_firmware drivers/media/video/ivtv/ivtv-firmware.c
+clean_blob drivers/media/video/ivtv/ivtv-firmware.c
+clean_kconfig drivers/media/video/ivtv/Kconfig 'VIDEO_IVTV'
+clean_mk CONFIG_VIDEO_IVTV drivers/media/video/ivtv/Makefile
+
+announce VIDEO_PVRUSB2 - "Hauppauge WinTV-PVR USB2 support"
+reject_firmware drivers/media/video/pvrusb2/pvrusb2-hdw.c
+clean_blob drivers/media/video/pvrusb2/pvrusb2-devattr.c
+clean_kconfig drivers/media/video/pvrusb2/Kconfig 'VIDEO_PVRUSB2'
+clean_mk CONFIG_VIDEO_PVRUSB2 drivers/media/video/pvrusb2/Makefile
+
+announce "VIDEO_CX23885, VIDEO_CX88_BLACKBIRD, VIDEO_IVTV, VIDEO_PVRUSB2" - "See above"
+clean_blob include/media/cx2341x.h
+
+announce VIDEO_GO7007 - "Go 7007 support"
+reject_firmware drivers/staging/go7007/go7007-driver.c
+clean_blob drivers/staging/go7007/go7007-driver.c
+reject_firmware drivers/staging/go7007/go7007-fw.c
+clean_blob drivers/staging/go7007/go7007-usb.c
+clean_blob drivers/staging/go7007/saa7134-go7007.c
+clean_kconfig drivers/staging/go7007/Kconfig 'VIDEO_GO7007'
+clean_mk CONFIG_VIDEO_GO7007 drivers/staging/go7007/Makefile
+
+announce VIDEO_SAA7134_DVB - "DVB/ATSC Support for saa7134 based TV cards"
+reject_firmware drivers/media/video/saa7134/saa7134-dvb.c
+clean_kconfig drivers/media/video/saa7134/Kconfig 'VIDEO_SAA7134_DVB'
+clean_mk CONFIG_VIDEO_SAA7134_DVB drivers/media/video/saa7134/Makefile
+
+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
+announce USB_S2255 - "USB Sensoray 2255 video capture device"
+reject_firmware drivers/media/video/s2255drv.c
+clean_blob drivers/media/video/s2255drv.c
+clean_kconfig drivers/media/video/Kconfig 'USB_S2255'
+clean_mk CONFIG_USB_S2255 drivers/media/video/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/usbvideo/vicam.c
+clean_blob drivers/media/video/usbvideo/vicam.c
 clean_kconfig drivers/media/video/usbvideo/Kconfig 'USB_VICAM'
 clean_mk CONFIG_USB_VICAM drivers/media/video/usbvideo/Makefile
 
 
-#######################
-# Removed net Drivers #
-#######################
+#######
+# net #
+#######
 
-# 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 'check for error in firmware loading'
+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 'report missing Free firmware'
+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
-# This adds restrictions on top of GPLv2, but after deblobbing,
-# nothing copyrightable remains.
-clean_blob drivers/net/starfire_firmware.h
+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_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 'report missing Free firmware'
+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 'report missing Free firmware'
+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 'report missing Free firmware'
 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"
+reject_firmware drivers/net/cxgb3/cxgb3_main.c
+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 'report missing Free firmware'
+clean_blob drivers/net/cxgb3/cxgb3_main.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 'report missing Free firmware for some variants'
 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
-
-# MYRI_SBUS - MyriCOM Gigabit Ethernet
-clean_blob drivers/net/myri_code.h
+clean_kconfig drivers/net/Kconfig 'E100'
+clean_mk CONFIG_E100 drivers/net/Makefile
+
+announce MYRI_SBUS - "MyriCOM Gigabit Ethernet"
+clean_file drivers/net/myri_code.h
+clean_sed '
+/myri_load_lanai.*;/{
+  i\
+       printk(KERN_ERR "Missing Free firmware\\n");\
+       goto err_free_irq;
+}' drivers/net/myri_sbus.c 'report missing Free firmware'
+clean_blob drivers/net/myri_sbus.c
 clean_kconfig drivers/net/Kconfig 'MYRI_SBUS'
 clean_mk CONFIG_MYRI_SBUS drivers/net/Makefile
 
-# TEHUTI - Tehuti Networks 10G Ethernet
-clean_blob drivers/net/tehuti_fw.h -s 4
+announce MYRI10GE - "Myricom Myri-10G Ethernet support"
+reject_firmware drivers/net/myri10ge/myri10ge.c
+clean_blob drivers/net/myri10ge/myri10ge.c
+clean_kconfig drivers/net/Kconfig 'MYRI10GE'
+clean_mk CONFIG_MYRI10GE drivers/net/myri10ge/Makefile
+
+announce SLICOSS - "Alacritech Gigabit IS-NIC cards"
+clean_blob drivers/staging/slicoss/gbdownload.h
+clean_blob drivers/staging/slicoss/oasisdownload.h
+clean_blob drivers/staging/slicoss/oasisdbgdownload.h
+clean_blob drivers/staging/slicoss/gbrcvucode.h
+clean_blob drivers/staging/slicoss/oasisrcvucode.h
+clean_kconfig drivers/staging/slicoss/Kconfig 'SLICOSS'
+clean_mk CONFIG_SLICOSS drivers/staging/slicoss/Makefile
+
+announce SPIDER_NET - "Spider Gigabit Ethernet driver"
+reject_firmware drivers/net/spider_net.c
+clean_sed 's,spider_fw\.bin,DEBLOBBED.bin,g' \
+  drivers/net/spider_net.c 'removed non-Free firmware notes'
+clean_blob drivers/net/spider_net.h
+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_kconfig drivers/staging/sxg/Kconfig 'SXG'
+clean_mk CONFIG_SXG drivers/staging/sxg/Makefile
+
+announce TEHUTI - "Tehuti Networks 10G Ethernet"
+clean_blob drivers/net/tehuti_fw.h
+clean_sed '
+/bdx_tx_push_desc_safe.*s_firmLoad.*/{
+  i\
+               ERR("%s: Missing Free firmware\\n", priv->ndev->name);\
+               RET(-EINVAL);
+}' drivers/net/tehuti.c 'report missing Free firmware'
+clean_blob drivers/net/tehuti.c
 clean_kconfig drivers/net/Kconfig 'TEHUTI'
 clean_mk CONFIG_TEHUTI drivers/net/Makefile
 
-# TIGON3 - Broadcom Tigon3
-patch --no-backup-if-mismatch --batch -p0 <<\EOF || \
-  die failed to remove license comments from drivers/net/tg3.c \
-  # patches/linux-2.6-tg3-clean.patch
---- drivers/net/tg3.c
-+++ drivers/net/tg3.c
-@@ -5,14 +5,6 @@
-  * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
-  * Copyright (C) 2004 Sun Microsystems Inc.
-  * Copyright (C) 2005-2007 Broadcom Corporation.
-- *
-- * Firmware is:
-- *    Derived from proprietary unpublished source code,
-- *    Copyright (C) 2000-2003 Broadcom Corporation.
-- *
-- *    Permission is hereby granted for the distribution of this firmware
-- *    data in hexadecimal or equivalent format, provided this copyright
-- *    notice is accompanying it.
-  */
-EOF
-clean_blob drivers/net/tg3.c -s 9
-if $have_check; then
-  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c 
-else
-  clean_kconfig drivers/net/Kconfig 'TIGON3'
-  clean_mk CONFIG_TIGON3 drivers/net/Makefile
-fi
-
-# TYPHOON - 3cr990 series Typhoon
+announce TIGON3 - "Broadcom Tigon3"
+clean_sed '
+s,\&tg3\(Tso5\?\)\?Fw\(Text\|Rodata\|Data\)\[0\],NULL,;
+/^static int tg3_load_firmware_cpu([^;]*$/,/^}/{
+  /^   err = 0;/{
+    i\
+       printk(KERN_ERR PFX "Missing Free firmware for %s, hoping it works anyway\\n",\
+              tp->dev->name);
+  }
+}' drivers/net/tg3.c 'report missing Free firmware, proceed without it'
+clean_blob drivers/net/tg3.c
+clean_kconfig drivers/net/Kconfig 'TIGON3'
+clean_mk CONFIG_TIGON3 drivers/net/Makefile
+
+announce TYPHOON - "3cr990 series Typhoon"
 clean_blob drivers/net/typhoon-firmware.h
+clean_sed '
+/^typhoon_download_firmware([^;]*$/,/^}/{
+  /typhoon_firmware_image/{
+    i\
+       printk(KERN_ERR "%s: Missing Free firmware\\n", tp->name);\
+       err = -EINVAL;\
+       goto err_out;
+    d;
+  }
+}' drivers/net/typhoon.c 'report missing Free firmware'
 clean_kconfig drivers/net/Kconfig 'TYPHOON'
 clean_mk CONFIG_TYPHOON drivers/net/Makefile
 
 # appletalk
 
-# COPS - COPS LocalTalk PC
-# clean_blob drivers/net/appletalk/cops.c
-# clean_blob drivers/net/appletalk/cops.h
-clean_blob drivers/net/appletalk/cops_ffdrv.h
-clean_blob drivers/net/appletalk/cops_ltdrv.h
+announce COPS - "COPS LocalTalk PC"
+clean_sed '
+/sizeof(\(ff\|lt\)drv_code)/{
+  i\
+               printk(KERN_INFO "%s: Missing Free firmware.\\n", dev->name);\
+               return;
+}
+/\(ff\|lt\)drv_code/d;
+' drivers/net/appletalk/cops.c 'report missing Free firmware'
+clean_blob drivers/net/appletalk/cops.c
+clean_file drivers/net/appletalk/cops_ffdrv.h
+clean_file drivers/net/appletalk/cops_ltdrv.h
 clean_kconfig drivers/net/appletalk/Kconfig 'COPS'
 clean_mk CONFIG_COPS drivers/net/appletalk/Makefile
 
 # hamradio
 
-# YAM - YAM driver for AX.25
-clean_blob drivers/net/hamradio/yam1200.h
-clean_blob drivers/net/hamradio/yam9600.h
+announce YAM - "YAM driver for AX.25"
+clean_file drivers/net/hamradio/yam1200.h
+clean_file drivers/net/hamradio/yam9600.h
+clean_sed '
+/add_mcs(bits_\(12\|96\)00, bitrate)/{
+  i\
+               printk(KERN_ERR "yam: Missing Free firmware\\n");
+  s:add_mcs(bits_\(12\|96\)00, bitrate):NULL:
+}' drivers/net/hamradio/yam.c 'report missing Free firmware'
+clean_blob drivers/net/hamradio/yam.c
 clean_kconfig drivers/net/hamradio/Kconfig 'YAM'
 clean_mk CONFIG_YAM drivers/net/hamradio/Makefile
 
+# irda
+
+announce USB_IRDA - "IrDA USB dongles"
+reject_firmware drivers/net/irda/irda-usb.c
+clean_blob drivers/net/irda/irda-usb.c
+clean_kconfig drivers/net/irda/Kconfig 'USB_IRDA'
+clean_mk CONFIG_USB_IRDA drivers/net/irda/Makefile
+
 # pcmcia
 
-# PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA
+announce PCMCIA_SMC91C92 - "SMC 91Cxx PCMCIA"
+clean_sed '
+/^\(static int \)\?osi_setup([^;]*$/,/^}$/{
+  s/^\(.*\)[/][*] Download.*firmware [*][/]/\1printk(KERN_ERR "%s: Missing Free firmware\\n", dev->name);\n\1rc = -EINVAL;\n\1goto free_cfg_mem;\n&/
+}' drivers/net/pcmcia/smc91c92_cs.c 'report missing Free firmware'
+clean_sed '
+/^\(static int \)\?smc91c92_resume([^;]*$/,/^}$/{
+  s/^\(.*\)[/][*] Download.*firmware [*][/]/\1printk(KERN_ERR "%s: Missing Free firmware\\n", dev->name);\n\1return -EINVAL;\n&/
+}' drivers/net/pcmcia/smc91c92_cs.c 'report another missing Free firmware'
 clean_blob drivers/net/pcmcia/ositech.h
+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
+
+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_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
 
-# 3C359 - 3Com 3C359 Token Link Velocity XL adapter
-# No need to remove these, they don't contain non-Free code.
-# clean_blob drivers/net/tokenring/3c359.c
-# clean_blob drivers/net/tokenring/3c359.h
-# This file is not under the GPL, better remove it all.
+announce 3C359 - "3Com 3C359 Token Link Velocity XL adapter"
 clean_file drivers/net/tokenring/3c359_microcode.h
+clean_sed '
+/^\(static int \)\?xl_hw_reset([^;]*$/,/^}/{
+  /start = .*mc_size/i\
+               printk(KERN_ERR "%s: Missing Free firmware\\n", dev->name);\
+               return -EINVAL;
+}' drivers/net/tokenring/3c359.c 'report missing Free firmware'
+clean_blob drivers/net/tokenring/3c359.c
 clean_kconfig drivers/net/tokenring/Kconfig '3C359'
 clean_mk CONFIG_3C359 drivers/net/tokenring/Makefile
 
-# SMCTR - SMC ISA/MCA adapter
-# No need to remove these, they don't contain non-Free code.
-# clean_blob drivers/net/tokenring/smctr.c
-# clean_blob drivers/net/tokenring/smctr.h
-# This file is not under the GPL, better remove it all.
+announce SMCTR - "SMC ISA/MCA adapter"
 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
 
+announce TMS380TR - "Generic TMS380 Token Ring ISA/PCI adapter support"
+reject_firmware drivers/net/tokenring/tms380tr.c
+clean_blob drivers/net/tokenring/tms380tr.c
+clean_kconfig drivers/net/tokenring/Kconfig 'TMS380TR'
+clean_mk CONFIG_TMS380TR drivers/net/tokenring/Makefile
+
 # usb
 
-# USB_KAWETH - USB KLSI KL5USB101-based ethernet device support
+announce USB_KAWETH - "USB KLSI KL5USB101-based ethernet device support"
 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
 
 # wireless
 
-clean_blob drivers/net/wireless/rtl8187_dev.c
-# clean_kconfig drivers/net/wireless/Kconfig 'RTL8187'
-# clean_mk CONFIG_RTL8187 drivers/net/wireless/Makefile
-
-
-########################
-# Removed s390 Drivers #
-########################
-
-# QETH - Gigabit Ethernet device support
-clean_blob drivers/s390/net/qeth_core_mpc.c
-clean_kconfig drivers/s390/net/Kconfig 'QETH'
-clean_mk CONFIG_QETH drivers/s390/net/Makefile
-
-
-#####################
-# Removed SH boards #
-#####################
-
-# SH_AP325RXA - Renesas AP-325RXA board
-clean_blob arch/sh/boards/board-ap325rxa.c
-clean_kconfig arch/sh/boards/Kconfig 'SH_AP325RXA'
-clean_mk CONFIG_SH_AP325RXA arch/sh/boards/Makefile
-
-# SH_MIGOR - Reneasas Migo-R
-clean_blob arch/sh/boards/mach-migor/lcd_qvga.c -s 16
-clean_blob arch/sh/boards/mach-migor/setup.c
-clean_kconfig arch/sh/boards/Kconfig 'SH_MIGOR'
-clean_kconfig arch/sh/boards/mach-migor/Kconfig 'SH_MIGOR_QVGA'
-clean_mk CONFIG_SH_MIGOR_QVGA arch/sh/boards/mach-migor/Makefile
+announce ATMEL "Atmel at76c50x chipset  802.11b support"
+reject_firmware drivers/net/wireless/atmel.c
+clean_blob drivers/net/wireless/atmel.c
+clean_kconfig drivers/net/wireless/Kconfig 'ATMEL'
+clean_mk CONFIG_ATMEL drivers/net/wireless/Makefile
+
+announce USB_ATMEL - "Atmel at76c503/at76c505/at76c505a USB cards"
+reject_firmware drivers/staging/at76_usb/at76_usb.c
+clean_blob drivers/staging/at76_usb/at76_usb.c
+clean_kconfig drivers/staging/at76_usb/Kconfig 'USB_ATMEL'
+clean_mk CONFIG_USB_ATMEL drivers/staging/at76_usb/Makefile
+
+announce B43 - "Broadcom 43xx wireless support (mac80211 stack)"
+reject_firmware drivers/net/wireless/b43/main.c
+# Major portions of firwmare filenames not deblobbed.
+clean_blob drivers/net/wireless/b43/main.c
+clean_kconfig drivers/net/wireless/b43/Kconfig 'B43'
+clean_mk CONFIG_B43 drivers/net/wireless/b43/Makefile
+
+announce B43LEGACY - "Broadcom 43xx-legacy wireless support (mac80211 stack)"
+reject_firmware drivers/net/wireless/b43legacy/main.c
+# Major portions of firwmare filenames not deblobbed.
+clean_blob drivers/net/wireless/b43legacy/main.c
+clean_kconfig drivers/net/wireless/b43legacy/Kconfig 'B43LEGACY'
+clean_mk CONFIG_B43LEGACY drivers/net/wireless/b43legacy/Makefile
+
+announce HERMES - "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
+reject_firmware drivers/net/wireless/orinoco.c
+clean_blob drivers/net/wireless/orinoco.c
+clean_kconfig drivers/net/wireless/Kconfig 'HERMES'
+clean_mk CONFIG_HERMES drivers/net/wireless/Makefile
+
+announce IPW2100 - "Intel PRO/Wireless 2100 Network Connection"
+reject_firmware drivers/net/wireless/ipw2100.c
+clean_blob drivers/net/wireless/ipw2100.c
+clean_kconfig drivers/net/wireless/Kconfig 'IPW2100'
+clean_mk CONFIG_IPW2100 drivers/net/wireless/Makefile
+
+announce IPW2200 - "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
+reject_firmware drivers/net/wireless/ipw2200.c
+clean_blob drivers/net/wireless/ipw2200.c
+clean_kconfig drivers/net/wireless/Kconfig 'IPW2200'
+clean_mk CONFIG_IPW2200 drivers/net/wireless/Makefile
+
+announce IWL3945 - "Intel PRO/Wireless 3945ABG/BG Network Connection"
+reject_firmware drivers/net/wireless/iwlwifi/iwl3945-base.c
+clean_blob drivers/net/wireless/iwlwifi/iwl3945-base.c
+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
+clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_CS'
+clean_mk CONFIG_LIBERTAS_CS drivers/net/wireless/libertas/Makefile
+
+announce LIBERTAS_SDIO - "Marvell Libertas 8385 and 8686 SDIO 802.11b/g cards"
+reject_firmware drivers/net/wireless/libertas/if_sdio.c
+clean_blob drivers/net/wireless/libertas/if_sdio.c
+clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_SDIO'
+clean_mk CONFIG_LIBERTAS_SDIO drivers/net/wireless/libertas/Makefile
+
+announce LIBERTAS_USB - "Marvell Libertas 8388 USB 802.11b/g cards"
+reject_firmware drivers/net/wireless/libertas/if_usb.c
+clean_blob drivers/net/wireless/libertas/if_usb.c
+clean_blob drivers/net/wireless/libertas/README
+clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_USB'
+clean_mk CONFIG_LIBERTAS_USB drivers/net/wireless/libertas/Makefile
+
+announce LIBERTAS_THINFIRM_USB - "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"
+reject_firmware drivers/net/wireless/libertas_tf/if_usb.c
+clean_blob drivers/net/wireless/libertas_tf/if_usb.c
+clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_THINFIRM_USB'
+clean_mk CONFIG_LIBERTAS_THINFIRM_USB drivers/net/wireless/libertas_tf/Makefile
+
+announce P54_PCI - "Prism54 PCI support"
+reject_firmware drivers/net/wireless/p54/p54pci.c
+clean_blob drivers/net/wireless/p54/p54pci.c
+clean_kconfig drivers/net/wireless/p54/Kconfig 'P54_PCI'
+clean_mk CONFIG_P54_PCI drivers/net/wireless/p54/Makefile
+
+announce P54_USB - "Prism54 USB support"
+reject_firmware drivers/net/wireless/p54/p54usb.c
+clean_blob drivers/net/wireless/p54/p54usb.c
+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'
+reject_firmware drivers/net/wireless/prism54/islpci_dev.c
+clean_blob drivers/net/wireless/prism54/islpci_dev.c
+clean_sed '
+/^config PRISM54$/,/^config /{
+  /If you enable this/,/^$/d;
+}' drivers/net/wireless/Kconfig 'removed firmware notes'
+clean_kconfig drivers/net/wireless/Kconfig 'PRISM54'
+clean_mk CONFIG_PRISM54 drivers/net/wireless/prism54/Makefile
+
+announce RT2X00_LIB_FIRMWARE - "Ralink driver firmware support"
+reject_firmware drivers/net/wireless/rt2x00/rt2x00firmware.c
+clean_kconfig drivers/net/wireless/rt2x00/Kconfig 'RT2X00_LIB_FIRMWARE'
+clean_mk CONFIG_RT2X00_LIB_FIRMWARE drivers/net/wireless/rt2x00/Makefile
+
+announce RT61PCI - "Ralink rt2501/rt61 (PCI/PCMCIA) support"
+clean_blob drivers/net/wireless/rt2x00/rt61pci.h
+clean_blob drivers/net/wireless/rt2x00/rt61pci.c
+clean_kconfig drivers/net/wireless/rt2x00/Kconfig 'RT61PCI'
+clean_mk CONFIG_RT61PCI drivers/net/wireless/rt2x00/Makefile
+
+announce RT73USB - "Ralink rt2501/rt73 (USB) support"
+clean_blob drivers/net/wireless/rt2x00/rt73usb.h
+clean_blob drivers/net/wireless/rt2x00/rt73usb.c
+clean_kconfig drivers/net/wireless/rt2x00/Kconfig 'RT73USB'
+clean_mk CONFIG_RT73USB drivers/net/wireless/rt2x00/Makefile
+
+announce USB_ZD1201 - "USB ZD1201 based Wireless device support"
+reject_firmware drivers/net/wireless/zd1201.c
+clean_blob drivers/net/wireless/zd1201.c
+clean_kconfig drivers/net/wireless/Kconfig 'USB_ZD1201'
+clean_mk CONFIG_USB_ZD1201 drivers/net/wireless/Makefile
+
+announce ZD1211RW - "ZyDAS ZD1211/ZD1211B USB-wireless support"
+reject_firmware drivers/net/wireless/zd1211rw/zd_usb.c
+clean_blob drivers/net/wireless/zd1211rw/zd_usb.c
+clean_kconfig drivers/net/wireless/zd1211rw/Kconfig 'ZD1211RW'
+clean_mk CONFIG_ZD1211RW drivers/net/wireless/zd1211rw/Makefile
+
+# bluetooth
+
+announce BT_HCIBCM203X - "HCI BCM203x USB driver"
+reject_firmware drivers/bluetooth/bcm203x.c
+clean_blob drivers/bluetooth/bcm203x.c
+clean_kconfig drivers/bluetooth/Kconfig 'BT_HCIBCM203X'
+clean_mk CONFIG_BT_HCIBCM203X drivers/bluetooth/Makefile
+
+announce BT_HCIBFUSB - "HCI BlueFRITZ! USB driver"
+reject_firmware drivers/bluetooth/bfusb.c
+clean_blob drivers/bluetooth/bfusb.c
+clean_kconfig drivers/bluetooth/Kconfig 'BT_HCIBFUSB'
+clean_mk CONFIG_BT_HCIBFUSB drivers/bluetooth/Makefile
+
+announce BT_HCIBT3C - "HCI BT3C (PC Card) driver"
+reject_firmware drivers/bluetooth/bt3c_cs.c
+clean_blob drivers/bluetooth/bt3c_cs.c
+clean_kconfig drivers/bluetooth/Kconfig 'BT_HCIBT3C'
+clean_mk CONFIG_BT_HCIBT3C drivers/bluetooth/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
+
+announce SERIAL_ICOM - "IBM Multiport Serial Adapter"
+reject_firmware drivers/serial/icom.c
+clean_blob drivers/serial/icom.c
+clean_kconfig drivers/serial/Kconfig 'SERIAL_ICOM'
+clean_mk CONFIG_SERIAL_ICOM drivers/serial/Makefile
+
+announce SERIAL_QE - "Freescale QUICC Engine serial port support"
+reject_firmware drivers/serial/ucc_uart.c
+clean_blob drivers/serial/ucc_uart.c
+clean_kconfig drivers/serial/Kconfig 'SERIAL_QE'
+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_kconfig drivers/staging/me4000/Kconfig 'ME4000'
+clean_mk CONFIG_ME4000 drivers/staging/me4000/Makefile
 
 
-########################
-# Removed SCSI Drivers #
-########################
 
-# SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
-clean_blob drivers/scsi/qlogicpti_asm.c
+########
+# SCSI #
+########
+
+announce SCSI_QLOGICPTI - "PTI Qlogic, ISP Driver"
+clean_file drivers/scsi/qlogicpti_asm.c
+clean_sed '
+/^static int __devinit qlogicpti_load_firmware([^;]*$/,/^}$/{
+  /[&]sbus_risc_code01/{
+    i\
+       printk(KERN_ERR "qlogicpti%d: Missing Free firmware\\n", qpti->qpti_id);\
+       return -EINVAL;
+  }
+  s,[&]sbus_risc_code01\[0\],NULL,
+  s,sbus_risc_code_length01,0,
+}' drivers/scsi/qlogicpti.c 'report missing Free firmware'
+clean_blob drivers/scsi/qlogicpti.c
 clean_kconfig drivers/scsi/Kconfig 'SCSI_QLOGICPTI'
 clean_mk CONFIG_SCSI_QLOGICPTI drivers/scsi/Makefile
 
-# SCSI_ADVANSYS - AdvanSys SCSI
+announce SCSI_ADVANSYS - "AdvanSys SCSI"
+clean_sed '
+/ASC_DBG.*_asc_mcode_chksum);/d;
+/^\(static ASC_CNT \)\?AscLoadMicroCode([^;]*$/,/^}$/{
+  /^}$/{
+    p;
+    i\
+#define AscLoadMicroCode(x1,x2,x3,x4) ((x1),(x2),(x3),(x4),printk(KERN_ERR "advansys: Missing Free firmware\\n"), -1)
+    d;
+  }
+}
+/^\(static int \)\?AdvLoadMicrocode([^;]*$/,/^}$/{
+  /^}$/{
+    p;
+    i\
+#define AdvLoadMicrocode(x1,x2,x3,x4,x5) ((x1),(x2),(x3),(x4),(x5),printk(KERN_ERR "advansys: Missing Free firmware\\n"), ASC_IERR_MCODE_CHKSUM)
+    d;
+  }
+}
+s/\([  (]\)_\(asc_mcode\|adv_asc3\(550\|8C\(08\|16\)00\)\)_buf,/\1NULL,/;
+s/\([  ]\)_\(asc_mcode\|adv_asc3\(550\|8C\(08\|16\)00\)\)_size\([,)]\)/\1(unsigned short)0\5/;
+s/\([  ]\)_\(asc_mcode\|adv_asc3\(550\|8C\(08\|16\)00\)\)_chksum\([,)]\)/\1(ADV_DCNT)0\5/;
+' drivers/scsi/advansys.c 'report missing Free firmware'
 clean_blob drivers/scsi/advansys.c
 clean_kconfig drivers/scsi/Kconfig 'SCSI_ADVANSYS'
 clean_mk CONFIG_SCSI_ADVANSYS drivers/scsi/Makefile
 
-# SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI
+announce SCSI_QLOGIC_1280 - "Qlogic QLA 1240/1x80/1x160 SCSI"
 clean_blob drivers/scsi/ql1280_fw.h
 clean_blob drivers/scsi/ql1040_fw.h
 clean_blob drivers/scsi/ql12160_fw.h
+clean_sed '
+s,[&]\(fw12\(160\|80e\)i\|risc\(_code\)\?\)_\(code01\[0\]\|length01\),NULL,g;
+/^qla1280_load_firmware\(_pio\)\?([^;]*$/,/^}$/{
+  /risc_code_size = [*]/{
+    i\
+       if (!risc_code_address) {\
+               printk(KERN_ERR "scsi(%li): Missing Free firmware\\n", ha->host_no);\
+               return -EINVAL;\
+       }
+  }
+}
+/^qla1280_load_firmware_dma([^;]*$/,/^}$/{
+  /risc_code_size = [*]/{
+    i\
+       if (!risc_code_address) {\
+               printk(KERN_ERR "scsi(%li): Missing Free firmware\\n", ha->host_no);\
+               err = -EINVAL;\
+               goto out;\
+       }
+  }
+}' drivers/scsi/qla1280.c 'report missing Free firmware'
 clean_kconfig drivers/scsi/Kconfig 'SCSI_QLOGIC_1280'
 clean_mk CONFIG_SCSI_QLOGIC_1280 drivers/scsi/Makefile
 
-
-#######################
-# Removed USB Drivers #
-#######################
+announce SCSI_AIC94XX - "Adaptec AIC94xx SAS/SATA support"
+reject_firmware drivers/scsi/aic94xx/aic94xx_seq.c
+clean_blob drivers/scsi/aic94xx/aic94xx_seq.c
+clean_blob drivers/scsi/aic94xx/aic94xx_seq.h
+clean_kconfig drivers/scsi/aic94xx/Kconfig 'SCSI_AIC94XX'
+clean_mk CONFIG_SCSI_AIC94XX drivers/scsi/aic94xx/Makefile
+
+announce SCSI_QLA_FC - "QLogic QLA2XXX Fibre Channel Support"
+reject_firmware drivers/scsi/qla2xxx/qla_gbl.h
+reject_firmware drivers/scsi/qla2xxx/qla_init.c
+reject_firmware drivers/scsi/qla2xxx/qla_os.c
+clean_blob drivers/scsi/qla2xxx/qla_os.c
+clean_kconfig drivers/scsi/qla2xxx/Kconfig 'SCSI_QLA_FC'
+clean_mk CONFIG_SCSI_QLA_FC drivers/scsi/qla2xxx/Makefile
+
+
+#######
+# USB #
+#######
+
+# atm
+
+announce USB_CXACRU - "Conexant AccessRunner USB support"
+reject_firmware drivers/usb/atm/cxacru.c
+clean_blob drivers/usb/atm/cxacru.c
+clean_kconfig drivers/usb/atm/Kconfig 'USB_CXACRU'
+clean_mk CONFIG_USB_CXACRU drivers/usb/atm/Makefile
+
+announce USB_SPEEDTOUCH - "Speedtouch USB support"
+reject_firmware drivers/usb/atm/speedtch.c
+clean_blob drivers/usb/atm/speedtch.c
+clean_kconfig drivers/usb/atm/Kconfig 'USB_SPEEDTOUCH'
+clean_mk CONFIG_USB_SPEEDTOUCH drivers/usb/atm/Makefile
+
+announce USB_UEAGLEATM - "ADI 930 and eagle USB DSL modem"
+reject_firmware drivers/usb/atm/ueagle-atm.c
+clean_blob drivers/usb/atm/ueagle-atm.c
+clean_kconfig drivers/usb/atm/Kconfig 'USB_UEAGLEATM'
+clean_mk CONFIG_USB_UEAGLEATM drivers/usb/atm/Makefile
 
 # misc
 
-# USB_EMI26 - EMI 2|6 USB Audio interface
-# No need to remove this, it doesn't contain non-Free code.
-# clean_blob drivers/usb/misc/emi26.c
+announce USB_EMI26 - "EMI 2|6 USB Audio interface"
 # 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
 
-# USB_EMI62 - EMI 6|2m USB Audio interface
-# No need to remove this, it doesn't contain non-Free code.
-# clean_blob drivers/usb/misc/emi62.c
+announce USB_EMI62 - "EMI 6|2m USB Audio interface"
 # 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
 
-# USB_SISUSBVGA - USB 2.0 SVGA dongle support (Net2280/SiS315)
-clean_blob drivers/usb/misc/sisusbvga/sisusb_init.h
-clean_kconfig drivers/usb/misc/sisusbvga/Kconfig 'USB_SISUSBVGA'
-clean_mk CONFIG_USB_SISUSBVGA drivers/usb/misc/sisusbvga/Makefile
+announce USB_ISIGHTFW - "iSight firmware loading support"
+reject_firmware drivers/usb/misc/isight_firmware.c
+clean_blob drivers/usb/misc/isight_firmware.c
+clean_kconfig drivers/usb/misc/Kconfig 'USB_ISIGHTFW'
+clean_mk CONFIG_USB_ISIGHTFW drivers/usb/misc/Makefile
 
 # serial
 
-# USB_SERIAL_KEYSPAN_MPR - USB Keyspan MPR Firmware
+announce USB_SERIAL_KEYSPAN - "USB Keyspan USA-xxx Serial Driver"
 drop_fw_file firmware/keyspan/mpr.HEX firmware/keyspan/mpr.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_MPR'
-# USB_SERIAL_KEYSPAN_USA18X - USB Keyspan USA-18X Firmware
 drop_fw_file firmware/keyspan/usa18x.HEX firmware/keyspan/usa18x.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA18X'
-# USB_SERIAL_KEYSPAN_USA19 - USB Keyspan USA-19 Firmware
 drop_fw_file firmware/keyspan/usa19.HEX firmware/keyspan/usa19.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19'
-# USB_SERIAL_KEYSPAN_USA19QI - USB Keyspan USA-19QI Firmware
 drop_fw_file firmware/keyspan/usa19qi.HEX firmware/keyspan/usa19qi.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QI'
-# USB_SERIAL_KEYSPAN_USA19QW - USB Keyspan USA-19QW Firmware
 drop_fw_file firmware/keyspan/usa19qw.HEX firmware/keyspan/usa19qw.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QW'
-# USB_SERIAL_KEYSPAN_USA19W - USB Keyspan USA-19W Firmware
 drop_fw_file firmware/keyspan/usa19w.HEX firmware/keyspan/usa19w.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19W'
-# USB_SERIAL_KEYSPAN_USA28 - USB Keyspan USA-28 Firmware
 drop_fw_file firmware/keyspan/usa28.HEX firmware/keyspan/usa28.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28'
-# USB_SERIAL_KEYSPAN_USA28XA - USB Keyspan USA-28XA Firmware
 drop_fw_file firmware/keyspan/usa28xa.HEX firmware/keyspan/usa28xa.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XA'
-# USB_SERIAL_KEYSPAN_USA28XB - USB Keyspan USA-28XB Firmware
 drop_fw_file firmware/keyspan/usa28xb.HEX firmware/keyspan/usa28xb.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XB'
-# USB_SERIAL_KEYSPAN_USA28X - USB Keyspan USA-28X Firmware
 drop_fw_file firmware/keyspan/usa28x.HEX firmware/keyspan/usa28x.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28X'
-# USB_SERIAL_KEYSPAN_USA49W - USB Keyspan USA-49W Firmware
 drop_fw_file firmware/keyspan/usa49w.HEX firmware/keyspan/usa49w.fw
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49W'
-# USB_SERIAL_KEYSPAN_USA49WLC - USB Keyspan USA-49WLC Firmware
 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
 
-# USB_SERIAL_EDGEPORT - USB Inside Out Edgeport Serial Driver
+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_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
 
-# USB_SERIAL_EDGEPORT_TI - USB Inside Out Edgeport Serial Driver (TI devices)
-clean_fw firmware/edgeport/boot2.H16 firmware/edgeport/boot2.fw
+announce USB_SERIAL_EDGEPORT_TI - "USB Inside Out Edgeport Serial Driver (TI devices)"
 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
 
-# USB_SERIAL_TI - USB TI 3410/5052 Serial Driver
+announce USB_SERIAL_TI - "USB TI 3410/5052 Serial Driver"
 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
 
-# USB_SERIAL_WHITEHEAT - USB ConnectTech WhiteHEAT Serial Driver
+announce USB_SERIAL_WHITEHEAT - "USB ConnectTech WhiteHEAT Serial Driver"
 clean_fw firmware/whiteheat.HEX firmware/whiteheat.fw
 clean_fw firmware/whiteheat_loader.HEX firmware/whiteheat_loader.fw
 clean_fw firmware/whiteheat_loader_debug.HEX firmware/whiteheat_loader_debug.fw
+reject_firmware drivers/usb/serial/whiteheat.c
+clean_blob drivers/usb/serial/whiteheat.c
 clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_WHITEHEAT'
 clean_mk CONFIG_USB_SERIAL_WHITEHEAT drivers/usb/serial/Makefile
 
+# uwb
 
-#########################
-# Removed video Drivers #
-#########################
+announce UWB_I1480U - Support for Intel Wireless UWB Link 1480 HWA
+reject_firmware drivers/uwb/i1480/dfu/i1480-dfu.h
+reject_firmware drivers/uwb/i1480/dfu/mac.c
+reject_firmware drivers/uwb/i1480/dfu/phy.c
+clean_blob drivers/uwb/i1480/dfu/usb.c
+clean_kconfig drivers/uwb/Kconfig 'UWB_I1480U'
+clean_mk CONFIG_UWB_I1480U drivers/uwb/i1480/dfu/Makefile
 
-# FB_ASILIANT - Asiliant (Chips) 69000 display support
-clean_blob drivers/video/asiliantfb.c
-clean_kconfig drivers/video/Kconfig 'FB_ASILIANT'
-clean_mk CONFIG_FB_ASILIANT drivers/video/Makefile
 
-# FB_CT65550 - Chips 65550 display support
-clean_blob drivers/video/chipsfb.c
-clean_kconfig drivers/video/Kconfig 'FB_CT65550'
-clean_mk CONFIG_FB_CT65550 drivers/video/Makefile
 
-# USB_GSPCA - Conexant 11646
-clean_blob drivers/media/video/gspca/conex.c
-# clean_kconfig drivers/video/gspca/Kconfig 'USB_GSPCA'
-# clean_mk CONFIG_USB_GSPCA drivers/video/Makefile
+#########
+# Sound #
+#########
 
-#########################
-# Removed Sound Drivers #
-#########################
-
-# SND_CS46XX - Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x
-clean_blob sound/pci/cs46xx/cs46xx_image.h
-# Blobs containing comments, not recognized by deblob-check
+announce SND_CS46XX - "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
+# This appears to have been extracted from some non-Free driver
+clean_file sound/pci/cs46xx/cs46xx_image.h
+# The following blobs are definitely extracted from non-Free drivers.
 clean_file sound/pci/cs46xx/imgs/cwc4630.h
 clean_file sound/pci/cs46xx/imgs/cwcasync.h
-clean_file sound/pci/cs46xx/imgs/cwcdma.h
 clean_file sound/pci/cs46xx/imgs/cwcsnoop.h
+clean_sed '
+/^\(int \)\?snd_cs46xx_download_image([^;]*$/,/^}$/{
+  /for.*BA1_MEMORY_COUNT/i\
+#if 0
+  /^}$/{
+    i\
+#else\
+       snd_printk(KERN_ERR "cs46xx: Missing Free firmware\\n");\
+       return -EINVAL;\
+#endif
+  }
+}
+s/cs46xx_dsp_load_module(chip, [&]cwc\(4630\|async\|snoop\)_module)/(snd_printk(KERN_ERR "cs46xx: Missing Free firmware\\n"),-EINVAL)/
+' sound/pci/cs46xx/cs46xx_lib.c 'report missing Free firmware'
+clean_blob sound/pci/cs46xx/cs46xx_lib.c
 clean_kconfig sound/pci/Kconfig 'SND_CS46XX'
-# sed -i '/cs46xx\/ \\/d' sound/pci/Makefile
+clean_mk 'CONFIG_SND_CS46XX' sound/pci/cs46xx/Makefile
 
-# SND_KORG1212 - Korg 1212 IO
+announce SND_KORG1212 - "Korg 1212 IO"
 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'
+clean_mk 'CONFIG_SND_KORG1212' sound/pci/korg1212/Makefile
 
-# SND_MAESTRO3 - ESS Allegro/Maestro3
+announce SND_MAESTRO3 - "ESS Allegro/Maestro3"
 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'
+clean_mk 'CONFIG_SND_MAESTRO3' sound/pci/Makefile
 
-# SND_YMFPCI - Yamaha YMF724/740/744/754
+announce SND_YMFPCI - "Yamaha YMF724/740/744/754"
 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'
+clean_mk 'CONFIG_SND_YMFPCI' sound/pci/ymfpci/Makefile
 
-# SND_SB16_CSP_FIRMWARE_IN_KERNEL - SB16 Advanced Signal Processor
+announce SND_SB16_CSP - "SB16 Advanced Signal Processor"
 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
-
-# SND_WAVEFRONT_FIRMWARE_IN_KERNEL
-# Most of this file is not matched by deblob-check because of WAIT_IDLE.
-# Just remove it.
-clean_file sound/isa/wavefront/yss225.c
-clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL'
-
-
-###########################
-# Removed Staging Drivers #
-###########################
-
-# ME4000 - Meilhaus ME-4000 I/O board
-clean_file drivers/staging/me4000/me4000_firmware.h
-clean_file drivers/staging/me4000/me4610_firmware.h
-clean_kconfig drivers/staging/me4000/Kconfig 'ME4000'
-clean_mk CONFIG_ME4000 drivers/staging/me4000/Makefile
-
-# SLICOSS - Alacritech Gigabit IS-NIC cards
-clean_blob drivers/staging/slicoss/gbdownload.h
-clean_blob drivers/staging/slicoss/oasisdownload.h
-clean_blob drivers/staging/slicoss/oasisdbgdownload.h
-clean_blob drivers/staging/slicoss/gbrcvucode.h
-clean_blob drivers/staging/slicoss/oasisrcvucode.h
-clean_kconfig drivers/staging/slicoss/Kconfig 'SLICOSS'
-clean_mk CONFIG_SLICOSS drivers/staging/slicoss/Makefile
-
-# SXG - Alacritech SLIC Technology Non-Accelerated 10Gbe cards
-clean_blob drivers/staging/sxg/saharadbgdownload.h
-clean_blob drivers/staging/sxg/sxgphycode.h
-clean_kconfig drivers/staging/sxg/Kconfig 'SXG'
-clean_mk CONFIG_SXG drivers/staging/sxg/Makefile
+reject_firmware sound/isa/sb/sb16_csp.c
+clean_blob sound/isa/sb/sb16_csp.c
+clean_kconfig sound/isa/Kconfig 'SND_SB16_CSP'
+clean_mk 'CONFIG_SND_SB16_CSP' sound/isa/sb/Makefile
+
+announce SND_WAVEFRONT - "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
+clean_blob sound/isa/wavefront/yss225.c
+clean_sed '
+/firmware = &yss225_registers_firmware/i\
+       snd_printk(KERN_ERR "FX: Missing Free firmware\\n");\
+       err = -EINVAL;\
+       goto out;
+' sound/isa/wavefront/wavefront_fx.c 'report missing Free firmware'
+reject_firmware sound/isa/wavefront/wavefront_fx.c
+clean_blob sound/isa/wavefront/wavefront_fx.c
+reject_firmware sound/isa/wavefront/wavefront_synth.c
+clean_blob sound/isa/wavefront/wavefront_synth.c
+clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT'
+clean_mk 'CONFIG_SND_WAVEFRONT' sound/isa/wavefront/Makefile
+
+announce SND_VX_LIB - Digigram VX soundcards
+reject_firmware sound/drivers/vx/vx_hwdep.c
+clean_blob sound/drivers/vx/vx_hwdep.c
+clean_kconfig sound/drivers/Kconfig 'SND_VX_LIB'
+clean_mk CONFIG_SND_VX_LIB sound/drivers/vx/Makefile
+
+announce SND_DARLA20 - "(Echoaudio) Darla20"
+clean_blob sound/pci/echoaudio/darla20.c
+clean_kconfig sound/pci/Kconfig 'SND_DARLA20'
+clean_mk CONFIG_SND_DARLA20 sound/pci/echoaudio/Makefile
+
+announce SND_DARLA24 - "(Echoaudio) Darla24"
+clean_blob sound/pci/echoaudio/darla24.c
+clean_kconfig sound/pci/Kconfig 'SND_DARLA24'
+clean_mk CONFIG_SND_DARLA24 sound/pci/echoaudio/Makefile
+
+announce SND_ECHO3G - "(Echoaudio) 3G cards"
+clean_blob sound/pci/echoaudio/echo3g.c
+clean_kconfig sound/pci/Kconfig 'SND_ECHO3G'
+clean_mk CONFIG_SND_ECHO3G sound/pci/echoaudio/Makefile
+
+announce SND_GINA20 - "(Echoaudio) Gina20"
+clean_blob sound/pci/echoaudio/gina20.c
+clean_kconfig sound/pci/Kconfig 'SND_GINA20'
+clean_mk CONFIG_SND_GINA20 sound/pci/echoaudio/Makefile
+
+announce SND_GINA24 - "(Echoaudio) Gina24"
+clean_blob sound/pci/echoaudio/gina24.c
+clean_kconfig sound/pci/Kconfig 'SND_GINA24'
+clean_mk CONFIG_SND_GINA24 sound/pci/echoaudio/Makefile
+
+announce SND_INDIGO - "(Echoaudio) Indigo"
+clean_blob sound/pci/echoaudio/indigo.c
+clean_kconfig sound/pci/Kconfig 'SND_INDIGO'
+clean_mk CONFIG_SND_INDIGO sound/pci/echoaudio/Makefile
+
+announce SND_INDIGODJ - "(Echoaudio) Indigo DJ"
+clean_blob sound/pci/echoaudio/indigodj.c
+clean_kconfig sound/pci/Kconfig 'SND_INDIGODJ'
+clean_mk CONFIG_SND_INDIGODJ sound/pci/echoaudio/Makefile
+
+announce SND_INDIGOIO - "(Echoaudio) Indigo IO"
+clean_blob sound/pci/echoaudio/indigoio.c
+clean_kconfig sound/pci/Kconfig 'SND_INDIGOIO'
+clean_mk CONFIG_SND_INDIGOIO sound/pci/echoaudio/Makefile
+
+announce SND_LAYLA20 - "(Echoaudio) Layla20"
+clean_blob sound/pci/echoaudio/layla20.c
+clean_kconfig sound/pci/Kconfig 'SND_LAYLA20'
+clean_mk CONFIG_SND_LAYLA20 sound/pci/echoaudio/Makefile
+
+announce SND_LAYLA24 - "(Echoaudio) Layla24"
+clean_blob sound/pci/echoaudio/layla24.c
+clean_kconfig sound/pci/Kconfig 'SND_LAYLA24'
+clean_mk CONFIG_SND_LAYLA24 sound/pci/echoaudio/Makefile
+
+announce SND_MIA - "(Echoaudio) Mia"
+clean_blob sound/pci/echoaudio/mia.c
+clean_kconfig sound/pci/Kconfig 'SND_MIA'
+clean_mk CONFIG_SND_MIA sound/pci/echoaudio/Makefile
+
+announce SND_MONA - "(Echoaudio) Mona"
+clean_blob sound/pci/echoaudio/mona.c
+clean_kconfig sound/pci/Kconfig 'SND_MONA'
+clean_mk CONFIG_SND_MONA sound/pci/echoaudio/Makefile
+
+announce SND_'<(Echoaudio)>' - "(Echoaudio) all of the above "
+reject_firmware sound/pci/echoaudio/echoaudio.c
+clean_blob sound/pci/echoaudio/echoaudio.c
+
+announce SND_EMU10K1 - "Emu10k1 (SB Live!, Audigy, E-mu APS)"
+reject_firmware sound/pci/emu10k1/emu10k1_main.c
+clean_blob sound/pci/emu10k1/emu10k1_main.c
+clean_kconfig sound/pci/Kconfig 'SND_EMU10K1'
+clean_mk CONFIG_SND_EMU10K1 sound/pci/emu10k1/Makefile
+
+announce SND_MIXART - "Digigram miXart"
+reject_firmware sound/pci/mixart/mixart_hwdep.c
+clean_blob sound/pci/mixart/mixart_hwdep.c
+clean_kconfig sound/pci/Kconfig 'SND_MIXART'
+clean_mk CONFIG_SND_MIXART sound/pci/mixart/Makefile
+
+announce SND_PCXHR - "Digigram PCXHR"
+reject_firmware sound/pci/pcxhr/pcxhr_hwdep.c
+clean_blob sound/pci/pcxhr/pcxhr_hwdep.c
+clean_kconfig sound/pci/Kconfig 'SND_PCXHR'
+clean_mk CONFIG_SND_PCXHR sound/pci/pcxhr/Makefile
+
+announce SND_RIPTIDE - "Conexant Riptide"
+reject_firmware sound/pci/riptide/riptide.c
+clean_blob sound/pci/riptide/riptide.c
+clean_kconfig sound/pci/Kconfig 'SND_RIPTIDE'
+clean_mk CONFIG_SND_RIPTIDE sound/pci/riptide/Makefile
+
+announce SND_HDSP - "RME Hammerfall DSP Audio"
+reject_firmware sound/pci/rme9652/hdsp.c
+clean_blob sound/pci/rme9652/hdsp.c
+clean_kconfig sound/pci/Kconfig 'SND_HDSP'
+clean_mk CONFIG_SND_HDSP sound/pci/rme9652/Makefile
+
+announce SND_AICA - "Dreamcast Yamaha AICA sound"
+reject_firmware sound/sh/aica.c
+clean_blob sound/sh/aica.c
+clean_kconfig sound/sh/Kconfig 'SND_AICA'
+clean_mk CONFIG_SND_AICA sound/sh/Makefile
+
+announce SOUND_MSNDCLAS - "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"
+clean_blob sound/oss/msnd_classic.h
+clean_kconfig sound/oss/Kconfig 'SOUND_MSNDCLAS'
+clean_sed '
+/^config MSNDCLAS_INIT_FILE$/, /^config / {
+  /^   default.*msndinit\.bin/ s,".*","/*(DEBLOBBED)*/",;
+}
+/^config MSNDCLAS_PERM_FILE$/, /^config / {
+  /^   default.*msndperm\.bin/ s,".*","/*(DEBLOBBED)*/",;
+}' sound/oss/Kconfig 'removed default firmware'
+clean_mk CONFIG_SOUND_MSNDCLAS sound/oss/Makefile
+
+announce SOUND_MSNDPIN - "Support for Turtle Beach MultiSound Pinnacle"
+clean_blob sound/oss/msnd_pinnacle.h
+clean_kconfig sound/oss/Kconfig 'SOUND_MSNDPIN'
+clean_sed '
+/^config MSNDPIN_INIT_FILE$/, /^config / {
+  /^   default.*pndspini\.bin/ s,".*","/*(DEBLOBBED)*/",;
+}
+/^config MSNDPIN_PERM_FILE$/, /^config / {
+  /^   default.*pndsperm\.bin/ s,".*","/*(DEBLOBBED)*/",;
+}' sound/oss/Kconfig 'removed default firmware'
+clean_mk CONFIG_SOUND_MSNDPIN sound/oss/Makefile
+
+announce SOUND_SSCAPE - "Ensoniq SoundScape support"
+clean_blob sound/oss/sscape.c
+clean_kconfig sound/oss/Kconfig 'SOUND_SSCAPE'
+clean_mk CONFIG_SOUND_SSCAPE sound/oss/Makefile
+
+announce SOUND_TRIX - "MediaTrix AudioTrix Pro support"
+clean_blob sound/oss/trix.c
+clean_kconfig sound/oss/Kconfig 'SOUND_TRIX'
+clean_sed '
+/^config TRIX_BOOT_FILE$/, /^config / {
+  /^   default.*trxpro\.hex/ s,".*","/*(DEBLOBBED)*/",;
+}' sound/oss/Kconfig 'removed default firmware'
+clean_mk CONFIG_SOUND_TRIX sound/oss/Makefile
+
+announce SOUND_TRIX - "See above,"
+announce SOUND_PAS - "ProAudioSpectrum 16 support,"
+announce SOUND_SB - "100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support"
+clean_blob sound/oss/sb_common.c
+clean_kconfig sound/oss/Kconfig 'SOUND_PAS'
+clean_kconfig sound/oss/Kconfig 'SOUND_SB'
+clean_mk CONFIG_SOUND_PAS sound/oss/Makefile
+clean_mk CONFIG_SOUND_SB sound/oss/Makefile
+
+announce SOUND_PSS - "PSS (AD1848, ADSP-2115, ESC614) support"
+clean_blob sound/oss/pss.c
+clean_kconfig sound/oss/Kconfig 'SOUND_PSS'
+clean_sed '
+/^config PSS_BOOT_FILE$/, /^config / {
+  /^   default.*dsp001\.ld/ s,".*","/*(DEBLOBBED)*/",;
+}' sound/oss/Kconfig 'removed default firmware'
+clean_mk CONFIG_SOUND_PSS sound/oss/Makefile
+
+#################
+# Documentation #
+#################
+
+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_file Documentation/dvb/get_dvb_firmware
+clean_file Documentation/video4linux/extract_xc3028.pl
+clean_blob drivers/base/Kconfig
+clean_blob firmware/WHENCE
 
 exit 0
index 3d9b7c0e8ec4a316219292627b5b6ce65578a392..bf3414c16c3716f434d3d066263ed9e7ab073e7e 100755 (executable)
@@ -1,13 +1,13 @@
 #! /bin/sh
 
-# deblob-check version 2008-12-25
+# deblob-check version 2009-03-19
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
 # Check http://www.fsfla.org/svn/fsfla/software/linux-libre for newer
 # versions.
 
-# Copyright (C) 2008 Alexandre Oliva
+# Copyright 2008, 2009 Alexandre Oliva <lxoliva@fsfla.org>
 #
 # 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
 
 
 # usage: deblob-check [-S] [-vv] [-s S] [-lDdBbCcXxPpFftVh?H] \
-#        [*.tar* patch-* *.patch *.diff]
+#        *.tar* patch-* [-i prefix/] *.patch *.diff...
 
-# Look for too-long undocumented sequences of numbers (generally blobs
-# in disguise) in source files.
+# Look for and report too-long undocumented sequences of numbers
+# (generally blobs in disguise) in source files, as well as requests
+# for loading non-Free firmware.
 
 # The order of command line flags is significant.  Flags given out of
 # the order above won't be handled correctly, sorry.
 #              context around the blobs.
 
 # -X --print-all-matches: print all blobs, be they known false
-#              positives or blobs.
+#              positives or actual blobs.
 
 # -x --list-all-matches: list files that contain sequences that appear
 #              to be blobs, be they known false positives or not.
 
 # -p --mark-false-positives: print the processed input, replacing
-#              sequences that match the blob detector test, but that
-#              are known to be false positives, with /*(DEBLOBBED)*/.
+#              sequences that match the blob detector test, even those 
+#              known to be false positives, with /*(DEBLOBBED)*/.
 
 # -P --list-false-positives: list files that contain false positives.
 
 # -v --verbose: increase verbosity level, for internal debugging.  May
 #              be given at most twice.
 
+
+# file options:
+
+# --: Don't process command-line options any further.  All following
+#              arguments are taken as filenames.
+
+# -i --implied-prefix --prefix: prepend the given prefix to each filename
+#              listed after this option, when configuring false positives
+#              and negatives.
+
+# *.tar*: iterate over all files in the named tar file.
+
+# *.patch, patch-*, *.diff: Look for blobs in the [ +] parts of the
+#              *patch, unless --reverse-patch is given, in which case
+#              the [ -] parts will be used.
+
+# Anything else is assumed to be a source file.
+
+# *.gz | *.bz2: Decompress automatically.
+
+
 # The exit status is only significant for the --list options: it will
 # be true if nothing was found, and false otherwise.
 
@@ -261,6 +283,20 @@ case $1 in
   ;;
 esac
 
+prefix=/
+case $1 in
+--implied-prefix | --prefix| -i)
+  prefix=$2
+  case $prefix in
+  /*/) ;;
+  */) prefix=/$prefix ;;
+  /*) prefix=$prefix/ ;;
+  *) prefix=/$prefix/ ;;
+  esac
+  shift 2 || exit 1
+  ;;
+esac
+
 test_mode=false
 
 name=deblob-check
@@ -359,7 +395,9 @@ case $1 in
   set_sed_cmd () {
     set_sedmain "" "" "
 i\\
-$file
+$file\\
+/*(DEBLOB-\\
+ERROR)*/
 q 1;"
   }
   ;;
@@ -369,10 +407,14 @@ q 1;"
   set_sed_cmd () {
     set_sedmain "
 i\\
-$file
+$file\\
+/*(DEBLOB-\\
+ERROR)*/
 q 1;" "" "
 i\\
-$file
+$file\\
+/*(DEBLOB-\\
+ERROR)*/
 q 1;"
   }
   ;;
@@ -386,9 +428,10 @@ q 1;"
 
 *)
   case $1 in
-  -- | -l | --list-blobs) shift;;
+  -l | --list-blobs) shift;;
   esac
   case $1 in
+  -- | --implied-prefix | --prefix | -i) ;;
   -*)
     if test ! -f "$1"; then
       echo "$name: \`$1' given too late or out of the proper sequence." >&2
@@ -401,7 +444,9 @@ q 1;"
   set_sed_cmd () {
     set_sedmain "
 i\\
-$file
+$file\\
+/*(DEBLOB-\\
+ERROR)*/
 q 1;"
   }
   ;;
@@ -409,7 +454,9 @@ q 1;"
 esac
 
 case $1 in
---) shift;;
+--)
+  sawdashdash=t
+  shift;;
 esac
 
 if $test_mode; then
@@ -511,7 +558,7 @@ set_except () {
 
   # Match up to the end a comment started in $1.
   ocomment () {
-    addx "$1\\([^*]\\|[*][*]*[^*/]\\|[*]*[\\n]\\)*[*]*[*][/]" $2
+    addx "$1[/]*\\([^/]\\|[^*/][/]*\\)*[*][/]" $2
   }
 
   # Match $1 followed by backslash-terminated lines and a last
@@ -520,30 +567,31 @@ set_except () {
     addx "$1\\([^\\n]*\\\\[\\n]\\)*[^\\n\\\\]*$eol" $2
   }
 
-  # Match $1 in $2 as a blob.  Not implemented yet.
-  blob () {
-    :
+  # Match $1 in $2 as a blob.  Not anchored.
+  blobna () {
+    badx "$1" $2
   }
 
-  case /$1 in
-  /drivers/net/tg3.c)
-    # This file contains firmwares that we deblob with high
-    # sensitivity, so make sure the sequences of numbers that are not
-    # blobs are not deblobbed.  FIXME: we should have patterns to
-    # recognize the blobs instead.
-    defsnc '   static const u32 test_pat\[4\]\[6\] =' drivers/net/tg3.c
-    accept "   }\\(,\\? mem_tbl_5\\(70x\\|705\\|755\\|906\\)\\[\\] = {$sepx$blobpat*$sepx}\\)*;" drivers/net/tg3.c
-    ;;
+  # Match $1 as a blob anywhere.  $2 is just for documentation purposes.
+  blobname () {
+    badx "$1"
+  }
 
-  /drivers/media/video/gspca/conex.c)
-    # FIXME: we shouldn't have to duplicate this here, but deblob
-    # doesn't pass us a pathname that matches linux-*.*.*/, and then
-    # we end up deblobbing false positives.
-    defsnc 'static const __u8 cx_inits_\(176\|320\|352\|640\)\[\] =' drivers/media/video/gspca/conex.c
-    defsnc 'static const __u8 cx_jpeg_init\[\]\[8\] =' drivers/media/video/gspca/conex.c
-    defsnc 'static const __u8 cxjpeg_\(640\|352\|320\|176\|qtable\)\[\]\[8\] =' drivers/media/video/gspca/conex.c
-    ;;
+  # Match $1 in $2 as a blob.  The expectation is a match in the
+  # beginning of line, but we don't do anchoring of blob patterns ATM.
+  blob () {
+    badx "$1" $2
+  }
+
+  blobna 'request_firmware_nowait'
+  blobna 'request_firmware'
+  blobna 'request_ihex_firmware'
+  blobna 'MODULE_FIRMWARE[     \n]*([^;]*)[    \n]*;\([        \n]*MODULE_FIRMWARE[    \n]*([^;]*)[    \n]*;\)*'
+  blobna 'DEFAULT_FIRMWARE'
+  blobna '\(\.\|->\)firmware[  \n]*=[^=]'
+  blobna 'mod_firmware_load' # sound/
 
+  case $prefix$1 in
   */*linux*.tar* | */*kernel*.tar* | */*linux-*.*.*/*)
     # false alarms, contain source
     # drivers/net/wan/wanxlfw.inc_shipped -> wanxlfw.S
@@ -618,6 +666,13 @@ set_except () {
     defsnc 'static const char zr360[56]0_dqt\[0x86\] =' 'drivers/media/video/zr36060\.c\|drivers/media/video/zoran/zr36060\.c'
     defsnc 'static u8 tas3004_treble_table\[\] =' sound/aoa/codecs/tas-basstreble.h
 
+    # This file contains firmwares that we deblob with high
+    # sensitivity, so make sure the sequences of numbers that are not
+    # blobs are not deblobbed.  FIXME: we should have patterns to
+    # recognize the blobs instead.
+    defsnc '   static const u32 test_pat\[4\]\[6\] =' drivers/net/tg3.c
+    accept "   }\\(,\\? mem_tbl_5\\(70x\\|705\\|755\\|906\\)\\[\\] = {$sepx$blobpat*$sepx}\\)*;" drivers/net/tg3.c
+
     # end of generic checked expressions.
     # version-specific checked bits start here
 
@@ -781,6 +836,528 @@ set_except () {
     defsnc 'static u8 stv0288_inittab\[\] =' drivers/media/dvb/frontends/stv0288.c
     defsnc 'static const struct rf_channel rf_vals_b\[\] =' drivers/net/wireless/rt2x00/rt2400pci.c
 
+    # request_firmware matches for 2.6.28
+    accept 'D: Firmware loader (request_firmware)' CREDITS
+    accept 'FIRMWARE LOADER (request_firmware)' MAINTAINERS
+    accept '   - request_firmware() hotplug interface info.' Documentation/00-INDEX
+    accept 'This driver requires a patch for firmware_class[^\n]*[\n]request_firmware_nowait function\.' Documentation/dell_rbu.txt
+    accept ' request_firmware() hotplug interface:[\n] --*[\n].* - request_firmware_nowait() is also provided for convenience' Documentation/firmware_class/README
+    accept 'Still, there are kernel threads that may want.*For example, if request_.*_firmware() will fail regardless' Documentation/power/freezing-of-tasks.txt
+    accept 'Also, there may be some operations,.*calling request_firmware() from their .resume() routines' Documentation/power/notifiers.txt
+    accept 'There is an USB interface for downloading[/]uploading.*request_firmware interface\.' Documentation/video4linux/si470x.txt
+    accept '[\t]- move firmware loading to request_firmware()' drivers/staging/slicoss/README
+    accept 'config FIRMWARE_IN_KERNEL.*let firmware be loaded from userspace\.' drivers/base/Kconfig
+    accept 'static int[\n]_request_firmware(const struct firmware \*\*firmware_p, const char \*name,[^{]*[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c
+    accept 'static int[\n]request_firmware_work_func(void \*arg)[\n]{[\n]\([^}]\|[^\n}]}*\)*ret = _request_firmware(\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c
+    accept '[/][*][*][\n] [*] request_firmware: - send firmware [^{]*[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c
+    accept '[/][*][*][\n] [*] request_firmware_nowait: asynchronous version[^{]*[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/base/firmware_class.c
+    accept 'EXPORT_SYMBOL(request_firmware\(_nowait\)\?);' drivers/base/firmware_class.c
+    accept 'int request_firmware\(_nowait\)\?([^;]*);' include/linux/firmware.h
+    accept 'static inline int request_firmware\(_nowait\)\?([^{]*)[\n]{[\n][\t]return -EINVAL;[\n]}' include/linux/firmware.h
+    accept 'static inline int[\n]\(maybe_\)\?reject_firmware\(_nowait\)\?([^{;]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}' include/linux/firmware.h
+
+    accept 'static inline int request_ihex_firmware\?([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' include/linux/ihex.h
+    ocomment '[/][*] Optional firmware\([^\n]*[\n] [*]\)*[^\n]* MODULE_FIRMWARE()'
+    oprepline '#define MODULE_FIRMWARE(_firmware)' include/linux/module.h
+    accept ' [*] Sample code on how to use request_firmware() from drivers\.' samples/firmware_class/firmware_sample_driver.c
+    accept '[\t]\(retval\|error\) = request_firmware\(_nowait\)\?([^;]*"sample_driver_fw",[^;]*);' samples/firmware_class/firmware_sample_driver.c
+    ocomment ' [/][*] request_firmware blocks until userspace finished' samples/firmware_class/firmware_sample_driver.c
+    accept '           [ \t]*" request_firmware_nowait failed' samples/firmware_class/firmware_sample_driver.c
+
+    # We used to remove these in early versions of Linux-libre.
+    # They're now believed to be mere initialization data, rather than
+    # code disguised as such, and they're not long enough so as to
+    # render the software non-Free.
+    defsnc 'static u8 tda10021_inittab\[0x40\]=' drivers/media/dvb/frontends/tda10021.c
+    defsnc 'static u8 tda8083_init_tab \[\] =' drivers/media/dvb/frontends/tda8083.c
+    defsnc 'static u8 ves1820_inittab\[\] =' drivers/media/dvb/frontends/ves1820.c
+    defsnc 'static u8 init_1[89]93_w\?tab \?\[\] =' drivers/media/dvb/frontends/ves1x93.c
+    defsnc 'static const u8 saa7113_tab\[\] =' drivers/media/dvb/ttpci/budget-av.c
+    defsnc 'static u8 philips_sd1878_inittab\[\] =' drivers/media/dvb/ttpci/budget-av.c
+    defsnc 'const struct Kiara_table_entry Kiara_table\[PSZ_MAX\]\[6\]\[4\] =' drivers/media/video/pwc/pwc-kiara.c
+    defsnc 'const unsigned int KiaraRomTable \[8\]\[2\]\[16\]\[8\] =' drivers/media/video/pwc/pwc-kiara.c
+    defsnc 'const struct Timon_table_entry Timon_table\[PSZ_MAX\]\[PWC_FPS_MAX_TIMON\]\[4\] =' drivers/media/video/pwc/pwc-timon.c
+    defsnc 'const unsigned int TimonRomTable \[16\]\[2\]\[16\]\[8\] =' drivers/media/video/pwc/pwc-timon.c
+    defsnc '   static const struct struct_initData initData\[\] =' drivers/media/video/usbvideo/ibmcam.c
+    defsnc 'static const u8 rtl8187b_reg_table\[\]\[3\] =' drivers/net/wireless/rtl8187_dev.c
+    defsnc 'unsigned char \(IDX_ACTIVATE_\(READ\|WRITE\)\|\(CM\|ULP\)_\(ENABLE\|SETUP\)\|DM_ACT\|IPA_PDU_HEADER\|\(READ\|WRITE\)_CCW\)\[\] =' drivers/net/qeth_core_mpc.c
+    defsnc 'static unsigned char camera_ncm03j_magic\[\] =' arch/sh/boards/board-ap325rxa.c
+    defsnc 'static const unsigned short \(sync\|magic[0-3]\)_data\[\] =' arch/sh/boards/mach-migor/lcd_qvga.c
+    defsnc 'static unsigned char camera_ov772x_magic\[\] =' arch/sh/boards/mach-migor/setup.c
+    defsnc 'static struct chips_init_reg chips_init_[sgacfx]r\[\] =' 'drivers/video/\(asiliant\|chips\)fb.c'
+
+    # This one is quite suspicious, but it's small enough (64 bytes
+    # total) that it's believable that it could be actual source code.
+    defsnc 'static const __u8 cx11646_fw1\[\]\[3\] =' drivers/media/video/gspca/conex.c
+
+    # Hunting down non-Free firmware-loading code and instructions.
+    # Firmware names are to be caught anywhere.
+
+    blobname 'atmsar11\.fw' drivers/atm/ambassador.c
+
+    blob '    sprintf([^;]*fore200[^;]*FW_EXT[^;]*);' drivers/atm/fore200e.c
+    blobname '\(pc\|sb\)a200e\(_ecd\)\?\.bin[12]?' drivers/atm/fore200e.c
+    blobna 'The supplied firmware images.*fore.*Rebuild and re-install[^.]*\.' Documentation/networking/fore200e.txt
+
+    blobname 'intelliport2\.bin' drivers/char/ip2/ip2main.c
+
+    blob 'static unsigned char warp_g[24]00_t2\?gzs\?a\?f\?\[\] = {[^{};]*};\([\n][\n]*static unsigned char warp_g[24]00_t2\?gzs\?a\?f\?\[\] = {[^{};]*};\)*' drivers/gpu/drm/mga/mga_ucode.h
+    blob '#define \(MGA_WARP_CODE_ALIGN\|WARP_UCODE_\(SIZE\|INSTALL\)\)\([^\n]*\\[     ]*[\n]\)*[^\n]*' drivers/gpu/drm/mga/mga_warp.c
+    blob 'static const unsigned int mga_warp_g[24]00_microcode_size =[^;]*;' drivers/gpu/drm/mga/mga_warp.c
+    blob 'static int mga_warp_install_g[24]00_microcode([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/gpu/drm/mga/mga_warp.c
+    blobna '\(case MGA_CARD_TYPE_G[^:]*:[      \n]*\)\+return [^;]*mga_warp[^;]*microcode[^;]*;\([     \n]*\(case MGA_CARD_TYPE_G[^:]*:[       \n]*\)\+return [^;]*mga_warp[^;]*microcode[^;]*;[       ]*\)*' drivers/gpu/drm/mga/mga_warp.c
+
+    blob 'static u32 r128_cce_microcode\[\] = {[^{};]*};' drivers/gpu/drm/r128/r128_cce.c
+    blob 'static void r128_cce_load_microcode([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/gpu/drm/r128/r128_cce.c
+    blob '     r128_cce_load_microcode([^;]*);' drivers/gpu/drm/r128/r128_cce.c
+
+    blob 'static const u32 R[S0-9]*0_cp_microcode\[\]\[2\] = {[^{};]*};\([\n][\n]*static const u32 R[S0-9]*0_cp_microcode\[\]\[2\] = {[^{};]*};\)*' drivers/gpu/drm/radeon/radeon_microcode.h
+    blob '\([/][*] Load the microcode\([^/]\|[^*/][/]*\)*[*][/][\n]\)\?static void radeon_cp_load_microcode([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}[\n]' drivers/gpu/drm/radeon/radeon_cp.c
+    blobna 'radeon_cp_load_microcode([^;]*);' drivers/gpu/drm/radeon/radeon_cp.c
+
+    blob 'sub \(sp887[0x]\|tda1004\(5\|6\(lifeview\)\?\)\|av7110\|dec\(2\(00\|54\)0t\|3000s\)\|opera1\|vp7041\|dibusb\|nxt200[24]\|or51\(211\|132_\(qam\|vsb\)\)\|bluebird\) *{\([^}]*\|[^\n]}*\)[\n]}\([\n][\n]*sub \(sp887[0x]\|tda1004\(5\|6\(lifeview\)\?\)\|av7110\|dec\(2\(00\|54\)0t\|3000s\)\|opera1\|vp7041\|dibusb\|nxt200[24]\|or51\(211\|132_\(qam\|vsb\)\)\|bluebird\) *{\([^}]*\|[^\n]}*\)[\n]}\)*' Documentation/dvb/get_dvb_firmware
+    blobna 'Please use[^\n]*firmware[^\n]*sp887x[^\n]*\([\n][^\n]\+\)\+' Documentation/dvb/avermedia.txt
+    blob 'To extract the firmware[^\n]*Opera DVB-S1 USB-Box.*\/lib\/firmware\/ \.' Documentation/dvb/opera-firmware.txt
+    blobname '\(dvb-usb-opera[^\n]*\.fw\|2830S[^\n]*2\.sys\)' Documentation/dvb/opera-firmware.txt
+    blob 'Getting the Firmware\([\n][^\n]\+\)*' Documentation/dvb/ttusb-dec.txt
+
+    blob '\/\*[\n      ]*File automatically generated by createinit\.py using data[\n  ]*extracted from AF05BDA\.sys.*};' drivers/media/dvb/dvb-usb/af9005-script.h
+    blob '#include "af9005-script\.h"' drivers/media/dvb/dvb-usb/af9005-fe.c
+    blobna '[\n]       scriptlen = sizeof(script)[^;]*;[\n]    for[^{]*scriptlen[^{]*{[^}]*[^\n        }]' drivers/media/dvb/dvb-usb/af9005-fe.c
+
+    accept 'struct \(sp8870\|tda1004x\)_config[\n]{[^}]*(\*request_firmware)[^}]*[\n]};' 'drivers/media/dvb/frontends/\(sp8870\|tda1004x\)\.h'
+    blob '[/][*]\([^/]*\|[^*/][/]\)*get_dvb_firmware\([^/]*\|[^*/][/]*\)*[*][/]\([\n]\(#define \(\([^\n        ]*_DEFAULT\|NONFREE\)_FIRMWARE\|"[^"]*"\) \([^\n]*\|[\\][\n]\)*\|[/][*](DEBLOBBED)[*][/]\)\)*' 'drivers/media/dvb/frontends/\(nxt200x\|or51211\|sp887[0x]\|tda1004[8x]\)\.c'
+    blobname 'dvb-fe-sp8870\.fw' drivers/media/dvb/frontends/sp8870.c
+    blobname 'dvb-fe-tda1004[56]\.fw' drivers/media/dvb/frontends/tda1004x.c
+
+    # This bootcode is actually Free Software under GPLv2, but since it's
+    # being distributed without source code, we're taking it out.
+    blob 'static u8 bootcode\[\] = {[^}]*};' drivers/media/dvb/ttpci/av7110_hw.c
+    blobname 'dvb-ttpci-01\.fw' drivers/media/dvb/ttpci/av7110.c
+    defsnc 'static u8 nexusca_stv0297_inittab\[\] =' drivers/media/dvb/ttpci/av7110.c
+
+    defsnc 'static u8 philips_su1278_tt_inittab\[\] =' drivers/media/dvb/ttpci/budget-ci.c
+    defsnc 'static u8 dvbc_philips_tdm1316l_inittab\[\] =' drivers/media/dvb/ttpci/budget-ci.c
+
+    blobname 'ttusb-budget\/dspbootcode\.bin' drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+
+    blobname 'cpia2\/stv0672_vp4\.bin' drivers/media/video/cpia2/cpia2_core.c
+
+    blobname 'dabusb\/\(firmware\.fw\|bitstream\.bin\)' drivers/media/video/dabusb.c
+
+    blob 'static u32 tigon2\?Fw\(Text\|Rodata\|Data\)\[(MAX_\(TEXT\|RODATA\|DATA\)_LEN\/4) + 1\] __devinitdata = {[^}]*};\([\n]static u32 tigon2\?Fw\(Text\|Rodata\|Data\)\[(MAX_\(TEXT\|RODATA\|DATA\)_LEN\/4) + 1\] __devinitdata = {[^}]*};\)*' drivers/net/acenic_firwmare.h
+    blob '#define tigon2\?Fw[^ ]*\(Addr\|Len\) 0x[^\n]*\([\n]#define tigon2\?Fw[^ ]*\(Addr\|Len\) 0x[^\n]*\)\+' drivers/net/acenic_firmware.h
+    blob '\([/][*]\([^/]*\|[^*/][/]*\)*Do not try to clear\([^/]*\|[^*/][/]*\)*[*][/][\n]      \)\?ace_clear[^;]*;[\n]\([^}]*{[^}]*ace_copy[^}]*tigon2\?Fw[^}]*}\)*[\n]\+      return 0;[\n]}' drivers/net/acenic.c
+    blob 'if (\(ACE_IS_TIGON_I(ap)\|ap->version == 2\))[\n]            writel(tigon2\?FwStartAddr, [&]regs->Pc);\([\n] if (\(ACE_IS_TIGON_I(ap)\|ap->version == 2\))[\n]               writel(tigon2\?FwStartAddr, [&]regs->Pc);\)*' drivers/net/acenic.c
+
+    blob '#include "starfire_firmware\.h"' drivers/net/starfire.c
+    blob '[/][*]\([^/]*\|[^*/][/]*\)*Load Rx\/Tx firmware\([^/]*\|[^*/][/]*\)*[*][/]\([\n]     for ([^)]*FIRMWARE_[RT]X_SIZE[^)]*)[\n]         writel[^;]*firmware_[rt]x[^;]*;\)\+' drivers/net/starfire.c
+
+    blob 'static \(u8\|const u32\|struct fw_info\) bnx2_\(\(COM\|CP\|[RT]XP\|TPAT\)_b0[69]Fw\(Text\|Data\|Rodata\)\|\(xi_\)\?rv2p_proc[12]\|\(com\|cp\|[rt]xp\|tpat\)_fw_0[69]\)\(\[[^]};]*\]\)* = {[^}]*};\([\n][\n]*static \(u8\|const u32\|struct fw_info\) bnx2_\(\(COM\|CP\|[RT]XP\|TPAT\)_b0[69]Fw\(Text\|Data\|Rodata\)\|\(xi_\)\?rv2p_proc[12]\|\(com\|cp\|[rt]xp\|tpat\)_fw_0[69]\)\(\[[^]};]*\]\)* = {[^}]*};\)*' 'drivers/net/bnx2_fw2\?.h'
+    blob '#include "bnx2_fw2\?\.h"\([\n][\n]*#include "bnx2_fw2\?\.h"\)*' drivers/net/bnx2.c
+    blob 'static void[\n]load_rv2p_fw([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}' drivers/net/bnx2.c
+    blob 'static int[\n]bnx2_init_cpus([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}' drivers/net/bnx2.c
+
+    # init_data_e1h? might actually be just data, but it doesn't
+    # really matter.
+    blob 'static const u32 \(init\?\|[tucx]sem_\(int_table\|pram\)\)_data_e1h\?\[\] = {[^}]*};\([\n][\n]*static const u32 \(init\?\|[tucx]sem_\(int_table\|pram\)\)_data_e1h\?\[\] = {[^}]*};\)*' drivers/net/bnx2x_init_values.h
+    blob 'static \(void \|const u32 \*\)bnx2x_\(sel_blob\|init_wr_wb\|init_block\)([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}\([\n][\n]*static \(void \|const u32 \*\)bnx2x_\(sel_blob\|init_wr_wb\|init_block\)([^{]*)[\n]{[\n]\([^}]\|[^\n}]}*\)*[\n]}\)*' drivers/net/bnx2x_init.h
+
+    blobname 'sun\/cassini\.bin' drivers/net/cassini.c
+
+    blobna 'static u16 \(sr\|twinax\)_edc\[\] = {[^;]*};' drivers/net/cxgb3/ael1002.c
+    blobna 'for ([^\n]*ARRAY_SIZE(\(sr\|twinax\)_edc)[^\n]*)[\n][^;]*mdio_write[^;]*;' drivers/net/cxgb3/ael1002.c
+    blobname 't3fw\(_protocol_sram\)\?-\(%d\|[0-9]*\)\.\(%d\|[0-9]*\)\.\(%d\|[0-9]*\)\.bin' drivers/net/cxgb3/cxgb3_main.c
+
+    blob '\([/][*][*]*[*][/][\n]*\)*\([/][*]\([^/]\|[^*/][/]*\)*Micro code\([^/]\|[^*/][/]*\)*8086:\([^/]\|[^*/][/]*\)*[*][/]\([\n]*[/][*]\([^/]\|[^*/][/]*\)*[*][/]\)*\|#define  *D10\(1M\(_B\)\?\|1S\|2_E\)_\(CPUSAVER_\(TIMER\|BUNDLE\|MIN_SIZE\)_DWORD\|RCVBUNDLE_UCODE\)[         ]\(\\[\n]\|[^\n]\)*\)\([\n]*[/][*]\([^/]\|[^*/][/]*\|[*][/][\n]*[/][*]\)*Micro code\([^/]\|[^*/][/]*\)*8086:\([^/]\|[^*/][/]*\)*[*][/]\([\n]*[/][*]\([^/]\|[^*/][/]*\)*[*][/]\)*\|[\n][\n]*#define  *D10\(1M\(_B\)\?\|1S\|2_E\)_\(CPUSAVER_\(TIMER\|BUNDLE\|MIN_SIZE\)_DWORD\|RCVBUNDLE_UCODE\)[        ]\(\\[\n]\|[^\n]\)*\)*' drivers/net/e100.c
+    blobna '\([/][*]\([^/]\|[*][/]*\)*[*][/][\n]*              \)\(ucode\[opts->\(timer\|bundle\|min_size\)_dword\] .= [^;]*;[\n][\n]*         \)*[^}]*UCODE_SIZE[^}]*cb_ucode[^}]*return;[\n] }' drivers/net/e100.c
+
+    blob 'static unsigned char __devinitdata lanai4_\(code\|data\)\[[0-9]*\] = {[^;]*};' drivers/net/myri_code.h
+    blob '#include "myri_code\.h"' drivers/net/myri_sbus.c
+    blobna '\([/][*]\([^/]\|[^*/][/]*\)*[*][/][\n       ]*\)\?for ([^\n]*sizeof(lanai4_\(code\|data\)[^\n]*)[\n][^\n]*sbus_writeb[^;]*lanai4_\(code\|data\)[^;]*lanai4_code_off[^;]*;\([\n      ]*\([/][*]\([^/]\|[^*/][/]*\)*[*][/][\n         ]*\)\?for ([^\n]*sizeof(lanai4_\(code\|data\)[^\n]*)[\n][^\n]*sbus_writeb[^;]*lanai4_\(code\|data\)[^;]*lanai4_\(code\|data\)_off[^;]*;\)*' drivers/net/myri_sbus.c
+
+    blob 'static u32 s_firmLoad\[\] = {[^;]*};' drivers/net/tehuti_fw.h
+    blob 'bdx_tx_push_desc_safe[^;]*s_firmLoad[^;]*;' drivers/net/tehuti.c
+    blob 'for ([^\n]*ARRAY_SIZE(s_firmLoad)[^\n]*)[\n   ]*s_firmLoad[^;]*=[^;]*s_firmLoad[^;]*;' drivers/net/tehuti.c
+
+    blob ' [*] Firmware is:[\n] [*]    Derived from proprietary[^/]*notice is accompanying it\.[\n] [*][/]' drivers/net/tg3.c
+    blob 'Derived from proprietary unpublished source code' drivers/net/tg3.c
+    blob '\(static const \)\?u32 tg3\(Tso5\?\)\?Fw\(Text\|Rodata\|Data\)\[[^{]*\] = {[^}]*};\([\n][\n]*\(static const u32 tg3\(Tso5\?\)\?Fw\(Text\|Rodata\|Data\)\[[^{]*\] = {[^}]*};\|#if 0\( [/][*]\([^/]\|[^*/][/]*\)*[*][/]\)\?[\n]\(static const \)\?u32 tg3\(Tso5\?\)\?Fw\(Text\|Rodata\|Data\)\[[^{]*\] = {[^}]*};[\n]#endif\)\)*' drivers/net/tg3.c
+
+    blob 'static const u8 typhoon_firmware_image\[\] = {[^}]*};' drivers/net/typhoon-firmware.h
+
+    blobna 'licensed[^\n]*strictly for use[^\n]*[\n]*[^\n]*COPS LocalTalk' 'drivers/net/appletalk/cops_\(ff\|lt\)drv\.h'
+    blob 'static const unsigned char ffdrv_code\[\] = {[^}]*};' drivers/net/appletalk/cops_ffdrv.h
+    blob 'static const unsgined char ltdrv_code\[\] = {[^}]*};' drivers/net/appletalk/cops_ltdrv.h
+    blob '#include "cops_\(lt\|ff\)drv\.h"[    ]*\([/][*]\([^/]\|[^*/][/]*\)*Firmware\([^/]\|[^*/][/]*\)*[*][/]\)\?\([\n][\n]*#include "cops_\(lt\|ff\)drv\.h"[        ]*\([/][*]\([^/]\|[^*/][/]*\)*Firmware\([^/]\|[^*/][/]*\)*[*][/]\)\?\)*' drivers/net/appletalk/cops.c
+
+    blob 'static unsigned char bits_1200\[\] *= {[^}]*};' drivers/net/hamradio/yam1200.h
+    blob 'static unsigned char bits_9600\[\] *= {[^}]*};' drivers/net/hamradio/yam9600.h
+    blob '#include "yam\(96\|12\)00\.h"\([\n][\n]*#include "yam\(96\|12\)00\.h"\)*' drivers/net/hamradio/yam.c
+
+    blobna 'static const u_char __Xilinx7OD\[\] = {[^}]*};' drivers/net/pcmcia/ositech.h
+    blob '#include "ositech\.h"' drivers/net/pcmcia/smc91c92_cs.c
+    blobna '\([/][*] Download the Seven of Diamonds firmware[^/]*[*][/][\n      ]*\)\?for *([^\n]*__Xilinx7OD[^{}]*{[\n][       ]*outb *(__Xilinx7OD[^}]*}' drivers/net/pcmcia/smc91c92_cs.c
+
+    blob 'static const u8 microcode\[\] = {[^}]*} *;' drivers/net/tokenring/3c359_microcode.h
+    blob '#include "3c359_microcode\.h"' drivers/net/tokenring/3c359.c
+    blobna 'start = (0xFFFF - (mc_size)[^;]*;[\n       ]*[/][*]\([^/]\|[^*/][/]*\)*[*][/][\n   ]*printk(KERN_INFO "3C359: Uploading Microcode: ");[\n  ]*for ([^{]*\(mc_size[^{]*) {[^}]*writeb(microcode\[\|) {[^}]*writeb(microcode\[mc_size\)[^}]*}\([\n][  ]*printk[^\n]*;[\n      ]*for ([^{]*\(mc_size[^{]*) {[^}]*writeb(microcode\[\|) {[^}]*writeb(microcode\[mc_size\)[^}]*}\)*' drivers/net/tokenring/3c359.c
+
+    blobname 'tr_smctr\.bin' drivers/net/tokenring/smctr.c
+
+    blobname 'kaweth[/]\(new\|trigger\)_code\(_fix\)\.bin' drivers/net/usb/kaweth.c
+
+    blobname '\(agere\|prism\)_\(sta\|ap\)_fw\.bin' drivers/net/wireless/orinoco.c
+    blobna 'symbol_sp24t_\(prim\|sec\)_fw' drivers/net/wireless/orinoco.c
+
+    blob 'unsigned short sbus_risc_code01\[\] __devinitdata = {[^}]*};' drivers/scsi/qlogicpti_asm.c
+    blob '#include "qlogicpti_asm\.c"' drivers/scsi/qlogicpti.c
+
+    blob '\([/][*] Microcode\([^/]\|[^*/][/]*\)*[*][/][\n]*\)\?static \(u\(nsigned \)\?char\|unsigned short\|ADV_DCNT\) _\(asc_mcode\|adv_asc3\(550\|8C\(08\|16\)00\)\)_\(buf\[\] = {[^}]*}\|size = sizeof[^;]*\|chksum = 0x[^;]*\);\([        ]*[/][*]\([^/]\|[^*/][/]*\)*[*][/]\)\?\([\n][\n]*\([/][*] Microcode\([^/]\|[^*/][/]*\)*[*][/][\n]*\)\?static \(u\(nsigned \)\?char\|unsigned short\|ADV_DCNT\) _\(asc_mcode\|adv_asc3\(550\|8C\(08\|16\)00\)\)_\(buf\[\] = {[^}]*}\|size = sizeof[^;]*\|chksum = 0x[^;]*\);\([  ]*[/][*]\([^/]\|[^*/][/]*\)*[*][/]\)\?\)*' drivers/scsi/advansys.c
+
+    blob '\(#ifdef UNIQUE_FW_NAME[\n]\)\?static unsigned short \(risc\|fw12\(80e\|160\)i\)_code01\[\] = {\([\n]#else[\n]static unsigned short risc_code01\[\] = {[\n]#endif[\n]\)\?[^}]*};\([\n][\n]*\(#ifdef UNIQUE_FW_NAME[\n]\)\?static unsigned short \(risc_code\|fw12\(80e\|160\)i\)_length01 = [^;]*;\([\n]#else[\n]static unsigned short risc_code_length01 = [^;]*;[\n]#endif\)\?\)\?' 'drivers/scsi/ql1\(04\|2\(8\|16\)\)0_fw\.h'
+
+    blobname 'emi26[/]\(bitstream\|firmware\|loader\)\.fw' drivers/usb/misc/emi26.c
+
+    blobname 'emi62[/]\(bitstream\|midi\|spdif\|loader\)\.fw' drivers/usb/misc/emi62.c
+
+    blobname 'keyspan[/]\(mpr\|usa\(18x\|19\(q[iw]\|w\)\?\|28\(x\(a\|b\)\?\)\?\|49w\(lc\)\?\)\)\.fw' drivers/usb/serial/keyspan.c
+
+    accept '           fw_name = "keyspan_pda[/]\(keyspan_pda\|xircom_pgs\)\.fw";' drivers/usb/serial/keyspan_pda.c
+    blobna 'fw_name = \([^}]\|[^\n]}*\)*\([/][*]KEYSPAN_PDA[*][/]\)\?request_ihex_firmware' drivers/usb/serial/keyspan_pda.c
+    accept '   if ([/][*]KEYSPAN_PDA[*][/]request_ihex_firmware' drivers/usb/serial/keyspan_pda.c
+
+    blobname 'edgeport[/]\(boot\|down\)2\?\.fw' drivers/usb/serial/io_edgeport.c
+    blobname 'edgeport[/]down3\.bin' drivers/usb/serial/io_ti.c
+
+    blobname 'ti_\(usb-\)\?\(%d\|3410\|5052\)\.bin' drivers/usb/serial/ti_usb_3410_5052.c
+
+    blobname 'whiteheat\(_loader\(_debug\)\?\)\?\.fw' drivers/usb/serial/whiteheat.c
+
+    blob 'static struct BA1struct BA1Struct = {[^;]*};' sound/pci/cs46xx/cs46xx_image.h
+    
+    blob 'static u32 cwc\(4630\|async\|snoop\)_\(code\|parameter\)\[\] = {[^;]*};' 'sound/pci/cs46xx/imgs/cwc\(4630\|async\|snoop\)\.h'
+    # cwcbinhack appears to have been created by hand.
+    # cwcdma has sources (not verified) in cwcdma.asp.
+    accept 'static u32 cwc\(binhack\|dma\)_code\[\] = {[^;]*};' 'sound/pci/cs46xx/imgs/cwc\(binhack\|dma\)\.h'
+    blob '#include "\(cs46xx_image\|imgs[/]cwc\(4630\|async\|snoop\)\)\.h"\([\n][\n]*#include "\(cs46xx_image\|imgs[/]cwc\(4630\|async\|snoop\)\)\.h"\)*' sound/pci/cs46xx/cs46xx_lib.c
+
+    blobname 'korg[/]k1212\.dsp' sound/pci/korg1212/korg1212.c
+
+    blobname 'ess[/]maestro3_assp_\(kernel\|minisrc\)\.fw' sound/pci/maestro3.c
+
+    blobname 'yamaha[/]ds1e\?_\(ctrl\|dsp\)\.fw' sound/pci/ymfpci/ymfpci_main.c
+
+    blobname 'sb16[/]\(\(a\|mu\)law_main\|ima_adpcm_\(init\|capture\|playback\)\)\.csp' sound/isa/sb/sb16_dsp.c
+
+    blob 'static const struct {[^}]*} yss225_registers\[\] __devinitdata = {[^;]*};' sound/isa/wavefront/yss225.c
+    blob 'yamaha[/]yss225_registers\.bin' sound/isa/wavefront/wavefront_fx.c
+    blobna 'firmware = [&]yss225_registers_firmware;' sound/isa/wavefront/wavefront_fx.c
+    blob 'static const struct firmware yss225_registers_firmware = {[^;]*};' sound/isa/wavefront/wavefront_fx.c
+    blob 'ospath[       ]*- Pathname[^\n]ICS2115.*wavefront\.os\([^\n]\|[^.][\n]\)*' Documentation/sound/alsa/ALSA-Configuration.txt
+    blobname 'wavefront\.os' sound/isa/wavefront/wavefront_synth.c
+
+    blobna 'and[\n]require the use of[^\n]*propr\?ietary[^:]*' Documentation/arm/IXP4xx
+    blob 'If you need to use any of the above[^\n]*download[^:]*:[\n   ]*http:[^\n]*ixp4[^\n]*' Documentation/arm/IXP4xx
+
+    accept 'int xc_request_firmware(struct xc *[*] *x);' arch/arm/mach-netx/include/mach/xc.h
+    accept 'int xc_request_firmware(struct xc *[*] *x)[\n]{' arch/arm/mach-netx/xc.c
+    accept '           dev_err(x->dev, "request_firmware failed\\n");' arch/arm/mach-netx/xc.c
+    accept 'EXPORT_SYMBOL(xc_request_firmware);' arch/arm/mach-netx/xc.c
+    accept '           if (xc_request_firmware(priv->xc)) {' drivers/net/netx-eth.c
+
+    blobname 'iop_fw_load_[sm]pu' arch/cris/arch-v32/drivers/iop_fw_load.c
+    accept 'int iop_fw_load_[sm]pu(' arch/cris/arch-v32/drivers/iop_fw_load.c
+    accept '   retval = request_firmware[^;]*[&]iop_[sm]pu_device' arch/cris/arch-v32/drivers/iop_fw_load.c
+    accept 'EXPORT_SYMBOL(iop_fw_load_[sm]pu);' arch/cris/arch-v32/drivers/iop_fw_load.c
+
+    accept '[/][*] fake device for request_firmware [*][/]' arch/x86/kernel/microcode_core.c
+
+    blobname 'amd-ucode[/]microcode_amd\.bin' arch/x86/kernel/microcode_amd.c
+
+    blobname 'intel-ucode[/]\([0-9a-f][0-9a-f]\|%02x\)-\([0-9a-f][0-9a-f]\|%02x\)-\([0-9a-f][0-9a-f]\|%02x\)' arch/x86/kernel/microcode_intel.c
+
+    blobname 'BCM2033-\(MD\.hex\|FW\.bin\)' drivers/bluetooth/bcm203x.c
+
+    blobname 'bfubase\.frm' drivers/bluetooth/bfusb.c
+
+    blobname 'BT3CPCC\.bin' drivers/bluetooth/bt3c_cs.c
+
+    blobname 'cyzfirm\.bin' drivers/char/cyclades.c
+
+    accept 'MODULE_FIRMWARE("dsp56k[/]bootstrap\.bin");' drivers/char/dsp56k.c
+    blob '     const char fw_name\[\] = "dsp56k[/]bootstrap\.bin";\([^}]\|[^\n]}*\)*request_firmware\([^}]\|[^\n]}*\)*[\n]     err = request_firmware([&]fw, fw_name, ' drivers/char/dsp56k.c
+    accept '   const char fw_name\[\] = "dsp56k[/]bootstrap\.bin";\([^}]\|[^\n]}*\)*[\n]       err = request_firmware([&]fw, fw_name, ' drivers/char/dsp56k.c
+
+    blobname 'isi\(6\(08\|\(08\|16\)em\)\|46\(08\|16\)\)\.bin' drivers/char/isicom.c
+
+    blobname 'c\(218t\|p204\|320t\)unx\.cod' drivers/char/moxa.c
+    accept '           printk(KERN_ERR "MOXA: request_firmware failed' drivers/char/moxa.c
+
+    # This driver enables the user to update the non-Free BIOS, but it
+    # only issues a firmware request if specifically told to.  It
+    # doesn't require any non-Free firwmare to function, and it
+    # doesn't actually recommend users to perform updates, so I'm
+    # leaving it in.
+    accept '                   req_firm_rc = request_firmware_nowait([^;]*, "dell_rbu",' drivers/firmware/dell_rbu.c
+    accept '   *"dell_rbu:%s request_firmware_nowait"' drivers/firmware/dell_rbu.c
+
+    blobname 'xc3028-v27\.fw' drivers/media/common/tuners/tuner-xc2028.h
+    blobname 'xc3028L-v36\.fw' drivers/media/common/tuners/tuner-xc2028.h
+
+    blobname 'dvb-fe-xc5000-1\.1\.fw' drivers/media/common/tuners/xc5000.c
+
+    blobname '4210\(100[12]\|%4X\)\.sb' drivers/net/irda/irda-usb.c
+    blobna '[/][*][    \n*]* Known firmware\([^/]\|[^*/][/]*\)*\(STIR421x\|4210\(100[12]\|%4X\)\.sb\)\([^/]\|[^*/][/]*\)*[*][/]' drivers/net/irda/irda-usb.c
+
+    blobname 'myri10ge_\(rss_\)\?ethp\?_z8e\.dat' drivers/net/myri10ge.c
+    blobna 'If the driver can neither enable ECRC\([^/]\|[^*/][/]*\)*myri10ge_\(rss_\)\?ethp\?_z8e\.dat\([^/]\|[^*/][/]*\)*[*][/]' drivers/net/myri10ge.c
+
+    blobname 'spider_fw\.bin' drivers/net/spider_net.h
+
+    blobname 'tms380tr\.bin' drivers/net/tokenring/tms380tr.c
+
+    blobname 'atmel_at76c50\(2\([de]\|_3com\)\?\|4a\?\(_2958\)\?\|6\)\(\.bin\)\?' drivers/net/wireless/atmel.c
+    accept '   *priv->firmware = \(NULL\|new_firmware\);' drivers/net/wireless/atmel.c
+
+    blobname 'b43\(legacy\)\?\(%s\)\?[/]\(%s\|ucode\(5\|1[13]\)\|pcm5\|[abn]0g[01]initvals\(5\|1[13]\)\)\.fw' 'drivers/net/wireless/b43\(legacy\)\?/main.c'
+    blobna 'b43legacyerr([^;]*must go to http[^;]*b43#devicefirmware[^;]*);' drivers/net/wireless/b43legacy/main.c
+
+    blob '#define IPW2100_FW_\(\(\(MAJOR\|MINOR\)_VERSION\|\(MAJOR\|MINOR\)(x)\)\|VERSION\)\([^\n]*\\[\n]\)*[^\n]*\([\n][\n]*#define IPW2100_FW_\(\(\(MAJOR\|MINOR\)_VERSION\|\(MAJOR\|MINOR\)(x)\)\|VERSION\)\([^\n]*\\[\n]\)*[^\n]*\)*' drivers/net/wireless/ipw2100.c
+    blobname 'ipw2100-\("\([^"\n]\|[\\][\n]\)*"\([^"]\|[\\]["]\)*\)\+' drivers/net/wireless/ipw2100.c
+    blobname '__stringify(IPW2100_FW_MINOR_VERSION)' drivers/net/wireless/ipw2100.c
+    accept ' *Portions of ipw2100_\(do_\)\?mod_firmware_load[,         ]*\(ipw2100_\(do_\)\?mod_firmware_load[,        and\n]*\)*' drivers/net/wireless/ipw2100.c
+    accept '   ipw2100_mod_firmware_load(fw);' drivers/net/wireless/ipw2100.c
+    accept 'static int ipw2100_mod_firmware_load(' drivers/net/wireless/ipw2100.c
+    blobna 'if (IPW2100_FW_MAJOR[^{]*{[^}]*    }' drivers/net/wireless/ipw2100.c
+
+    accept '[/][*] Call this function from process context\([^/]\|[^*/][/]*\)*request_firmware' drivers/net/wireless/ipw2200.c
+    blobname 'ipw2200-\(i\?bss\|sniffer\)\.fw' drivers/net/wireless/ipw2200.c
+    accept '           IPW_ERROR("%s request_firmware failed' drivers/net/wireless/ipw2200.c
+
+    blobname 'iwlwifi-\(3945\|4965\|5000\)" IWL\(3945\|4965\|5000\)_UCODE_API "\.ucode' 'drivers/net/iwlwifi/iwl\(3945-base\|-4965\|-5000\)\.c'
+    accept '    [*] request_firmware() is synchronous' 'drivers/net/iwlwifi/iwl\(3945-base\|-agn\)\.c'
+
+    blobname 'libertas_cs\(_helper\)\?\.fw' drivers/net/wireless/libertas/if_cs.c
+    blobname 'sd\(8385\|8686\)\(_helper\)\?\.bin' drivers/net/wireless/libertas/if_sdio.c
+    accept '   *card->firmware = \(if_sdio\|lbs_fw\)' drivers/net/wireless/libertas/if_sdio.c
+    blobname 'usb8388\(-5\.126\.0\.p5\)\?\.bin' drivers/net/wireless/libertas/if_usb.c
+    blob '[/][*]\([^/]\|[^*/][/]*\)*usb8388\(-5\.126\.0\.p5\)\?\.bin\([^/]\|[^*/][/]*\)*[*][/]' drivers/net/wireless/libertas/if_usb.c
+    accept '           lbs_pr_err("request_firmware() failed' drivers/net/wireless/if_usb.c
+    blobna 'o\. Copy the firmware image[^\n]*usb8388\([^\n]\|[\n][     ]*[^    \n]\)*' drivers/net/wireless/libertas/README
+    blobna '\[fw_name=usb8388[^]]*\]' drivers/net/wireless/libertas/README
+
+    blobname 'usb8388\.bin' drivers/base/Kconfig
+
+    blobname 'lbtf_usb\.bin' drivers/net/wireless/libertas_tf/if_usb.c
+
+    blobname 'isl38\(86\|87usb_bare\|90usb\)' 'drivers/net/wireless/p54/p54\(pci\.c\|usb\.[ch]\)'
+    blob '[/][*] for isl3886 register definitions\([^/]\|[^*/][/]*\)*[*][/]' drivers/net/wireless/p54/p54usb.h
+    blobna 'If you enable this\([^\n]\|[\n][   ]*[^    \n]\)*isl3890\([^\n]\|[\n][     ]*[^    \n]\)*' drivers/net/wireless/Kconfig
+
+    blobname 'isl38\(77\|86\|90\)' drivers/net/wireless/prism54/islpci_dev.c
+
+    blobname 'rt2[56]61s\?\.bin' drivers/net/wireless/rt2x00/rt61pci.h
+    blobname 'rt73\.bin' drivers/net/wireless/rt2x00/rt73usb.h
+
+    blobname 'zd1201\(-ap\)\?\.fw' drivers/net/wireless/zd1201.c
+
+    blobname 'zd1211[/]zd1211b\?_\(u\([rb]\|phr\)\?\)\?' drivers/net/wireless/zd1211/zd_usb.c
+
+    # ??? gotta introduce some means to match false-positives
+    # including post context containing blobs, so that the macro name
+    # is not flagged or deblobbed, but the blob name is.
+    # blobna 'PCMCIA_\([PM]FC_\)\?DEVICE_CIS_\(MANF_CARD\|PROD_ID[1-4]*\)'
+    # accept '     PCMCIA_\([PM]FC_\)\?DEVICE_CIS_\(MANF_CARD\|PROD_ID[1-4]*\)([^)]*, "[/][*](DEBLOBBED)[*][/]")'
+    # accept '#define PCMCIA_\([PM]FC_\)\?DEVICE_CIS_\(MANF_CARD\|PROD_ID[1-4]*\)(' include/pcmcia/device_id.h
+
+    blobname '3CCFEM556\.cis' drivers/net/pcmcia/3c574_cs.c
+
+    blobname '3CXEM556\.cis' drivers/net/pcmcia/3c589_cs.c
+
+    blobname '\(PCMLM28\|DP83903\|LA-PCM\|PE520\|NE2K\|PE-200\|tamarack\)\.cis' drivers/net/pcmcia/pcnet_cs.c
+
+    blobname '\(PCMLM28\|DP83903\|3C\(CF\|X\)EM556\|SW_\([78]xx\|555\)_SER\|MT5634ZLX\|COMpad[24]\|RS-COM-2P\|GLOBETROTTER\)\.cis' drivers/serial/serial_cs.c
+
+    # This enables but does not encourage firmware updates.
+    accept '   err = request_firmware([&]asd_ha->bios_image,[\n        ]*filename_ptr,[\n      ]*[&]asd_ha->pcidev->dev);' drivers/scsi/aic94xx/aic94xx_init.c
+    blobname 'aic94xx-seq\.fw' drivers/scsi/aic94xx/aic94xx_seq.h
+
+    # This enables but does not encourage firmware updates.
+    accept '   if(request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev))' drivers/scsi/ipr.c
+
+    accept '   res = request_firmware(&fw, "sas_addr", &shost->shost_gendev);' drivers/scsi/libsas/sas_scsi_host.c
+
+    blobname 'ql2\([12345]00\|322\)\.bin' drivers/scsi/qla2xxx/qla_os.c
+
+    blobname 'icom_\(asc\|res_dce\|call_setup\)\.bin' drivers/serial/icom.c
+
+    blobname 'fsl_qe_ucode_uart_\(%u\|0-9]*\)_\(%u\|[0-9]*\)\(%u\|[0-9]*\)\.bin' drivers/serial/ucc_uart.c
+
+    blobname 'atmel_at76c50\(3-\(i386[13]\|rfmd\(-acc\)\?\)\|5\(a\(mx\)\?\)\?-rfmd\(2958\)\?\)\.bin' 'drivers/\(staging\|net/wireless\)/at76_usb/at76_usb\.c'
+
+    blobname 'go7007\(fw\|tv\)\.bin' 'drivers/staging/go7007/\(go7007-\(driver\|usb\)\|saa7134-go7007\)\.c'
+
+    blobname 'cxacru-\(%s\|fw\|bp\|cf\)\.bin' drivers/usb/atm/cxacru.c
+
+    blobname 'speedtch-\(%d\|[0-9]*\)\.bin\(\.\(%x\|\(0x\)\?[0-9a-fA-F]*\)\(\.\(%02x\|[0-9a-fA-F][0-9a-fA-F]\)\)\?\)\?' drivers/usb/atm/speedtch.c
+
+    blobname 'ueagle-atm[/]' drivers/usb/atm/ueagle-atm.c
+    blobname '\(adi930\|eagle\(I*\|IV\)\)\.fw' drivers/usb/atm/ueagle-atm.c
+    blobname 'DSP[49e][ip]\.bin' drivers/usb/atm/ueagle-atm.c
+    blobname '930-fpga\.bin' drivers/usb/atm/ueagle-atm.c
+    blobname 'CMV[x9ae][yip]\.bin\(\.v2\)\?' drivers/usb/atm/ueagle-atm.c
+
+    blobname 'isight\.fw' drivers/usb/misc/isight_firwmare.c
+
+    blobname '\(i1480-\(pre-phy\|usb\|phy\)\|ptc\)-0\.0\.bin' drivers/uwb/i1480/dfu/usb.c
+
+    accept '   retval = request_firmware([&]fw_entry, "metronome.wbf", [&]dev->dev);' drivers/video/metronomefb.c
+
+    blobname '\(vx[/]\)\?\(bx_1_v\(xp\|p4\)\.b56\|x1_\(1_v\(x[2p]\|p4\)\|2_v22\)\.xlx\|bd56\(002\|3v2\|3s3\)\.boot\|l_1_v\(x[2p]\|p4\|22\)\.d56\)' sound/drivers/vx/vx_hwdep.c
+
+    blobname '\(ea[/]\)\?darla20_dsp\.fw' sound/pci/echoaudio/darla20.c
+    blobname '\(ea[/]\)\?darla24_dsp\.fw' sound/pci/echoaudio/darla24.c
+    blobname '\(ea[/]\)\?\(\(loader\|echo3g\)_dsp\|3g_asic\)\.fw' sound/pci/echoaudio/echo3g.c
+    blobname '\(ea[/]\)\?gina20_dsp\.fw' sound/pci/echoaudio/gina20.c
+    blobname '\(ea[/]\)\?\(\(loader\|gina24_3[06]1\)_dsp\|gina24_3[06]1_asic\)\.fw' sound/pci/echoaudio/gina24.c
+    blobname '\(ea[/]\)\?\(loader\|indigo\)_dsp\.fw' sound/pci/echoaudio/indigo.c
+    blobname '\(ea[/]\)\?\(loader\|indigo_dj\)_dsp\.fw' sound/pci/echoaudio/indigodj.c
+    blobname '\(ea[/]\)\?\(loader\|indigo_io\)_dsp\.fw' sound/pci/echoaudio/indigoio.c
+    blobname '\(ea[/]\)\?layla20_\(dsp\|asic\)\.fw' sound/pci/echoaudio/layla20.c
+    blobname '\(ea[/]\)\?\(\(loader\|layla24\)_dsp\|layla24_\(1\|2[AS]\)_asic\)\.fw' sound/pci/echoaudio/layla24.c
+    blobname '\(ea[/]\)\?\(loader\|mia\)_dsp\.fw' sound/pci/echoaudio/mia.c
+    blobname '\(ea[/]\)\?\(\(loader\|mona_3[06]1\)_dsp\|mona_3[06]1\(_1\)\?_asic_\(48\|96\)\|mona_2_asic\)\.fw' sound/pci/echoaudio/gina24.mona
+    blobname 'ea[/]%s' sound/pci/echoaudio/echoaudio.c
+
+    blobname 'emu[/]\(hana\|\(audio\|micro\)_dock\|emu\(0404\|1010\(b\|_notebook\)\)\)\.fw' sound/pci/emu10k1/emu10k1_main.c
+
+    blobname '\(mixart[/]\)\?miXart8\(AES\)\?\.\(xlx\|elf\)' sound/pci/mixart/mixart_hwdep.c
+
+    blobname '\(pcxhr[/]\)\?\(x[ic]_1_882\.dat\|[ebd]321_512\.[ebd]56\)' sound/pci/pcxhr/pcxhr_hwdep.c
+
+    blobna 'You need to install[\n]*riptide\.hex[\n]\.[\n]' Documentation/sound/alsa/ALSA-Configuration.txt
+    blobname 'riptide\.hex' sound/pci/riptide/riptide.c
+    defsnc 'static union firmware_version firmware_versions\[\] =' sound/pci/riptide/riptide.c
+
+    blobname '\(multi\|digi\)face_firmware\(_rev11\)\?\.bin' sound/pci/rme9652/hdsp.c
+
+    blobname 'aica_firmware\.bin' sound/sh/aica.c
+
+    accept ' [*]\([^/]\|[^*/][/]*\)*Caution: This API\([^/]\|[^*/][/]*\)*request_firmware.' sound/sound_firmware.c
+    accept 'static int do_mod_firmware_load(' sound/sound_firmware.c
+    accept 'int mod_firmware_load(' sound/sound_firmware.c
+    accept '   r = do_mod_firmware_load(' sound/sound_firmware.c
+    accept 'EXPORT_SYMBOL(mod_firmware_load);' sound/sound_firmware.c
+    accept 'extern int mod_firmware_load(' sound/oss/sound_firmware.h
+
+    accept '   INITCODESIZE = mod_firmware_load(INITCODEFILE, [&]INITCODE);' sound/oss/msnd_pinnacle.c
+    accept '   PERMCODESIZE = mod_firmware_load(PERMCODEFILE, [&]PERMCODE);' sound/oss/msnd_pinnacle.c
+    blobname '\([/]etc[/]sound[/]\)\?pndsp\(ini\|erm\)\.bin' sound/oss/msnd_pinnacle.h
+    blobname '\([/]etc[/]sound[/]\)\?msnd\(init\|perm\)\.bin' sound/oss/msnd_classic.h
+    blobna '\(Important Notes - Read Before Using\|Obtaining and Creating Firmware Files\)[\n]#  ~*\([^\n]\|[\n]# *\([\n]# *\([\n]# *For the[^\n]*[\n]# *~*[\n]\)\?\)\?[^\n ]\)*\.' Documentation/sound/oss/MultiSound
+
+    accept '   len = mod_firmware_load(fn, [&]data);[\n]       if [^{]* {[\n]          printk(KERN_ERR "sscape:' sound/oss/sscape.c
+    blobname '[/]sndscape[/]scope\.co[dx]' sound/oss/sscape.c
+
+    accept '           trix_boot_len = mod_firmware_load(' sound/oss/trix.c
+    blobname '\([/]etc[/]sound[/]\)\?trxpro\.bin' sound/oss/trix.c
+
+    accept '           smw_ucodeLen = mod_firwmare_load(' sound/oss/sb_common.c
+    blobname '\([/]etc[/]sound[/]\)\?msnd\(init\|perm\)\.bin' sound/oss/sb_common.c
+
+    blob 'When the module is loaded\([^\n]\|[\n][^\n]\)*[/]pss_synth\([^\n]\|[\n][^\n]\)*' Documentation/sound/oss/PSS
+    blob 'pss_firmware[ \n     ]*This parameter\([^\n]\|[\n][^\n]\)*[/]pss_synth\([^\n]\|[\n][^\n]\)*' Documentation/sound/oss/PSS-updates
+    accept '           pss_synthLen = mod_firmware_load(pss_firmware' sound/oss/pss.c
+    blobname '\([/]etc[/]sound[/]\)\?pss_synth' sound/oss/pss.c
+    accept '   \$(obj)[/]bin2hex pss_synth' sound/oss/Makefile
+    accept '    *echo '"'"'static \(unsigned char [*] *\|int \)pss_synth\(Len\)\? = \(NULL\|0\);' sound/oss/Makefile
+    
+    accept '   \.request_firmware = NULL,' drivers/media/dvb/dvb-usb/m920x.c
+
+    accept '[   ]*"request_firmware \(fatal error\|unable to locate\|: Failed to find\)' drivers/media/video/pvrusb2/pvrusb2-hdw.c
+    accept ' [*] NOTE : the pointer to the firmware data given by request_firmware()' drivers/media/video/pvrusb2-hdw.c
+
+    blobname 'dvb-usb-dw210[24]\.fw' drivers/media/dvb/dvb-usb/dw2102.c
+
+    blobname 'dvb-usb-gp8psk-02\.fw' drivers/media/dvb/dvb-usb/gp8psk.c
+
+    blobname 'dvb-usb-opera-\(fpga-\)\?-01\.fw' drivers/media/dvb/dvb-usb/opera1.c
+
+    blobname 'dvb-fe-af9013\.fw' drivers/media/dvb/frontends/af9013_priv.h
+
+    blobname 'dvb-fe-bcm3510-01\.fw' drivers/media/dvb/frontends/bcm3510.c
+
+    blobname 'dvb-fe-cx24116\.fw' drivers/media/dvb/frontends/cx24116.c
+
+    blobname 'dvb-fe-nxt2002\.fw' drivers/media/dvb/frontends/nxt200x.c
+
+    blob '[/][*][\n] [*] This driver needs two external firmware files\([^/]\|[^*/][/]*\)*dvb-fe-or51132-\(vsb\|qam\)\.fw\([^/]\|[^*/][/]*\)*[*][/]' drivers/media/dvb/frontends/or51132.c
+    blobname 'dvb-fe-or51132-\(vsb\|qam\)\.fw' drivers/media/dvb/frontends/or51132.c
+
+    blobname 'dvb-fe-or51211\.fw' drivers/media/dvb/frontends/or51211.c
+
+    blobname 'dvb-fe-sp887x\.fw' drivers/media/dvb/frontends/sp887x.c
+
+    blobname 'dvb-fe-tda10048-1\.0\.fw' drivers/media/dvb/frontends/tda10048.c
+
+    blobname '\(\(dvb\|tdmb\|isdbt\)_nova\|cmmb_vega\)_12mhz\(_b0\)\?\.inp' drivers/media/dvb/siano/smscoreapi.c
+
+    blobname '\(dvb[th]\(_bda\)\?\|tdmb\)_stellar_usb\.inp' drivers/media/dvb/siano/smsusb.c
+
+    blobname 'dvb-ttusb-dec-\(2000t\|2540t\|3000s\)\.fw' drivers/media/dvb/ttusb-dec/ttusb_dec.c
+
+    blobname 'hcwamc\.rfb' drivers/media/video/bt8xx/bttv-cards.c
+
+    blobname 'v4l-cx23418-dig\.fw' drivers/media/video/cx18/cx18-av-firmware.c
+    blobname 'v4l-cx23148-[ac]pu\.fw' drivers/media/video/cx18/cx18-firwmare.c
+
+    blobname 'v4l-cx23885-enc\.fw' drivers/media/video/cx23885/cx23885-417.c
+
+    blobname 'v4l-\(cx23885-avcore-01\|cx25840\)\.fw' drivers/media/video/cx25840/cx25840-firmware.c
+
+    blobname 'v4l-cx2341x-\(enc\|dec\)\.fw' include/media/cr2341x.h
+
+    blobname 'v4l-cx2341x-init\.mpg' drivers/media/video/ivtv/ivtv-firwmare.c
+
+    blobname 'v4l-pvrusb2-\(2[49]\|73\)xxx-01\.fw' drivers/media/video/pvrusb2/pvrusb2-devattr.c
+
+    blobname 'f2255usb\.bin' drivers/media/video/s2255drv.c
+
+    blobname 'drx397xD\.\(A2\|B1\)\.fw' drivers/media/dvb/frontends/drx397xD_fw.h
+
+    blobname 'dvb-usb-dib0700-1\.20\.fw' drivers/media/dvb/dvb-usb/dib0700_devices.c
+
+    blobname 'dvb-usb-nova-t-usb2-02\.fw' drivers/media/dvb/dvb-usb/nova-t-usb2.c
+
+    blobname 'dvb-usb-umt-010-02\.fw' drivers/media/dvb/dvb-usb/umt-010.c
+
+    blobname 'dvb-usb-\(pctv-400e\|tt-s2400\)-01\.fw' drivers/media/dvb/dvb-usb/ttusb2.c
+
+    blobname 'dvb-usb-bluebird-0[12]\.fw' drivers/media/dvb/dvb-usb/cxusb.c
+
+    blobname 'dvb-usb-\(dtt200u-01\|wt220u-\(02\|fc03\|\(zl0353\|miglia\)-01\)\)\.fw' drivers/media/dvb/dvb-usb/dtt200u.c
+
+    blobname 'dvb-usb-vp7045-01\.fw' drivers/media/dvb/dvb-usb/vp7045.c
+
+    blobname 'dvb-usb-\(dibusb-\(5\.0\.0\.11\|an2235-01\|6\.0\.0\.8\)\|adstech-usb2-02\)\.fw' drivers/media/dvb/dvb-usb/dibusb-mb.c
+
+    blobname 'dvb-usb-avertv-a800-02\.fw' drivers/media/dvb/dvb-usb/a800.c
+
+    blobname 'af9005\.fw' drivers/media/dvb/dvb-usb/af9005.c
+
+    blobname 'dvb-usb-af9015\.fw' drivers/media/dvb/dvb-usb/af9015.c
+
+    blobname 'dvb-usb-dibusb-6\.0\.0\.8\.fw' drivers/media/dvb/dvb-usb/dibusb-mc.c
+
+    blobname 'dvb-usb-\(\(megasky\|digivox\)-02\|tvwalkert\|dposh-01\)\.fw' drivers/media/dvb/dvb-usb/m920x.c
+
+    blobname 'dvb-usb-vp702x-02\.fw' drivers/media/dvb/dvb-usb/vp702x.c
+
+    blobname 'dvb-usb-digitv-02\.fw' drivers/media/dvb/dvb-usb/digitv.c
+
+    blob 'Driver: \(korg1212\|maestro3\|ymfpci\|smctr\|kaweth\|ttusb-budget\|keyspan\|emi26\|emi62\|tu_usb_3410_5052\|whiteheat\|ip2\|CPiA2\|DABUSB\|USB_VICAM\|USB_SERIAL_EDGEPORT\(_TI\)\?\|SND_SB16_CSP\|CASSINI\) --* \([^\n]\|[\n]*[^\n\-]\)*\([\n][\n]--*[\n][\n]Driver: \(korg1212\|maestro3\|ymfpci\|smctr\|kaweth\|ttusb-budget\|keyspan\|emi26\|emi62\|tu_usb_3410_5052\|whiteheat\|ip2\|CPiA2\|DABUSB\|USB_VICAM\|USB_SERIAL_EDGEPORT\(_TI\)\?\|SND_SB16_CSP\|CASSINI\) --* \([^\n]\|[\n]*[^\n\-]\)*\)*' firmware/WHENCE
+
     # This looks suspicious, but it pretty much just sets stuff to zero.
     initnc 'static __u8 mode8420\(pro\|con\)\[\] =' drivers/media/video/cs8420.h
 
@@ -860,13 +1437,13 @@ set_except () {
     initnc '   static unsigned char static_pad\[\] ='
     initnc '   static unsigned char table_alaw2ulaw\[\] ='
     initnc '   static unsigned char table_ulaw2alaw\[\] ='
-    initnc '   u32 reg_boundaries\[\] ='
+    defsnc '   u32 reg_boundaries\[\] =' drivers/net/bnx2.c
     initnc '   u8 b\[\] ='
     initnc '   uint8_t tx\[\] ='
     initnc '   unsigned char saa7111_regs\[\] ='
     initnc '   unsigned char sas_pcd_m_pg\[\] ='
     initnc '   } modedb\[5\] ='
-    initnc '   } reg_tbl\[\] ='
+    defsnc '   } reg_tbl\[\] =' drivers/net/bnx2.c
     initnc '   } vals\[\] ='
     initnc '   } vm_devices\[\] ='
     initnc '    static const code distfix\[32\] ='
@@ -916,7 +1493,7 @@ set_except () {
     initnc 'static const struct aper_size_info_32 u3_sizes\[8\] ='
     initnc 'static const struct aper_size_info_8 via_generic_sizes\[9\] ='
     initnc 'static const struct color clut_vga16\[16\] ='
-    initnc 'static const struct gain_entry gain_table\[2\]\[108\] ='
+    defsnc 'static const struct gain_entry gain_table\[2\]\[108\] =' drivers/net/wireless/iwl-4965.c
     initnc 'static const struct mV_pos __initdata mobilevrm_mV\[32\] ='
     initnc 'static const struct mV_pos __initdata vrm85_mV\[32\] ='
     initnc 'static const struct menelaus_vtg_value vcore_values\[\] ='
@@ -1010,8 +1587,8 @@ set_except () {
     initnc 'static int fifo_map\[\]\[MAX_TX_FIFOS\] ='
     initnc 'static int initial_lfsr\[\] ='
     initnc 'static int log_tbl\[129\] ='
-    initnc 'static int miro_fmtuner\[\]  ='
-    initnc 'static int miro_tunermap\[\] ='
+    initnc 'static int miro_fmtuner\[\]  =' drivers/media/video/bt8xx/bt-cards.c
+    initnc 'static int miro_tunermap\[\] =' drivers/media/video/bt8xx/bt-cards.c
     initnc 'static int register_size\[\] ='
     initnc 'static int reserve_list\[MAX_RES_ARGS\] ='
     initnc 'static int reverse6\[64\] ='
@@ -1043,11 +1620,10 @@ set_except () {
     initnc 'static u32 v_gain\[64\] ='
     initnc 'static u8 SRAM_Table\[\]\[60\] ='
     initnc 'static u8 alps_tdee4_stv0297_inittab\[\] ='
-    initnc 'static u8 bnx2_5706_stats_len_arr\[BNX2_NUM_STATS\] ='
-    initnc 'static u8 bnx2_5708_stats_len_arr\[BNX2_NUM_STATS\] ='
+    defsnc 'static u8 bnx2_570[68]_stats_len_arr\[BNX2_NUM_STATS\] =' drivers/net/bnx2.c
     initnc 'static u8 flit_desc_map\[\] ='
     defsnc 'static u8 init_tab \?\[\] =' 'drivers/media/dvb/frontends/cx2270\(0\|2\)\.c'
-    initnc 'static u8 mac_reader\[\] ='
+    defsnc 'static u8 mac_reader\[\] =' drivers/net/wireless/atmel.c
     initnc 'static u8 mt2131_config1\[\] =' drivers/media/dvb/frontends/mt2131.c # <= 2.6.25
     initnc 'static u8 mt2131_config1\[\] =' drivers/media/common/tuners/mt2131.c # >= 2.6.26
     initnc 'static u8 mt2266_init2\[\] =' drivers/media/dvb/frontends/mt2266.c # <= 2.6.25
@@ -1162,7 +1738,6 @@ set_except () {
     initnc '} qam64_snr_tab\[\] ='
     initnc '} sil_port\[\] ='
     initnc '} vsb_snr_tab\[\] ='
-    initnc '} yss225_registers\[\] __devinitdata ='
 
     ;;
 
@@ -1195,6 +1770,8 @@ set_except () {
     defsnc 'static u8 serit_sp1511lhb_inittab\[\] =' drivers/media/dvb/frontends/si21xx.c
     defsnc 'static u8 stv0288_inittab\[\] =' drivers/media/dvb/frontends/stv0288.c
 
+    blobname 'haup-ir-blaster\.bin' drivers/input/lirc/lirc_zilog.c
+
     # Suspicious, deblob for now, until contributor responds.
     # defsnc ' static u16 \(sr\|twinax\)_edc\[\] =' drivers/net/cxgb3/ael1002.cn
     # Non-Free license in entire file.
@@ -1358,7 +1935,7 @@ set_except () {
     initnc 'static u32 reg_init_initialize\[\] =' drivers/media/video/saa717x.c
     initnc '   } vals\[\] =' drivers/media/video/saa717x.c
     initnc 'static const u32 \(main\|gear\)_seedset\[BACKOFF_SEEDSET_ROWS\]\[BACKOFF_SEEDSET_LFSRS\] =' drivers/net/forcedeth.c
-    blob '^unsigned char \(IDX_ACTIVATE_\(READ\|WRITE\)\|\(CM\|ULP\)_\(ENABLE\|SETUP\)\|DM_ACT\) = '"$sepx$blobseq*$sepx;" drivers/s390/net/qeth_core_mpc.c # from drivers/s390/net/qeth_mpc.c in 2.6.25
+    blob 'unsigned char \(IDX_ACTIVATE_\(READ\|WRITE\)\|\(CM\|ULP\)_\(ENABLE\|SETUP\)\|DM_ACT\) = '"$sepx$blobseq*$sepx;" drivers/s390/net/qeth_core_mpc.c # from drivers/s390/net/qeth_mpc.c in 2.6.25
     initnc '} pll_table\[\] =' drivers/video/geode/lxfb_ops.c
     accept "  { 0x00014284,  19688 },[\n]  { 0x00011104,  20400 },[\n]  { $blobpat* }," drivers/video/geode/lxfb_ops.c # won't be necessary in rc3
     initnc 'static const u16 wm9713_reg\[\] =' sound/soc/codecs/wm9713.c
@@ -1424,6 +2001,10 @@ set_except () {
     ;;
   */linux-2.6*-lirc.patch)
     initnc 'const unsigned char map_table\[\] ='
+    blobname 'haup-ir-blaster\.bin' drivers/input/lirc/lirc_zilog.c
+    ;;
+  */linux-2.6*-at76.patch)
+    blobname 'atmel_at76c50\(3-\(i386[13]\|rfmd\(-acc\)\?\)\|5\(a\(mx\)\?\)\?-rfmd\(2958\)\?\)\.bin' drivers/net/wireless/at76_usb/at76_usb.c
     ;;
   */linux-2.6-modsign-mpilib.patch)
     initnc 'const unsigned char __clz_tab\[\] ='
@@ -1439,15 +2020,15 @@ set_except () {
     initnc 'static struct iwl\(3945\)\?_tx_power power_gain_table\[2\]\[IWL_MAX_GAIN_ENTRIES\] ='
     initnc 'static const struct gain_entry gain_table\[2\]\[108\] ='
     initnc 'static const struct rf_channel rf_vals_5222\[\] ='
-    initnc 'static const struct rf_channel rf_vals_5225_2527\[\] ='
-    initnc 'static const struct rf_channel rf_vals_5226\[\] ='
+    initnc 'static const struct rf_channel rf_vals_5225_2527\[\] =' drivers/net/wireless/rt2x00/rt73usb.c
+    initnc 'static const struct rf_channel rf_vals_5226\[\] =' drivers/net/wireless/rt2x00/rt73usb.c
     initnc 'static const struct rf_channel rf_vals_bg\[\] ='
     initnc 'static const struct rf_channel rf_vals_bg_2522\[\] ='
     initnc 'static const struct rf_channel rf_vals_bg_2523\[\] ='
     initnc 'static const struct rf_channel rf_vals_bg_2524\[\] ='
     initnc 'static const struct rf_channel rf_vals_bg_2525\[\] ='
     initnc 'static const struct rf_channel rf_vals_bg_2525e\[\] ='
-    initnc 'static const struct rf_channel rf_vals_bg_2528\[\] ='
+    initnc 'static const struct rf_channel rf_vals_bg_2528\[\] =' drivers/net/wireless/rt2x00/rt73usb.c
     initnc 'static const struct rf_channel rf_vals_noseq\[\] ='
     initnc 'static const struct rf_channel rf_vals_seq\[\] ='
     initnc '   static const u8 t\[\] ='
@@ -1530,7 +2111,7 @@ bol="\\(^\\|[\\n]\\)"
 eol="\\([\\n]\\|\$\\)"
 
 # Regular expression that matches a C-style comment.
-comment="\\([/][*]\\([^*]*\\|[*]\\+[^/*]\\)*[*]\\+[/]\\|[/][/][^\\n]*[\\n]\\)"
+comment="\\([/][*]\\([^/]\\|[^*/][/]*\\)*[*][/]\\|[/][/][^\\n]*[\\n]\\)"
 
 # Regular expression that matches comments typically used in assembly.
 asmcomment="\\($comment\\|[;#][^\\n]*[\\n]\\)"
@@ -1547,13 +2128,6 @@ defineblob='[    ]*#[    ]*define[       ]\+\([^\n]*\\[\n]\)*[^\n]*'"$blobseq"'\([^\n]*\\
 # without any intervening label.
 asmblob="[a-zA-Z_.][^\\n:;#/   ]*[ ]*:\\([^:{}]*\\|$asmcomment\\)*$blobseq\\([^:]*\\|$asmcomment\\)*"
 
-# Regular expression that matches one or more blobs without
-# intervening line breaks.
-sblobctx="\\([^\\n]*$blobfseq\\)\\+"
-
-# Regular expression that matches the context for a long blob match.
-lblobctx="\\($initblob\\|$defineblob\\|$asmblob\\|$sblobctx\\)"
-
 # Set up the sed script that will go through the (processed) input,
 # looking for sequences of blobs and printing whatever was requested.
 # It accepts 3 arguments.
@@ -1567,7 +2141,26 @@ lblobctx="\\($initblob\\|$defineblob\\|$asmblob\\|$sblobctx\\)"
 # $4 is the action for every complete input pattern.
 
 set_sedmain () {
-  falsepos=`sed 's,^\\\|,,;s,^,\\\\(,;s,$,\\\\),' < "$falsepos_name"`
+  falsepos=`sed 's,^\\\|,,;s,^.,\\\\(&,;s,.$,&\\\\),' < "$falsepos_name"`
+  orfalseneg=`cat < "$falseneg_name"`
+
+  case $orfalseneg in
+  "")
+      blobfast=$blobseq
+      bloblong=$blobfseq
+      ;;
+  *)
+      blobfast="\\($blobseq$orfalseneg\\)"
+      bloblong="\\($blobfseq$orfalseneg\\)"
+      ;;
+  esac
+
+  # Regular expression that matches one or more blobs without
+  # intervening line breaks.
+  sblobctx="\\(\([^\\n]\|[/][*](DEBLOB-\\nBED)[*][/]\)*$bloblong\\)\\+"
+
+  # Regular expression that matches the context for a long blob match.
+  lblobctx="\\($initblob\\|$defineblob\\|$asmblob\\|$sblobctx\\)"
 
   if test -s "$falsepos_name"; then
     check_false_positives="$v:???falsepos
@@ -1576,8 +2169,8 @@ $v:+++falsepos
 h;
 s/$bol$falsepos/\\1;\/**\/;/g;
 # See if, after removing all matches, we end up without any blobs.
-$v:???blobseq
-/$blobseq/!{
+$v:???blobfast
+/$blobfast/!{
   g;
   b falsepos;
 }
@@ -1589,15 +2182,20 @@ g;
   fi
 
   sedmain="
-/^;[/][*]\\(end .*\\)\\?[*][/];$/{
+/^$/N;
+/^[\n]\?;[/][*]\\(end .*\\)\\?[*][/];$/{
   $4;
   d;
 }
 /^;[/][*]begin /!{
   : internal_error
+  $v:internal_error
   i\\
 Internal error at
   p;
+  i\\
+/*(DEBLOB-\\
+ERROR)*/
   q 2;
 }
 $v:reading file in
@@ -1612,10 +2210,11 @@ n;
 H;
 g;
 $4
-s/^\(;[/][*]begin [^\n]*[\n]\)*//;
-s/\\($bol;[/][*]\\(end [^\n]*\\)\\?[*][/];\\)*$//;
-$v:???!blobseq
-/$blobseq/!b clean;
+$v:read all
+s/^\\(;[/][*]begin [^\n]*[\\n]\\)*//;
+s/\\($bol[\n]\?;[/][*]\\(end [^\\n]*\\)\\?[*][/];\\)*$//;
+$v:???!blobfast
+/$blobfast/!b clean;
 $check_false_positives
 # Fall through.
 : blob
@@ -1650,7 +2249,7 @@ $v:print_matches
 h;
 s/^\\($falsepos[^\\n]*\\)\\([\\n].*\\)\\?$/\\1/;
 $v:narrowed to match
-/$blobfseq/ {
+/$bloblong/ {
   i\\
 ::: $file :::
   p;
@@ -1683,11 +2282,11 @@ $v:print_marked_matches
 h;
 s/^\\($falsepos[^\\n]*\\)\\([\\n].*\\)\\?$/\\1/;
 $v:narrowed to match
-/$blobfseq/{
+/$bloblong/{
   i\\
 ::: $file :::
   s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[   ]*;/{\/*(DEBLOBBED)*\/};/g;
-  s/$blobfseq/\/*(DEBLOBBED)*\//g;
+  s/$bloblong/\/*(DEBLOBBED)*\//g;
   p;
 }
 g;
@@ -1704,10 +2303,12 @@ $v:print_blobs
 /^$falsepos/ {
   $v:delete false positive
   # This is tricky.  We don't want to print the false positive.
-  /^$falsepos[^\\n]*$blobseq/ {
+  /^$falsepos[^\\n]*$blobfast/ {
     $v:delete false positive immediately followed by blob
+    s/^\\($falsepos\\)/\\1\/*(DEBLOB-\\nBED)*\//;
     h;
-    s/^\\($falsepos\\)[^\\n]*$blobseq.*/\\1/;
+    s/^\\($falsepos\\).*/\\1/;
+    $v:matched false positive
     : print_blobs_match_loop
     /[\\n]/ {
       s/^[^\\n]*[\\n]//;
@@ -1719,13 +2320,16 @@ $v:print_blobs
     G;
     b print_blobs_delete_to_eol;
   }
-  s/^$falsepos//;
-  b print_blobs_delete_to_eol;
+  /^$falsepos[/][*](DEBLOB-\\nBED)[*][/]/! {
+    s/^$falsepos//;
+    b print_blobs_delete_to_eol;
+  }
 }
-/^[^\\n]*$blobseq/! {
+/^\([^\\n]\|[/][*](DEBLOB-\\nBED)[*][/]\)*$blobfast/! {
   $v:delete non-blob header
   h;
-  s/[\\n]\\($falsepos\\|[^\\n]*$blobseq\\).*//;
+  s/[\\n]\\($falsepos\\|[^\\n]*$blobfast\\).*//;
+  $v:matched non-blob header
   : print_blobs_nomatch_loop
   /[\\n]/ {
     s/^[^\\n]*[\\n]//;
@@ -1737,14 +2341,20 @@ $v:print_blobs
   x;
   b print_blobs_delete_to_eol;
 }
-h;
 i\\
 ::: $file :::
-s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/;
+: print_blobs_output_false_positive;
+/[^\\n]*[/][*](DEBLOB-[\\n]BED)[*][/]/ {
+  P;
+  s,^[^\\n]*[\\n],,
+  b print_blobs_output_false_positive;
+}
+h;
+s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/;
 $v:narrowed to blob
 p;
 g;
-s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)//;
+s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)//;
 : print_blobs_delete_to_eol
 $v:delete to eol
 s/^[^\\n]*//;
@@ -1757,10 +2367,12 @@ $v:print_marked_blobs
 /^$falsepos/ {
   $v:delete false positive
   # This is tricky.  We don't want to print the false positive.
-  /^$falsepos[^\\n]*$blobseq/ {
+  /^$falsepos[^\\n]*$blobfast/ {
     $v:delete false positive immediately followed by blob
+    s/^\\($falsepos\\)/\\1\/*(DEBLOB-\\nBED)*\//;
     h;
-    s/^\\($falsepos\\)[^\\n]*$blobseq.*/\\1/;
+    s/^\\($falsepos\\).*/\\1/;
+    $v:matched false positive
     : print_marked_blobs_match_loop
     /[\\n]/ {
       s/^[^\\n]*[\\n]//;
@@ -1772,13 +2384,16 @@ $v:print_marked_blobs
     G;
     b print_marked_blobs_delete_to_eol;
   }
-  s/^falsepos//;
-  b print_marked_blobs_delete_to_eol;
+  /^$falsepos[/][*](DEBLOB-\\nBED)[*][/]/! {
+    s/^falsepos//;
+    b print_marked_blobs_delete_to_eol;
+  }
 }
-/^[^\\n]*$blobseq/! {
+/^\([^\\n]\|[/][*](DEBLOB-\\nBED)[*][/]\)*$blobfast/! {
   $v:delete non-blob header
   h;
-  s/[\\n]\\($falsepos\\|[^\\n]*$blobseq\\).*//;
+  s/[\\n]\\($falsepos\\|[^\\n]*$blobfast\\).*//;
+  $v:matched non-blob header
   : print_marked_blobs_nomatch_loop
   /[\\n]/ {
     s/^[^\\n]*[\\n]//;
@@ -1790,16 +2405,22 @@ $v:print_marked_blobs
   x;
   b print_marked_blobs_delete_to_eol;
 }
-h;
 i\\
 ::: $file :::
-s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/;
+: print_marked_blobs_output_false_positive;
+/[^\\n]*[/][*](DEBLOB-[\\n]BED)[*][/]/ {
+  P;
+  s,^[^\\n]*[\\n],,
+  b print_marked_blobs_output_false_positive;
+}
+h;
+s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/;
 $v:narrowed to blob
 s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[     ]*;/{\/*(DEBLOBBED)*\/};/g;
-s/$blobfseq/\/*(DEBLOBBED)*\//g;
+s/$bloblong/\/*(DEBLOBBED)*\//g;
 p;
 g;
-s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)//;
+s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)//;
 : print_marked_blobs_delete_to_eol
 $v:delete to eol
 s/^[^\\n]*//;
@@ -1812,10 +2433,12 @@ $v:print_cblobs
 /^$falsepos/ {
   $v:delete false positive
   # This is tricky.  We don't want to print the false positive.
-  /^$falsepos[^\\n]*$blobseq/ {
+  /^$falsepos[^\\n]*$blobfast/ {
     $v:delete false positive immediately followed by blob
+    s/^\\($falsepos\\)/\\1\/*(DEBLOB-\\nBED)*\//;
     h;
-    s/^\\($falsepos\\)[^\\n]*$blobseq.*/\\1/;
+    s/^\\($falsepos\\).*/\\1/;
+    $v:matched false positive
     : print_cblobs_match_loop
     /[\\n]/ {
       s/^[^\\n]*[\\n]//;
@@ -1827,13 +2450,16 @@ $v:print_cblobs
     G;
     b print_cblobs_delete_to_eol;
   }
-  s/^$falsepos//;
-  b print_cblobs_delete_to_eol;
+  /^$falsepos[/][*](DEBLOB-\\nBED)[*][/]/! {
+    s/^$falsepos//;
+    b print_cblobs_delete_to_eol;
+  }
 }
 /^$lblobctx/! {
   $v:delete non-blob header
   h;
   s/[\\n]\\($falsepos\\|$lblobctx\\).*//;
+  $v:matched non-blob header
   : print_cblobs_nomatch_loop
   /[\\n]/ {
     s/^[^\\n]*[\\n]//;
@@ -1845,14 +2471,20 @@ $v:print_cblobs
   x;
   b print_cblobs_delete_to_eol;
 }
-h;
 i\\
 ::: $file :::
-s/^\\($lblobctx[^\\n]*\\($blobfseq[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/;
+: print_cblobs_output_false_positive;
+/[^\\n]*[/][*](DEBLOB-[\\n]BED)[*][/]/ {
+  P;
+  s,^[^\\n]*[\\n],,
+  b print_cblobs_output_false_positive;
+}
+h;
+s/^\\($lblobctx[^\\n]*\\($bloblong[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/;
 $v:narrowed to blob
 p;
 g;
-s/^\\($lblobctx[^\\n]*\\($blobfseq[^\\n]*\\)*\\)//;
+s/^\\($lblobctx[^\\n]*\\($bloblong[^\\n]*\\)*\\)//;
 : print_cblobs_delete_to_eol
 $v:delete to eol
 s/^[^\\n]*//;
@@ -1865,10 +2497,12 @@ $v:print_marked_cblobs
 /^$falsepos/ {
   $v:delete false positive
   # This is tricky.  We don't want to print the false positive.
-  /^$falsepos[^\\n]*$blobseq/ {
+  /^$falsepos[^\\n]*$blobfast/ {
     $v:delete false positive immediately followed by blob
+    s/^\\($falsepos\\)/\\1\/*(DEBLOB-\\nBED)*\//;
     h;
-    s/^\\($falsepos\\)[^\\n]*$blobseq.*/\\1/;
+    s/^\\($falsepos\\).*/\\1/;
+    $v:matched false positive
     : print_marked_cblobs_match_loop
     /[\\n]/ {
       s/^[^\\n]*[\\n]//;
@@ -1880,13 +2514,16 @@ $v:print_marked_cblobs
     G;
     b print_marked_cblobs_delete_to_eol;
   }
-  s/^$falsepos//;
-  b print_marked_cblobs_delete_to_eol;
+  /^$falsepos[/][*](DEBLOB-\\nBED)[*][/]/! {
+    s/^$falsepos//;
+    b print_marked_cblobs_delete_to_eol;
+  }
 }
 /^$lblobctx/! {
   $v:delete non-blob header
   h;
   s/[\\n]\\($falsepos\\|$lblobctx\\).*//;
+  $v:matched non-blob header
   : print_marked_cblobs_nomatch_loop
   /[\\n]/ {
     s/^[^\\n]*[\\n]//;
@@ -1898,16 +2535,22 @@ $v:print_marked_cblobs
   x;
   b print_marked_cblobs_delete_to_eol;
 }
-h;
 i\\
 ::: $file :::
-s/^\\($lblobctx[^\\n]*\\($blobfseq[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/;
+: print_marked_cblobs_output_false_positive;
+/[^\\n]*[/][*](DEBLOB-[\\n]BED)[*][/]/ {
+  P;
+  s,^[^\\n]*[\\n],,
+  b print_marked_cblobs_output_false_positive;
+}
+h;
+s/^\\($lblobctx[^\\n]*\\($bloblong[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/;
 $v:narrowed to blob
 s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[     ]*;/{\/*(DEBLOBBED)*\/};/g;
-s/$blobfseq/\/*(DEBLOBBED)*\//g;
+s/$bloblong/\/*(DEBLOBBED)*\//g;
 p;
 g;
-s/^\\($lblobctx[^\\n]*\\($blobfseq[^\\n]*\\)*\\)//;
+s/^\\($lblobctx[^\\n]*\\($bloblong[^\\n]*\\)*\\)//;
 : print_marked_cblobs_delete_to_eol
 $v:delete to eol
 s/^[^\\n]*//;
@@ -1917,10 +2560,11 @@ b print_marked_cblobs;
 
 : print_both
 $v:print_both
-/^\\($falsepos\\|[^\\n]*$blobseq\\)/! {
+/^\\($falsepos\\|[^\\n]*$blobfast\\)/! {
   $v:delete non-blob header
   h;
-  s/[\\n]\\($falsepos\\|[^\\n]*$blobseq\\).*//;
+  s/[\\n]\\($falsepos\\|[^\\n]*$blobfast\\).*//;
+  $v:matched non-blob header
   : print_both_nomatch_loop
   /[\\n]/ {
     s/^[^\\n]*[\\n]//;
@@ -1935,11 +2579,11 @@ $v:print_both
 h;
 i\\
 ::: $file :::
-s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$blobfseq[^\\n]*\\)\\($blobfseq[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/;
+s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$bloblong[^\\n]*\\)\\($bloblong[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/;
 $v:narrowed to blob
 p;
 g;
-s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$blobfseq[^\\n]*\\)\\($blobfseq[^\\n]*\\)*\\)//;
+s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$bloblong[^\\n]*\\)\\($bloblong[^\\n]*\\)*\\)//;
 : print_both_delete_to_eol
 $v:delete to eol
 s/^[^\\n]*//;
@@ -1968,9 +2612,9 @@ $v:list_matches
 h;
 s/^\\($falsepos[^\\n]*\\)\\([\\n].*\\)\\?$/\\1/;
 $v:narrowed to match
-/$blobfseq/{
+/$bloblong/{
   s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[   ]*;/{\/*(DEBLOBBED)*\/};/g;
-  s/$blobfseq/\/*(DEBLOBBED)*\//g;
+  s/$bloblong/\/*(DEBLOBBED)*\//g;
 }
 p;
 g;
@@ -1987,10 +2631,11 @@ $v:list_blobs
 /^$falsepos/ {
   $v:print false positive
   # This is tricky.  We don't want to deblob the false positive.
-  /^$falsepos[^\\n]*$blobseq/ {
+  /^$falsepos[^\\n]*$blobfast/ {
     $v:print false positive immediately followed by blob
+    s/^\\($falsepos\\)/\\1\/*(DEBLOB-\\nBED)*\//;
     h;
-    s/^\\($falsepos\\)[^\\n]*$blobseq.*/\\1/;
+    s/^\\($falsepos\\).*/\\1/;
     : list_blobs_match_loop
     /[\\n]/ {
       P;
@@ -2010,10 +2655,10 @@ $v:list_blobs
   s/^\\($falsepos[^\\n]*\\)//;
   b list_blobs_delete_to_eol;
 }
-/^[^\\n]*$blobseq/! {
+/^[^\\n]*$blobfast/! {
   $v:print non-blob header
   h;
-  s/[\\n]\\($falsepos\\|[^\\n]*$blobseq\\).*//;
+  s/[\\n]\\($falsepos\\|[^\\n]*$blobfast\\).*//;
   p;
   : list_blobs_nomatch_loop
   /[\\n]/ {
@@ -2027,13 +2672,13 @@ $v:list_blobs
   b list_blobs_delete_to_eol;
 }
 h;
-s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/;
+s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)\\([\\n].*\\)\\?$/\\1/;
 $v:narrowed to blob
 s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[     ]*;/{\/*(DEBLOBBED)*\/};/g;
-s/$blobfseq/\/*(DEBLOBBED)*\//g;
+s/$bloblong/\/*(DEBLOBBED)*\//g;
 p;
 g;
-s/^\\([^\\n]*\\($blobfseq[^\\n]*\\)\\+\\)//;
+s/^\\([^\\n]*\\($bloblong[^\\n]*\\)\\+\\)//;
 : list_blobs_delete_to_eol
 $v:delete to eol
 s/^[^\\n]*//;
@@ -2043,10 +2688,10 @@ b list_blobs;
 
 : list_both
 $v:list_both
-/^\\($falsepos\\|[^\\n]*$blobseq\\)/! {
+/^\\($falsepos\\|[^\\n]*$blobfast\\)/! {
   $v:print non-blob header
   h;
-  s/[\\n]\\($falsepos\\|[^\\n]*$blobseq\\).*//;
+  s/[\\n]\\($falsepos\\|[^\\n]*$blobfast\\).*//;
   p;
   : list_both_nomatch_loop
   /[\\n]/ {
@@ -2060,13 +2705,13 @@ $v:list_both
   b list_both_delete_to_eol;
 }
 h;
-s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$blobfseq[^\\n]*\\)\\($blobfseq[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/;
+s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$bloblong[^\\n]*\\)\\($bloblong[^\\n]*\\)*\\)\\([\\n].*\\)\\?$/\\1/;
 $v:narrowed to blob
 s/{\\($sepx\\)\\?$blobfseq\\($sepx\\)\\?}[     ]*;/{\/*(DEBLOBBED)*\/};/g;
-s/$blobfseq/\/*(DEBLOBBED)*\//g;
+s/$bloblong/\/*(DEBLOBBED)*\//g;
 p;
 g;
-s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$blobfseq[^\\n]*\\)\\($blobfseq[^\\n]*\\)*\\)//;
+s/^\\(\\($falsepos[^\\n]*\\|[^\\n]*$bloblong[^\\n]*\\)\\($bloblong[^\\n]*\\)*\\)//;
 : list_both_delete_to_eol
 $v:delete to eol
 s/^[^\\n]*//;
@@ -2089,6 +2734,8 @@ check () {
   falsepos_name=`mktemp -t deblob-check-falsepos-XXXXXX`
   tempfiles="$falsepos_name"
 
+  falseneg_name=`mktemp -t deblob-check-falseneg-XXXXXX`
+  tempfiles="$tempfiles $falseneg_name"
 
   # Add $1 to falsepos.  Its usage makes it implicitly anchored to the
   # beginning of the line.  $2, if present, will some day narrow the
@@ -2099,11 +2746,20 @@ check () {
     fi
   }
 
+  # Add $1 to falseneg.  Unlike addx, it is NOT implicitly anchored to
+  # the beginning of the line.  $2, if present, will some day narrow
+  # the falseneg matches to files that match it.
+  badx () {
+    if test -n "$1"; then
+      echo -n "\\|$1" >> $falseneg_name
+    fi
+  }
+
   set_except "$input"
 
   set_sed_cmd "$input"
 
-  rm -f "$falsepos_name"
+  rm -f $tempfiles
   tempfiles=
 
   # Choose the input source...
@@ -2127,7 +2783,7 @@ check () {
   # Extract or otherwise munge...
   case /$input in
   *.tar*)
-    cmd="tar -xf - --to-command='echo \";/*begin \$TAR_FILENAME*/;\"; cat; echo \";/**/;\"; echo \";/*end \$TAR_FILENAME*/;\"'"
+    cmd="tar -xf - --to-command='echo \";/*begin \$TAR_FILENAME*/;\"; cat; echo \";/**/;\"; echo; echo \";/*end \$TAR_FILENAME*/;\"'"
     ;;
   *.patch | *.patch.*z* | */patch-* | *.diff | *.diff.*z*)
     if $reverse_patch; then
@@ -2152,7 +2808,7 @@ check () {
     cmd='cat'
     ;;
   esac
-  cmd="{ echo \";/*begin $input*/;\"; $cmd; echo \";/*end $input*/;\"; }"
+  cmd="{ echo \";/*begin $input*/;\"; $cmd; echo; echo \";/*end $input*/;\"; }"
   set "$@" "$cmd"
 
   case $input in
@@ -2173,7 +2829,20 @@ check () {
   fi
   set "$@" "$cmd"
 
-  test $# != 1 || set "$@" "cat"
+  sedunbreak='
+: restart;
+/[/][*](DEBLOB-$/ {
+  N;
+  /[/][*](DEBLOB-[\n]ERROR)[*][/]/{q 1;}
+  s,[/][*](DEBLOB-[\n]BED)[*][/],,
+  b restart;
+}
+p
+'
+  cmd='sed -n "$sedunbreak"'
+  set "$@" "$cmd"
+
+  # test $# = 1 || set "$@" "cat"
 
   shift # fnord goes out here
 
@@ -2215,9 +2884,37 @@ pass=:
 tempfiles=
 trap "status=$?; test -z \"$tempfiles\" || rm -f $tempfiles; (exit $status); exit" 0 1 2 15
 
+process_arg=
+
 # Go through each of the input files in the command line.
 for file
 do
+  case $process_arg in
+  "") ;;
+  --implied-prefix | --prefix | -i)
+    prefix=$file
+    case $prefix in
+    /*/) ;;
+    */) prefix=/$prefix ;;
+    /*) prefix=$prefix/ ;;
+    *) prefix=/$prefix/ ;;
+    esac
+    process_arg=
+    continue
+    ;;
+  *)
+    echo Internal error with process_arg=$process_arg >&2
+    exit 1
+    ;;
+  esac
+
+  case $sawdashdash$file in
+  --implied-prefix | --prefix | -i)
+    process_arg=$file
+    continue
+    ;;
+  esac
+  
   # If we print anything whatsoever (even a blank line) while
   # processing it, we've failed.
   if check "$file"; then
@@ -2229,6 +2926,14 @@ do
   fi
 done
 
+case $process_arg in
+"") ;;
+*)
+  echo Missing argument to $process_arg >&2
+  exit 1
+  ;;
+esac
+
 #list: shift $n
 
 #list: exec test $# = 0
index 21c62ec1027abec4c595c19ecc7d98ff9eed2aba..71840776c75f2fedd484c7550328ad4a69bba41d 100755 (executable)
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2008 Alexandre Oliva <lxoliva@fsfla.org>
+# Copyright (C) 2008, 2009 Alexandre Oliva <lxoliva@fsfla.org>
 
 # 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
@@ -113,6 +113,11 @@ if test -f linux-$kver-$libre.patch; then
   exit 1
 fi
 
+if test -f linux-$kver-$libre.log; then
+  echo linux-$kver-$libre.log already exists >&2
+  exit 1
+fi
+
 if test -f linux-$kver-$libre.xdelta; then
   echo linux-$kver-$libre.xdelta already exists >&2
   exit 1
@@ -173,10 +178,15 @@ echo Copying linux-$kver to linux-$kver-$libre
 cp linux-$kver.tar linux-$kver-$libre.tar
 cp -lR linux-$kver/. linux-$kver-$libre
 
-echo Deblobbing within linux-$kver-$libre
-if (cd linux-$kver-$libre && /bin/sh ../$deblob $force); then
-  :
-else
+rm -f linux-$kver-$libre.log linux-$kver-$libre.log.tmp
+echo Deblobbing within linux-$kver-$libre, saving output to linux-$kver-$libre.log
+# We can't just pipe deblob into tee, for then we fail to detect 
+# error conditions.  Use file renaming to tell whether we succeeded.
+if (cd linux-$kver-$libre && /bin/sh ../$deblob $force) 2>&1; then
+  mv linux-$kver-$libre.log.tmp linux-$kver-$libre.log
+fi | tee linux-$kver-$libre.log.tmp
+if test ! -f linux-$kver-$libre.log; then
+  mv linux-$kver-$libre.log.tmp linux-$kver-$libre.log
   echo $deblob failed, aborting >&2
   exit 1
 fi