adjust further for GNU Linux-libre 6.7.11-gnu

[releases.git] / deblob-5.10

diff --git a/deblob-5.10 b/deblob-5.10
index fae6e5bb25d6c319c89a1e1bc19d714bcc7d6811..96b12776e7aa58eec39946b656ac15a72c2c91ec 100755 (executable)
--- a/deblob-5.10
+++ b/deblob-5.10
@@ -635,6 +635,9 @@ s,\(timeout = \)\(firmware_loading_timeout()\),\1is_nonfree_firmware(name) ? 1 :
 announce MICROCODE_AMD - "AMD microcode patch loading support"
 reject_firmware arch/x86/kernel/cpu/microcode/amd.c
 clean_blob arch/x86/kernel/cpu/microcode/amd.c
+if grep -q -i zenbleed.*microcode arch/x86/kernel/cpu/amd.c; then
+  clean_blob arch/x86/kernel/cpu/amd.c
+fi
 clean_kconfig arch/x86/Kconfig MICROCODE_AMD
 clean_mk CONFIG_MICROCODE_AMD arch/x86/kernel/cpu/microcode/Makefile
 
@@ -3311,7 +3314,7 @@ fi
 clean_kconfig drivers/remoteproc/Kconfig WKUP_M3_RPROC
 clean_mk CONFIG_WKUP_M3_RPROC drivers/remoteproc/Makefile
 
-announce QCOM_Q6V5_ADSP - "Qualcomm Technology Inc ADSP Peripherial Image Loader"
+announce QCOM_Q6V5_ADSP - "Qualcomm Technology Inc ADSP Peripheral Image Loader"
 clean_blob drivers/remoteproc/qcom_q6v5_adsp.c
 clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_ADSP
 clean_mk CONFIG_QCOM_Q6V5_ADSP drivers/remoteproc/Makefile
@@ -3322,7 +3325,7 @@ clean_blob drivers/remoteproc/qcom_q6v5_mss.c
 clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_MSS
 clean_mk CONFIG_QCOM_Q6V5_MSS drivers/remoteproc/Makefile
 
-announce QCOM_Q6V5_PAS - "Qualcomm Hexagon V5 Peripherial Authentication Service support"
+announce QCOM_Q6V5_PAS - "Qualcomm Hexagon V5 Peripheral Authentication Service support"
 clean_blob drivers/remoteproc/qcom_q6v5_pas.c
 clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_PAS
 clean_mk CONFIG_QCOM_Q6V5_PAS drivers/remoteproc/Makefile
@@ -3332,7 +3335,7 @@ clean_blob drivers/remoteproc/qcom_q6v5_wcss.c
 clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_WCSS
 clean_mk CONFIG_QCOM_Q6V5_WCSS drivers/remoteproc/Makefile
 
-announce QCOM_WCNSS_PIL - "Qualcomm WCNSS Peripherial Image Loader"
+announce QCOM_WCNSS_PIL - "Qualcomm WCNSS Peripheral Image Loader"
 clean_blob drivers/remoteproc/qcom_wcnss.c
 clean_kconfig drivers/remoteproc/Kconfig QCOM_WCNSS_PIL
 clean_mk CONFIG_QCOM_WCNSS_PIL drivers/remoteproc/Makefile
@@ -3764,9 +3767,22 @@ clean_mk CONFIG_I2C_SLAVE_EEPROM drivers/i2c/Makefile
 # fill in the required fw_image field of mhi_controller.  Let me know
 # if you find any uses in which the firmware is Free Software.
 announce MHI_BUS - "Modem Host Interface (MHI) bus"
-reject_firmware drivers/bus/mhi/core/boot.c
-clean_kconfig drivers/bus/mhi/Kconfig MHI_BUS
-clean_mk CONFIG_MHI_BUS drivers/bus/mhi/core/Makefile
+if test -f drivers/bus/mhi/host/boot.c; then
+  reject_firmware drivers/bus/mhi/host/boot.c
+  clean_kconfig drivers/bus/mhi/host/Kconfig MHI_BUS
+  clean_mk CONFIG_MHI_BUS drivers/bus/mhi/host/Makefile
+else  
+  reject_firmware drivers/bus/mhi/core/boot.c
+  clean_kconfig drivers/bus/mhi/Kconfig MHI_BUS
+  clean_mk CONFIG_MHI_BUS drivers/bus/mhi/core/Makefile
+fi
+
+if test -f drivers/bus/mhi/host/pci_generic.c; then
+  announce MHI_BUS_PCI_GENERIC - "MHI PCI controller driver"
+  clean_blob drivers/bus/mhi/host/pci_generic.c
+  clean_kconfig drivers/bus/mhi/host/Kconfig MHI_BUS_PCI_GENERIC
+  clean_mk CONFIG_MHI_BUS_PCI_GENERIC drivers/bus/mhi/host/Makefile
+fi
 
 # Greybus