From 627c5531b08e0b5786c1620a80fea76893317833 Mon Sep 17 00:00:00 2001 From: Freedo Date: Wed, 17 May 2023 23:06:07 +0000 Subject: [PATCH] GNU Linux-libre 5.15.112-gnu scripts --- deblob-5.15 | 24 ++++++++++++++++++------ deblob-check | 4 ++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/deblob-5.15 b/deblob-5.15 index 4d406ed7ecb..b630c57ea70 100755 --- a/deblob-5.15 +++ b/deblob-5.15 @@ -3825,14 +3825,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 diff --git a/deblob-check b/deblob-check index af3ef6c9830..ab9fedf4d67 100755 --- a/deblob-check +++ b/deblob-check @@ -19,6 +19,7 @@ # modified with 2022-11-27 r18997 (partial) # modified with 2023-02-01 r19031 # modified with 2023-03-17 r19120 +# modified with 2023-05-17 r19267 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -6389,6 +6390,9 @@ set_except () { # New in 6.2.7, 6.1.20, 5.15.103, 5.10.175, 5.4.237, 4.19.278, 4.14.310. accept '[\t][ ][*][ ]updated[ ]microcode[ ]at[ ]the[ ]time' arch/x86/kernel/cpu/amd.c + # New in 6.3.3, 6.2.16, 5.15.112, 5.10.180, 5.4.243, 4.19.283. + blobname 'gsl1680-dexp-ursus-kx210i\.fw' drivers/platform/x86/touchscreen_dmi.c + ;; */*freedo*.patch | */*logo*.patch) -- 2.31.1