X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=deblob-2.6.28;h=55ae2e48cee1f0868c6a3f27c387d16acdd7d1d6;hb=94af7fc2de9751adb17a648c408ac5add412a86d;hp=09399b3b9569ce9a9e1d799720e3be6c13e2d356;hpb=6930c01f61782668399f52991dd3af85a6d883d3;p=releases.git diff --git a/deblob-2.6.28 b/deblob-2.6.28 index 09399b3b9569..55ae2e48cee1 100755 --- a/deblob-2.6.28 +++ b/deblob-2.6.28 @@ -184,7 +184,7 @@ clean_sed () { reject_firmware () { #$1 = file clean_sed ' -s,request\(_ihex\|\)_firmware(,reject_firmware(, +s,request\(_ihex\)\?_firmware\(_nowait\)\?,reject_firmware\2,g ' "$1" 'disabled non-Free firmware-loading machinery' } @@ -263,12 +263,12 @@ report_missing_free_firmware(const char *name, const char *what)\ return -EINVAL;\ }\ static inline int\ -reject_firmware(const struct firmware **fw, +reject_firmware(const struct firmware **fw,\ const char *name, struct device *device)\ {\ - struct firmware *xfw = NULL;\ + const struct firmware *xfw = NULL;\ int retval;\ - report_missing_free_firmware(device->name, NULL);\ + report_missing_free_firmware(dev_name(device), NULL);\ retval = request_firmware(&xfw, NONFREE_FIRMWARE, device);\ if (!retval)\ release_firmware(xfw);\ @@ -296,7 +296,7 @@ reject_firmware_nowait(struct module *module, int uevent,\ void *context))\ {\ int retval;\ - report_missing_free_firmware(device->name, NULL);\ + report_missing_free_firmware(dev_name(device), NULL);\ retval = request_firmware_nowait(module, uevent, NONFREE_FIRMWARE,\ device, NULL,\ discard_rejected_firmware);\ @@ -388,7 +388,7 @@ 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 (EXPERIMENTAL)" +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' @@ -440,6 +440,7 @@ clean_sed ' return -EINVAL; } }' drivers/gpu/drm/radeon/radeon_cp.c 'report missing Free microcode' +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 @@ -449,12 +450,6 @@ clean_mk CONFIG_DRM_RADEON drivers/gpu/drm/Makefile # Media # ######### -announce DVB - "non-Free firmware scripts and documentation" -clean_blob Documentation/dvb/get_dvb_firmware -clean_blob Documentation/dvb/avermedia.txt -clean_blob Documentation/dvb/opera-firmware.txt -clean_blob Documentation/dvb/ttusb-dec.txt - # media/tuner announce MEDIA_TUNER_XC2028 - "XCeive xc2028/xc3028 tuners" @@ -469,7 +464,6 @@ undefault_firmware 'XC\(2028\|3028L\)' \ drivers/media/video/em28xx/em28xx-cards.c \ drivers/media/dvb/dvb-usb/dib0700_devices.c \ drivers/media/dvb/dvb-usb/cxusb.c -clean_blob drivers/media/common/tuners/tuner-xc2028.h 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 @@ -477,13 +471,11 @@ clean_mk CONFIG_MEDIA_TUNER_XC2028 drivers/media/common/tuners/Makefile announce MEDIA_TUNER_XC5000 - "Xceive XC5000 silicon tuner" undefault_firmware 'XC5000' drivers/media/common/tuners/xc5000.c reject_firmware drivers/media/common/tuners/xc5000.c -clean_blob 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_blob 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 @@ -522,17 +514,17 @@ 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 (see help for supported devices)" +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) (see help for device list)" +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) (see help for device list)" +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 @@ -605,9 +597,13 @@ 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.[ch] +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 @@ -619,7 +615,6 @@ 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" -undefault_firmware 'OR51211' drivers/media/dvb/frontends/or51132.c 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' @@ -640,6 +635,12 @@ 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 @@ -675,13 +676,18 @@ 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 -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 announce DVB_BUDGET - "Budget cards" reject_firmware drivers/media/dvb/ttpci/budget.c +reject_firmware drivers/media/dvb/frontends/tdhd1.h announce DVB_BUDGET_AV - "Budget cards with analog video inputs" reject_firmware drivers/media/dvb/ttpci/budget-av.c @@ -709,7 +715,6 @@ 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 -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 @@ -724,7 +729,6 @@ clean_mk CONFIG_DVB_TTUSB_DEC drivers/media/dvb/ttusb-dec/Makefile announce VIDEO_BT848 - "BT848 Video For Linux" reject_firmware drivers/media/video/bt8xx/bttv-cards.c -clean_blob drivers/media/video/bt8xx/bttv-cards.c clean_kconfig drivers/media/video/bt8xx/Kconfig 'VIDEO_BT848' clean_mk CONFIG_VIDEO_BT848 drivers/media/video/bt8xx/Makefile @@ -739,7 +743,6 @@ 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_blob drivers/media/video/cx18/cx18-firmware.c clean_kconfig drivers/media/video/cx18/Kconfig 'VIDEO_CX18' clean_mk CONFIG_VIDEO_CX18 drivers/media/video/cx18/Makefile @@ -786,7 +789,6 @@ 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_blob 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 @@ -883,6 +885,7 @@ clean_kconfig drivers/net/Kconfig 'CASSINI' clean_mk CONFIG_CASSINI drivers/net/Makefile 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\ @@ -890,6 +893,7 @@ clean_sed ' 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 clean_kconfig drivers/net/Kconfig 'CHELSIO_T3' clean_mk CONFIG_CHELSIO_T3 drivers/net/cxgb3/Makefile @@ -943,6 +947,8 @@ 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 @@ -1037,7 +1043,6 @@ clean_mk CONFIG_USB_IRDA drivers/net/irda/Makefile # pcmcia announce PCMCIA_SMC91C92 - "SMC 91Cxx PCMCIA" -clean_blob drivers/net/pcmcia/ositech.h 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&/ @@ -1046,12 +1051,13 @@ 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_blob drivers/pcmcia/ds.c clean_kconfig drivers/pcmcia/Kconfig 'PCCARD' clean_mk CONFIG_PCCARD drivers/pcmcia/Makefile @@ -1158,12 +1164,12 @@ 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_blob drivers/net/wireless/iwlwifi/iwl-agn.c clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWLAGN' clean_mk CONFIG_IWLAGN drivers/net/wireless/iwlwifi/Makefile @@ -1192,6 +1198,7 @@ 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 @@ -1210,18 +1217,22 @@ 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_blob 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 @@ -1714,29 +1725,44 @@ 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" -reject_firmware sound/oss/sscape.c 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" -reject_firmware sound/oss/trix.c 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 - "MediaTrix AudioTrix Pro support" -announce SOUND_PAS - "ProAudioSpectrum 16 support" +announce SOUND_TRIX - "See above," +announce SOUND_PAS - "ProAudioSpectrum 16 support," announce SOUND_SB - "100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support" -reject_firmware sound/oss/sb_common.c clean_blob sound/oss/sb_common.c clean_kconfig sound/oss/Kconfig 'SOUND_PAS' clean_kconfig sound/oss/Kconfig 'SOUND_SB' @@ -1744,9 +1770,29 @@ 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" -reject_firmware sound/oss/pss.c 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