X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-2.6.28;h=5f0e3bec6bbfe68f37faf748ed3967ac789c5e17;hb=94e29a3619f4e5bbfec010f8b38eb56161deee0b;hp=64d60ebe9faa5e158cc576bbb4018e5fb1c4e917;hpb=bd08fd920b58692005390ba80e29a02b20252457;p=releases.git diff --git a/deblob-2.6.28 b/deblob-2.6.28 index 64d60ebe9faa..5f0e3bec6bbf 100755 --- a/deblob-2.6.28 +++ b/deblob-2.6.28 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2008, 2009 Alexandre Oliva +# Copyright (C) 2008, 2009, 2010 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # @@ -45,7 +45,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.28 extra=3++ +kver=2.6.28 extra=4 case $1 in --force) @@ -80,7 +80,9 @@ else fi filetest () { - [ -f $1 ] + if [ ! -f $1 ]; then + die $1 does not exist, something is wrong && return 1 + fi } announce () { @@ -186,8 +188,9 @@ clean_mk () { clean_sed () { #$1 = sed-script $2 = file $3 = comment filetest $2 || return - sed -e "$1" "$2" > "$2".deblob - check_changed $2 && echo $2: ${3-applied sed script $1} + sed -e "$1" "$2" > "$2".deblob || { + die $2: failed: ${3-applied sed script $1} && return 1; } + check_changed $2 && echo $2: ${3-applied sed script $1} } reject_firmware () { @@ -437,37 +440,29 @@ clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile 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' +/^static void r128_cce_load_microcode(drm_r128_private_t \* dev_priv)/i\ +#define r128_cce_load_microcode(dev_priv) \\\ + do { \\\ + DRM_ERROR("Missing Free microcode!\\n"); \\\ + dev->dev_private = (void *)dev_priv; \\\ + r128_do_cleanup_cce(dev); \\\ + return -EINVAL; \\\ + } while (0) +' drivers/gpu/drm/r128/r128_cce.c 'report missing Free microcode' clean_blob drivers/gpu/drm/r128/r128_cce.c clean_kconfig -f drivers/gpu/drm/Kconfig 'DRM_R128' clean_mk CONFIG_DRM_R128 drivers/gpu/drm/Makefile 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' +/^static void radeon_cp_load_microcode(drm_radeon_private_t \* dev_priv)/i\ +#define radeon_cp_load_microcode(dev_priv) \\\ + do { \\\ + DRM_ERROR("Missing Free microcode!\\n"); \\\ + radeon_do_cleanup_cp(dev); \\\ + return -EINVAL; \\\ + } while (0) +' drivers/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 -f drivers/gpu/drm/Kconfig 'DRM_RADEON' @@ -911,6 +906,7 @@ clean_sed ' return (printk(KERN_ERR PFX "%s: Missing Free firmware\\n", bp->dev->name),\\\ -EINVAL) }' drivers/net/bnx2x_main.c 'report missing Free firmware' +clean_blob drivers/net/bnx2x_hsi.h clean_kconfig drivers/net/Kconfig 'BNX2X' clean_mk CONFIG_BNX2X drivers/net/Makefile @@ -977,6 +973,9 @@ 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_sed ' +s,^\([ ]*\)\(instruction[ ]=[ ][^;]*\(Oasis\|GB\|Mojave\)\(Rcv\)\?UCode[^:}]*;\),\1printk(KERN_ERR "slicoss: missing Free firmware\\n");\n\1return STATUS_NOT_SUPPORTED;\n\1\2,' drivers/staging/slicoss/slicoss.c 'report missing Free firmware' +clean_blob drivers/staging/slicoss/slicoss.c clean_kconfig drivers/staging/slicoss/Kconfig 'SLICOSS' clean_mk CONFIG_SLICOSS drivers/staging/slicoss/Makefile @@ -989,8 +988,31 @@ 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_file drivers/staging/sxg/saharadbgdownload.h +clean_file drivers/staging/sxg/sxgphycode.h +clean_sed ' +/^static bool sxg_download_microcode(/,/^}$/{ + /^{$/{ + p + i\ +#if 1\ + printk(KERN_ERR KBUILD_MODNAME ": missing Free firmware\\n");\ + return (FALSE);\ +#else + d + } + /^}/{ + i\ +#endif + } +} +/^static int sxg_phy_init(/,/^}$/{ + /for (p = PhyUcode/i\ + printk(KERN_ERR KBUILD_MODNAME ": missing Free firmware\\n");\ + return (STATUS_FAILURE);\ +#define PhyUcode NULL +}' drivers/staging/sxg/sxg.c 'report missing Free firmware' +clean_blob drivers/staging/sxg/sxg.c clean_kconfig drivers/staging/sxg/Kconfig 'SXG' clean_mk CONFIG_SXG drivers/staging/sxg/Makefile @@ -1350,6 +1372,14 @@ 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_sed ' +/^static int me4000_xilinx_download([^;]*$/,/^}$/{ + /firm = .*xilinx_firm.*/i\ + printk(KERN_ERR "me4000: Missing Free firmware\\n");\ + return -EIO; +} +' drivers/staging/me4000/me4000.c 'report missing Free firmware' +clean_blob drivers/staging/me4000/me4000.c clean_kconfig drivers/staging/me4000/Kconfig 'ME4000' clean_mk CONFIG_ME4000 drivers/staging/me4000/Makefile @@ -1842,6 +1872,7 @@ clean_blob Documentation/sound/alsa/ALSA-Configuration.txt clean_blob Documentation/sound/oss/MultiSound clean_blob Documentation/sound/oss/PSS clean_blob Documentation/sound/oss/PSS-updates +clean_blob Documentation/sound/oss/README.OSS clean_file Documentation/dvb/get_dvb_firmware clean_file Documentation/video4linux/extract_xc3028.pl clean_sed s,usb8388,whatever,g drivers/base/Kconfig 'removed blob name'