X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-5.15;h=4d406ed7ecb3a1a34c5c41b53c8d28e05442b470;hb=3b9fa79f4519e40ce90e470290336bb9b82b1857;hp=a398ea0166e9f1ec2020c0a5d6ca3d9f38a6e2ff;hpb=c8ae3dbc32bdd7ed378c37ffb94a9fb823894ecf;p=releases.git diff --git a/deblob-5.15 b/deblob-5.15 index a398ea0166e9..4d406ed7ecb3 100755 --- a/deblob-5.15 +++ b/deblob-5.15 @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2008-2021 Alexandre Oliva +# Copyright (C) 2008-2022 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # @@ -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/{ @@ -1846,9 +1850,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 @@ -2514,6 +2516,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 @@ -2867,6 +2873,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 @@ -3199,7 +3208,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 @@ -3357,7 +3366,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 @@ -3368,7 +3377,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 @@ -3378,7 +3387,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