From: Alexandre Oliva <lxoliva@fsfla.org>
Date: Wed, 23 Mar 2022 21:55:28 +0000 (-0400)
Subject: GNU Linux-libre 5.16.17-gnu scripts
X-Git-Tag: scripts/v5.16.17-gnu^0
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fscripts%2F5.16;p=releases.git

GNU Linux-libre 5.16.17-gnu scripts
---

diff --git a/deblob-5.16 b/deblob-5.16
index 602a3152983..c61d5d41920 100755
--- a/deblob-5.16
+++ b/deblob-5.16
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-#    Copyright (C) 2008-2021 Alexandre Oliva <lxoliva@fsfla.org>
+#    Copyright (C) 2008-2022 Alexandre Oliva <lxoliva@fsfla.org>
 #    Copyright (C) 2008 Jeff Moe
 #    Copyright (C) 2009 Rubén Rodríguez <ruben@gnu.org>
 #
@@ -1780,7 +1780,10 @@ 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 '
+if grep -q loaded_fw_major drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c; then
+  clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+else
+  clean_sed '
 /^int bnx2x_compare_fw_ver/,/^}$/{
   /^		u32 my_fw = /i\
 		/*(DEBLOBBED)*/
@@ -1791,6 +1794,7 @@ clean_sed '
 		u32 my_fw = ~loaded_fw;
   }
 }' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test'
+fi
 clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
 clean_sed '
 /static void bnx2x_init_wr_wb/{
@@ -2871,6 +2875,9 @@ 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
+if grep -q MODULE_FIRMWARE drivers/net/phy/mscc/mscc_main.c; then
+  clean_blob drivers/net/phy/mscc/mscc_main.c
+fi
 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 d6112eb1431..b4330872dbf 100755
--- a/deblob-check
+++ b/deblob-check
@@ -4,6 +4,7 @@
 #        modified with 2022-01-27 r18550
 #        modified with 2022-01-29 r18573
 #        modified with 2022-02-23 r18607
+#        modified with 2022-03-20 r18637
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -6416,6 +6417,9 @@ set_except () {
     # New in 5.16.11, 5.15.25, 5.10.102.
     blobname 'gsl1680-rwc-nanote-p8\.fw' drivers/platform/x86/touchscreen_dmi.c
 
+    # New in 5.16.17, 5.15.31, 5.10.108.
+    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)