From 3cb0b97fd076e93215adfac6440d877dd9f1f665 Mon Sep 17 00:00:00 2001 From: lxoliva Date: Fri, 10 Oct 2008 02:07:59 +0000 Subject: [PATCH] 2.6.27 final git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@4366 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-2.6.27 | 29 ++++++++--------- deblob-check | 86 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 92 insertions(+), 23 deletions(-) diff --git a/deblob-2.6.27 b/deblob-2.6.27 index 31fb4bd77ee..74777c96a44 100755 --- a/deblob-2.6.27 +++ b/deblob-2.6.27 @@ -112,7 +112,7 @@ function clean_fw { echo $2 exists, something is wrong >&2 exit 1 fi - clean_blob $1 + clean_blob $1 -s 4 dummy_blob $2 } @@ -210,9 +210,6 @@ clean_fw firmware/atmsar11.HEX firmware/atmsar11.fw clean_kconfig drivers/atm/Kconfig 'ATM_FORE.*' clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile -clean_file drivers/atm/pca200e.data -clean_file drivers/atm/pca200e_ecd.data -clean_file drivers/atm/sba200e_ecd.data clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR' clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile @@ -230,17 +227,17 @@ clean_mk CONFIG_COMPUTONE drivers/char/Makefile # gpu drm # DRM_MGA - Matrox g200/g400 -clean_blob drivers/gpu/drm/mga_ucode.h +clean_blob drivers/gpu/drm/mga/mga_ucode.h clean_kconfig drivers/gpu/drm/Kconfig 'DRM_MGA' clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile # DRM_R128 - ATI Rage 128 -clean_blob drivers/gpu/drm/r128_cce.c +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 -clean_blob drivers/gpu/drm/radeon_microcode.h +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 @@ -393,7 +390,7 @@ 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 +clean_blob drivers/net/tehuti_fw.h -s 4 clean_kconfig drivers/net/Kconfig 'TEHUTI' clean_mk CONFIG_TEHUTI drivers/net/Makefile @@ -513,16 +510,16 @@ clean_mk CONFIG_QETH drivers/s390/net/Makefile ##################### # SH_AP325RXA - Renesas AP-325RXA board -clean_blob arch/sh/boards/renesas/ap325rxa/setup.c -clean_kconfig arch/sh/Kconfig 'SH_AP325RXA' -clean_mk CONFIG_SH_AP325RXA arch/sh/boards/renesas/Makefile +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/renesas/migor/lcd_qvga.c -s 16 -clean_blob arch/sh/boards/renesas/migor/setup.c -clean_kconfig arch/sh/boards/renesas/Kconfig 'SH_MIGOR' -clean_kconfig arch/sh/boards/renesas/migor/Kconfig 'SH_MIGOR_QVGA' -clean_mk CONFIG_MIGOR_QVGA arch/sh/boards/renesas/Makefile +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 ######################## diff --git a/deblob-check b/deblob-check index 033294547c0..b5435a92a1e 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,6 @@ #! /bin/sh -# deblob-check version 2008-09-07 +# deblob-check version 2008-10-09 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -534,6 +534,16 @@ set_except () { 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 ;; + + /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 + ;; + */*linux*.tar* | */*kernel*.tar* | */*linux-*.*.*/*) # false alarms, contain source # drivers/net/wan/wanxlfw.inc_shipped -> wanxlfw.S @@ -660,6 +670,70 @@ set_except () { initnc 'static const struct ath5k_ini_mode rf24\(13\|25\)_ini_mode_end\[\] =' drivers/net/wireless/ath5k/initvals.c initnc 'static const u16 wm9713_reg\[\] =' sound/soc/codecs/wm9713.c + # new in 2.6.27 + accept ' \.section __ex_table,"a"'"$sepx$blobpat*" 'arch/x86/lib/copy_user_\(nocache_\)\?64.S' + initnc 'static struct cipher_testvec des3_ede_cbc_\(enc\|dec\)_tv_template\[\] =' crypto/tcrypt.h + accept 'desc_config1:[\n] \.byte 0x09, 0x02'"$sepx$blobpat*" 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).S' + accept 'string_mfg:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_mfg_end:' 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).S' + accept 'string_product:[\n]\?\(;\? \.byte[^\n]*[\n]\)\+string_product_end:' 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).S' + accept ':03000000020200F9[\n]:040023000205\(9B0037\|5F0073\)[\n]\(:050030000000000000CB[\n]\|:0400430002010000B6[\n]\)*'"$sepx$blobpat*"'[\n]:\(0E06E0006400670065007400060334003700F4\|0606A000060334003700E0\)[\n]:00000001FF' 'firmware/keyspan_pda/\(keyspan_pda\|xircom_pgs\).HEX' + accept ':100000000C004000000000000000000000000000A4[\n]'"$sepx$blobpat*"'[\n]\/\* DSP56001 bootstrap code \*\/' firmware/dsp56k/bootstrap.bin.ihex + initnc 'static const u16 uda1380_reg\[UDA1380_CACHEREGNUM\] =' sound/soc/codecs/uda1380.c + initnc 'static const u16 wm8510_reg\[WM8510_CACHEREGNUM\] =' sound/soc/codecs/wm8510.c + initnc 'static const unsigned short atkbd_set[23]_keycode\[512\] =' drivers/input/keyboard/atkbd.c + initnc 'static const unsigned short atkbd_unxlate_table\[128\] =' drivers/input/keyboard/atkbd.c + initnc 'static const unsigned char usb_kbd_keycode\[256\] =' drivers/hid/usbhid/usbkbd.c + initnc ' u8 buf, bufs\[\] =' drivers/media/dvb/dvb-usb/cxusb.c + initnc 'static struct dvb_pll_desc [^\n]* =' drivers/media/dvb/frontends/dvb-pll.c + initnc ' static int sysdiv_to_div_x_2\[\] =' arch/powerpc/platforms/512x/clock.c + 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 + initnc 'static const unsigned char quant\[\]\[0x88\] =' drivers/media/video/gspca/jpeg.h + initnc 'static unsigned char huffman\[\] =' drivers/media/video/gspca/jpeg.h + initc ' \?static const struct ov_i2c_regvals norm_76[1247]0\[\] =' drivers/media/video/gspca/ov519.c + initnc 'static const __u8 pac207_sensor_init\[\]\[8\] =' drivers/media/video/gspca/pac207.c + initnc 'static const __u8 pac7311_jpeg_header\[\] =' drivers/media/video/gspca/pac7311.c + initnc 'static const __u8 \(start\|page[34]\)_73\(02\|11\)\[\] =' drivers/media/video/gspca/pac7311.c + initnc 'static const __u8 init\(Hv7131\|Ov\(6650\|7630\(_3\)\?\)\|Pas\(106\|202\)\|Tas51[13]0\)\[\] =' drivers/media/video/gspca/sonixb.c + initnc 'static const __u8 \(hv7131\|ov\(6650\|7630\(_3\)\?\)\|pas\(106\|202\)\|tas51[13]0\)_sensor_init\(_com\)\?\[\]\[8\] =' drivers/media/video/gspca/sonixb.c + defsnc 'static \(const \)\?__u8 \(hv7131r\|mi0360\|mo4000\|ov76\([36]0\|48\)\|om6802\)_sensor_init\[\]\[8\] =' drivers/media/video/gspca/sonixj.c + initnc 'static const __u8 qtable4\[\] =' drivers/media/video/gspca/sonixj.c + initnc 'static const __u16 \(spca500_visual\|Clicksmart510\)_defaults\[\]\[3\] =' drivers/media/video/gspca/spca500.c + initnc 'static const __u8 qtable_\(creative_pccam\|kodak_ez200\|pocketdv\)\[2\]\[64\] =' drivers/media/video/gspca/spca500.c + initnc 'static const __u16 spca501c\?_\(\(3com\|arowana\|mysterious\)_\)\?\(init\|open\)_data\[\]\[3\] =' drivers/media/video/gspca/spca501.c + initnc 'static const __u16 spca505b\?_\(init\|open\)_data\(_ccd\)\?\[\]\[3\] =' drivers/media/video/gspca/spca505.c + initnc 'static const __u16 spca508\(cs110\|_sightcam2\?\|_vista\)\?_init_data\[\]\[3\] =' drivers/media/video/gspca/spca508.c + initnc 'static const __u16 spca561_init_data\[\]\[2\] =' drivers/media/video/gspca/spca561.c + initnc 'static const __u16 spca504\(_pccam600\|A_clicksmart420\)_\(init\|open\)_data\[\]\[3\] =' drivers/media/video/gspca/sunplus.c + initnc 'static const __u8 qtable_\(creative_pccam\|spca504_default\)\[2\]\[64\] =' drivers/media/video/gspca/sunplus.c + initnc 'static const __u8 \(effects\|gamma\)_table\[MAX_[A-Z]*\]\[[0-9]*\] =' drivers/media/video/gspca/t631.c + initnc 'static const __u8 tas5130a_sensor_init\[\]\[8\] =' drivers/media/video/gspca/t613.c + initnc ' static const __u8 \(read_indexs\|n\(set\)\?[0-9]*\|missing\)\[[0-9x]*\] =' drivers/media/video/gspca/t613.c + initc 'static const __u8 \(mi13[12]0\|po3130\|hv7131r\|ov76[67]0\)_\(\(soc\)\?initQ\?VGA_\(JPG\|data\)\|rundata\)\[\]\[4\] =' drivers/media/video/gspca/vc032x.c + initnc 'static const struct usb_action \(cs2102\|hdcs2020xx\|icm105axx\|ov7630c\|pb0330[3x]x\)_Initial\(Scale\)\?\[\] =' drivers/media/video/gspca/zc3xx.c + initnc 'static const u8 rtl8225z2_agc\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_ofdm\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_tx_power_cck\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const u8 rtl8225z2_tx_power_cck_ch14\[\] =' drivers/net/wireless/rtl8187_rtl8225.c + initnc 'static const __u16 t10_dif_crc_table\[256\] =' lib/crc-t10dif.c + initnc 'static crb_128M_2M_block_map_t crb_128M_2M_map\[64\] =' drivers/net/netxen/netxen_hw.c + initnc 'static const __u16 crc10_table\[256\] =' drivers/usb/serial/safe_serial.c + accept '[ ]*\( *0\)*\( *1\)*[\n][ ]*0 1 2 3 4 5 6 7 8 9 0 1 *2 3 4 5 6 7' 'Documentation/bt8xxgpio.txt' + initnc ' static int exp_lut\[256\] =' drivers/isdn/mISDN/dsp_audio.c + initnc 'static const u32 bf_pbox\[16 \+ 2\] =' drivers/isdn/mISDN/dsp_blowfish.c + initnc 'static const u32 bf_sbox\[256 \* 4\] =' drivers/isdn/mISDN/dsp_blowfish.c + initnc 'static u8 sample_\(german_\(all\|old\)\|american_\(dialtone\|ringing\|busy\)\|special[123]\|silence\)\[\] =' drivers/isdn/mISDN/dsp_tones.c + initnc 'struct pattern {[^}]*int tone;[^}]*} pattern\[\] =' drivers/isdn/mISDN/dsp_tones.c + initnc 'static u8 \([au]\|_4\)law_to_\([ua]law\|4bit\)\[256\] =' drivers/isdn/mISDN/l1oip_codec.c + initnc 'static unsigned char banner_table\[\] =' arch/sh/boards/mach-microdev/led.c + initnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const \(yytype_u\?int\(8\|16\)\|\(unsigned \)\?\(short\( int\)\?\|char\)\) yy[^[]*\[\] =[*][/];' scripts/genksyms/parse.c_shipped + accept 'irq_prio_\([hdl]\|l[cd]\):'"$sepx$blobpat*" arch/arm/inlcude/asm/hardware/entry-macro-iomd.S + defsnc ' static const int desc_idx_table\[\] =' arch/arm/include/asm/hardware/iop3xx-adma.h + defsnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const __u8 \(hv7131r\|mi0360\|mo4000\|ov76\(60\|48\)\)_sensor_init\[\]\[8\] = {[*][/];' drivers/media/video/gspca/sonixj.c + defsnc 'static const struct ath_hal ar5416hal =' drivers/net/wireless/ath9k/hw.c + defsnc 'static \(const \)\?u32 ar\(5416\|9280\)\(Modes\(_fast_clock\)\?\|Common\|BB_RfGain\|Bank6\(TPC\)\?\|Addac\)\(_91[06]0\(1_1\)\?\|_9280\(_2\)\?\)\?\[\]\[[236]\] =' drivers/net/wireless/ath9k/initvals.h + # This looks suspicious, but it pretty much just sets stuff to zero. initnc 'static __u8 mode8420\(pro\|con\)\[\] =' drivers/media/video/cs8420.h @@ -1089,6 +1163,7 @@ set_except () { initnc '} sil_port\[\] =' initnc '} vsb_snr_tab\[\] =' initnc '} yss225_registers\[\] __devinitdata =' + ;; */patch*2.6.27-rc* | */patch*2.6.26-git* | */git-linus.diff) @@ -1101,16 +1176,15 @@ set_except () { accept ':100000000C004000000000000000000000000000A4[\n]'"$sepx$blobpat*"'[\n]\/\* DSP56001 bootstrap code \*\/' firmware/dsp56k/bootstrap.bin.ihex initnc 'static const u16 uda1380_reg\[UDA1380_CACHEREGNUM\] =' sound/soc/codecs/uda1380.c initnc 'static const u16 wm8510_reg\[WM8510_CACHEREGNUM\] =' sound/soc/codecs/wm8510.c - initnc 'static const unsigned short atkbd_set[23]_keycode\[512\] =' drivers/input/keyboard/atkbd.c initnc 'static const unsigned short atkbd_unxlate_table\[128\] =' drivers/input/keyboard/atkbd.c initnc 'static const unsigned char usb_kbd_keycode\[256\] =' drivers/hid/usbhid/usbkbd.c initnc ' u8 buf, bufs\[\] =' drivers/media/dvb/dvb-usb/cxusb.c initnc 'static struct dvb_pll_desc [^\n]* =' drivers/media/dvb/frontends/dvb-pll.c initnc ' static int sysdiv_to_div_x_2\[\] =' arch/powerpc/platforms/512x/clock.c - initnc 'static const __u8 cx_inits_\(176\|320\|352\|640\)\[\] =' drivers/media/video/gspca/conex.c - initnc 'static const __u8 cx_jpeg_init\[\]\[8\] =' drivers/media/video/gspca/conex.c - initnc 'static const __u8 cxjpeg_\(640\|352\|320\|176\|qtable\)\[\]\[8\] =' drivers/media/video/gspca/conex.c + 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 initnc 'static const unsigned char quant\[\]\[0x88\] =' drivers/media/video/gspca/jpeg.h initnc 'static unsigned char huffman\[\] =' drivers/media/video/gspca/jpeg.h initc ' \?static const struct ov_i2c_regvals norm_76[1247]0\[\] =' drivers/media/video/gspca/ov519.c @@ -1135,7 +1209,6 @@ set_except () { initc 'static const __u8 \(mi13[12]0\|po3130\|hv7131r\|ov76[67]0\)_\(\(soc\)\?initQ\?VGA_\(JPG\|data\)\|rundata\)\[\]\[4\] =' drivers/media/video/gspca/vc032x.c initnc 'static const struct usb_action \(cs2102\|hdcs2020xx\|icm105axx\|ov7630c\|pb0330[3x]x\)_Initial\(Scale\)\?\[\] =' drivers/media/video/gspca/zc3xx.c initnc 'static const u8 rtl8225z2_agc\[\] =' drivers/net/wireless/rtl8187_rtl8225.c - initnc 'static const u8 rtl8225z2_agc\[\] =' drivers/net/wireless/rtl8187_rtl8225.c initnc 'static const u8 rtl8225z2_ofdm\[\] =' drivers/net/wireless/rtl8187_rtl8225.c initnc 'static const u8 rtl8225z2_tx_power_cck\[\] =' drivers/net/wireless/rtl8187_rtl8225.c initnc 'static const u8 rtl8225z2_tx_power_cck_ch14\[\] =' drivers/net/wireless/rtl8187_rtl8225.c @@ -1156,7 +1229,6 @@ set_except () { defsnc ';[/][*]@@ -[0-9]*,[0-9]* +[0-9]*,[0-9]* @@ static const __u8 \(hv7131r\|mi0360\|mo4000\|ov76\(60\|48\)\)_sensor_init\[\]\[8\] = {[*][/];' drivers/media/video/gspca/sonixj.c defsnc 'static const struct ath_hal ar5416hal =' drivers/net/wireless/ath9k/hw.c defsnc 'static \(const \)\?u32 ar\(5416\|9280\)\(Modes\(_fast_clock\)\?\|Common\|BB_RfGain\|Bank6\(TPC\)\?\|Addac\)\(_91[06]0\(1_1\)\?\|_9280\(_2\)\?\)\?\[\]\[[236]\] =' drivers/net/wireless/ath9k/initvals.h - ;; */drm-modesetting-radeon.patch) -- 2.31.1