backport mscc_main change for 5.16.17, 5.15.31, 5.10.108

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

diff --git a/deblob-5.10 b/deblob-5.10
index 273246b8ac464b983dc77c965a51097e19faa736..fae6e5bb25d6c319c89a1e1bc19d714bcc7d6811 100755 (executable)
--- a/deblob-5.10
+++ b/deblob-5.10
@@ -2838,6 +2838,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-5.15 b/deblob-5.15
index f54aa68f15568d925aa1dc3df0e19358dd982ceb..190303eb5d76439e6552e15ceeb5828849bf81f1 100755 (executable)
--- a/deblob-5.15
+++ b/deblob-5.15
@@ -2871,6 +2871,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-5.16 b/deblob-5.16
index d290d0dc43e9e4fcb5b3380c8232d2bd56c498f9..c61d5d41920d36125076a7d05d033008465ac863 100755 (executable)
--- a/deblob-5.16
+++ b/deblob-5.16
@@ -2875,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