backport bnx2x_cmn change for 5.16.17, 5.15.31, 5.10.108

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@18654 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-5.10 b/deblob-5.10
index a099ab3034855f278230d5ed4c9637e47e7e6c15..273246b8ac464b983dc77c965a51097e19faa736 100755 (executable)
--- a/deblob-5.10
+++ b/deblob-5.10
@@ -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>
 #
@@ -1748,7 +1748,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)*/
@@ -1759,6 +1762,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/{
@@ -3155,7 +3159,7 @@ clean_mk CONFIG_USB_UEAGLEATM drivers/usb/atm/Makefile
 
 # host
 
-announce USB_XHCI_PCI_RENESAS - "Support for additional Renesas xHCI controller with firwmare"
+announce USB_XHCI_PCI_RENESAS - "Support for additional Renesas xHCI controller with firmware"
 if grep -q 'firmware_request_nowarn' drivers/usb/host/xhci-pci-renesas.c; then
   reject_firmware_nowarn drivers/usb/host/xhci-pci-renesas.c
 else

diff --git a/deblob-5.15 b/deblob-5.15
index a398ea0166e9f1ec2020c0a5d6ca3d9f38a6e2ff..f54aa68f15568d925aa1dc3df0e19358dd982ceb 100755 (executable)
--- a/deblob-5.15
+++ b/deblob-5.15
@@ -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>
 #
@@ -1782,7 +1782,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)*/
@@ -1793,6 +1796,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/{
@@ -3199,7 +3203,7 @@ clean_mk CONFIG_USB_UEAGLEATM drivers/usb/atm/Makefile
 
 # host
 
-announce USB_XHCI_PCI_RENESAS - "Support for additional Renesas xHCI controller with firwmare"
+announce USB_XHCI_PCI_RENESAS - "Support for additional Renesas xHCI controller with firmware"
 reject_firmware_nowarn drivers/usb/host/xhci-pci-renesas.c
 clean_kconfig drivers/usb/host/Kconfig USB_XHCI_PCI_RENESAS
 clean_mk CONFIG_USB_XHCI_PCI_RENESAS drivers/usb/host/Makefile

diff --git a/deblob-5.16 b/deblob-5.16
index 602a3152983352f46a628697a0cd364649281f57..d290d0dc43e9e4fcb5b3380c8232d2bd56c498f9 100755 (executable)
--- 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/{