From 15b7587d7184db0bce6e131f8ecc2f87f1697f0f Mon Sep 17 00:00:00 2001 From: lxoliva Date: Mon, 21 Mar 2022 10:21:11 +0000 Subject: [PATCH] Preparing GNU Linux-libre 5.17-gnu git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@18637 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-5.17 | 13 ++----------- deblob-check | 5 ++++- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/deblob-5.17 b/deblob-5.17 index 224d5700c3e..6ddc42b5647 100755 --- a/deblob-5.17 +++ b/deblob-5.17 @@ -1781,17 +1781,7 @@ clean_sed ' -EINVAL) }' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 'report missing Free firmware' clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c -clean_sed ' -/^int bnx2x_compare_fw_ver/,/^}$/{ - /^ u32 my_fw = /i\ - /*(DEBLOBBED)*/ - /^ u32 my_fw = /,/<< 24);/d; - /^ u32 loaded_fw = /,/^$/{ - /^$/i\ -\ - u32 my_fw = ~loaded_fw; - } -}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test' +clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h clean_sed ' /static void bnx2x_init_wr_wb/{ @@ -2879,6 +2869,7 @@ clean_mk CONFIG_NET_DSA_LANTIQ_GSWIP drivers/net/dsa/Makefile announce MICROSEMI_PHY - "Microsemi PHYs" reject_firmware drivers/net/phy/mscc/mscc_main.c +clean_blob drivers/net/phy/mscc/mscc_main.c clean_blob drivers/net/phy/mscc/mscc.h clean_kconfig drivers/net/phy/Kconfig MICROSEMI_PHY clean_mk CONFIG_MICROSEMI_PHY drivers/net/phy/mscc/Makefile diff --git a/deblob-check b/deblob-check index ce8ef4f6796..e269145b2c2 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,6 @@ #! /bin/sh -# deblob-check version 2022-03-11 r18628 +# deblob-check version 2022-03-20 r18637 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -6458,6 +6458,9 @@ set_except () { blobname 'qcom[/]sm8350[/]microsoft[/]\(adsp\|cdsp\|modem\|slpi\)\.mbn' arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts blobname 'qcom[/]\(adsp\|cdsp\|ipa_fws\|modem\|slpi\)\.mbn' arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi + # New in 5.17. + blobna 'if[ ][(]loaded_fw_\(major\|minor\|eng\|rev\)[ ]\(!=\|<\)[ ]BCM_5710_FW_\(MAJOR\|MINOR\|ENGINEERING\|REVISION\)_VERSION\(_V15\)\?\([ ][|][|][\n][\t ]*loaded_fw_\(major\|minor\|eng\|rev\)[ ]\(!=\|<\)[ ]BCM_5710_FW_\(MAJOR\|MINOR\|ENGINEERING\|REVISION\)_VERSION\(_V15\)\?\)*[)]' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c + ;; */*freedo*.patch | */*logo*.patch) -- 2.31.1