X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.33;h=67c6a85403a3c5f9aeec799d5ac9b4b24cddf708;hb=ee7de2b53bd496eeeafaf088960762ee61720c50;hp=2f6ef764fdd3a11fdc5e0fc45733b1a8de58d158;hpb=3d9cf7f1db366688cb1f11ab2d16252302b40844;p=releases.git diff --git a/deblob-2.6.33 b/deblob-2.6.33 index 2f6ef764fdd3..67c6a85403a3 100755 --- a/deblob-2.6.33 +++ b/deblob-2.6.33 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2008, 2009, 2010 Alexandre Oliva +# Copyright (C) 2008, 2009, 2010, 2011 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # @@ -44,7 +44,7 @@ # 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.33 extra=1 +kver=2.6.33 extra=1++ case $1 in --force) @@ -486,7 +486,7 @@ announce DRM_NOUVEAU - "Nouveau (nVidia) cards" reject_firmware drivers/gpu/drm/nouveau/nouveau_grctx.c clean_blob drivers/gpu/drm/nouveau/nouveau_grctx.c clean_blob drivers/gpu/drm/nouveau/nv50_graph.c -clean_kconfig drivers/gpu/drk/nouveau/Kconfig 'DRM_NOUVEAU' +clean_kconfig drivers/gpu/drm/nouveau/Kconfig 'DRM_NOUVEAU' clean_mk CONFIG_DRM_NOUVEAU drivers/gpu/drm/nouveau/Makefile announce DRM_MGA - "Matrox g200/g400" @@ -1182,6 +1182,7 @@ drop_fw_file firmware/cis/PE520.cis.ihex firmware/cis/PE520.cis announce 3C359 - "3Com 3C359 Token Link Velocity XL adapter" drop_fw_file firmware/3com/3C359.bin.ihex firmware/3com/3C359.bin +reject_firmware drivers/net/tokenring/3c359.c clean_blob drivers/net/tokenring/3c359.c clean_kconfig drivers/net/tokenring/Kconfig '3C359' clean_mk CONFIG_3C359 drivers/net/tokenring/Makefile @@ -1257,15 +1258,24 @@ clean_mk CONFIG_HERMES drivers/net/wireless/orinoco/Makefile announce WLAGS49_H2 - 'Agere Systems HERMES II Wireless PC Card Model 0110' # Some pieces of the firmware images are most definitely data, but # others seem to be code. -clean_file drivers/staging/wlags49_h2/ap_h2.c -clean_file drivers/staging/wlags49_h2/sta_h2.c +clean_blob drivers/staging/wlags49_h2/ap_h2.c +clean_blob drivers/staging/wlags49_h2/sta_h2.c +echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/ap_h2.c +echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/sta_h2.c clean_blob drivers/staging/wlags49_h2/wl_profile.c +clean_sed ' + s,\(.*hcf_status = \)dhf_download_fw(.*&fw_image );,//& /*(DEBLOBBED)*/\n\1HCF_ERR_INCOMP_FW;, +' drivers/staging/wlags49_h2/wl_main.c 'reject built-in non-Free firmware' clean_kconfig drivers/staging/wlags49_h2/Kconfig 'WLAGS49_H2' clean_mk CONFIG_WLAGS49_H2 drivers/staging/Makefile announce WLAGS49_H25 - 'Linksys Systems HERMES II.5 Wireless-G_CompactFlash_Card' -clean_file drivers/staging/wlags49_h2/ap_h25.c -clean_file drivers/staging/wlags49_h2/sta_h25.c +# Some pieces of the firmware images are most definitely data, but +# others seem to be code. +clean_blob drivers/staging/wlags49_h2/ap_h25.c +clean_blob drivers/staging/wlags49_h2/sta_h25.c +echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/ap_h25.c +echo 'extern int deblobbed; /*(DEBLOBBED)*/' > drivers/staging/wlags49_h2/sta_h25.c clean_kconfig drivers/staging/wlags49_h25/Kconfig 'WLAGS49_H25' clean_mk CONFIG_WLAGS49_H25 drivers/staging/Makefile