projects / releases.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
adjust further for GNU Linux-libre 6.7.11-gnu
[releases.git] / deblob-5.15
diff --git a/deblob-5.15 b/deblob-5.15
index 190303eb5d76439e6552e15ceeb5828849bf81f1..6ff362cf2cb6e7100a44a46f64573fbce19f4311 100755 (executable)
--- a/deblob-5.15
+++ b/deblob-5.15
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-#    Copyright (C) 2008-2022 Alexandre Oliva <lxoliva@fsfla.org>
+#    Copyright (C) 2008-2023 Alexandre Oliva <lxoliva@fsfla.org>
 #    Copyright (C) 2008 Jeff Moe
 #    Copyright (C) 2009 Rubén Rodríguez <ruben@gnu.org>
 #
@@ -646,6 +646,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
 
@@ -1850,9 +1853,7 @@ clean_kconfig drivers/net/ethernet/cavium/Kconfig LIQUIDIO
 clean_mk CONFIG_LIQUIDIO drivers/net/ethernet/cavium/liquidio/Makefile
 
 announce MLXSW_SPECTRUM - "Mellanox Technologies Spectrum support"
-reject_firmware drivers/net/ethernet/mellanox/mlxsw/core.c '
-/request_firmware_direct.*[ ]params->file_name/{p;d;};
-'
+reject_firmware drivers/net/ethernet/mellanox/mlxsw/core.c
 clean_blob drivers/net/ethernet/mellanox/mlxsw/spectrum.c
 clean_kconfig drivers/net/ethernet/mellanox/mlxsw/Kconfig MLXSW_SPECTRUM
 clean_mk CONFIG_MLXSW_SPECTRUM drivers/net/ethernet/mellanox/mlxsw/Makefile
@@ -2518,6 +2519,10 @@ announce R8188EU - "Realtek RTL8188EU Wireless LAN NIC driver"
 reject_firmware drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
 clean_blob drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
 clean_blob drivers/staging/r8188eu/include/rtl8188e_hal.h
+# Added in 5.15.66.
+if grep -q MODULE_FIRMWARE drivers/staging/r8188eu/os_dep/os_intfs.c; then
+  clean_blob drivers/staging/r8188eu/os_dep/os_intfs.c
+fi
 clean_kconfig drivers/staging/r8188eu/Kconfig R8188EU
 clean_mk CONFIG_R8188EU drivers/staging/r8188eu/Makefile
 
@@ -3364,7 +3369,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
@@ -3375,7 +3380,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
@@ -3385,7 +3390,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_blob Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt
 clean_blob Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt
@@ -3823,14 +3828,26 @@ clean_kconfig drivers/i2c/Kconfig I2C_SLAVE_EEPROM
 clean_mk CONFIG_I2C_SLAVE_EEPROM drivers/i2c/Makefile
 
 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
 
 announce MHI_BUS_PCI_GENERIC - "MHI PCI controller driver"
-clean_blob drivers/bus/mhi/pci_generic.c
-clean_kconfig drivers/bus/mhi/Kconfig MHI_BUS_PCI_GENERIC
-clean_mk CONFIG_MHI_BUS_PCI_GENERIC drivers/bus/mhi/Makefile
+if test -f drivers/bus/mhi/host/pci_generic.c; then
+  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
+else
+  clean_blob drivers/bus/mhi/pci_generic.c
+  clean_kconfig drivers/bus/mhi/Kconfig MHI_BUS_PCI_GENERIC
+  clean_mk CONFIG_MHI_BUS_PCI_GENERIC drivers/bus/mhi/Makefile
+fi
 
 # Greybus
 
@@ -3871,6 +3888,9 @@ clean_blob arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
 clean_blob arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
 clean_blob arch/arm64/boot/dts/qcom/sm8350-hdk.dts
 clean_blob arch/arm64/boot/dts/qcom/sm8350-mtp.dts
+if grep -q '/apq8016/' arch/arm64/boot/dts/qcom/apq8016-sbc.dts; then
+  clean_blob arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+fi
 clean_kconfig arch/arm/mach-qcom/Kconfig ARCH_QCOM
 clean_mk CONFIG_ARCH_QCOM arch/arm64/boot/dts/qcom/Makefile
 
Source code of Linux-libre