From c4321796818ef79f6c8a7ec455f5d45135f7cebd Mon Sep 17 00:00:00 2001 From: lxoliva Date: Tue, 25 Jul 2023 06:58:58 +0000 Subject: [PATCH] More GNU Linux-libre scripts updates needed for 6.4.6-gnu Also for 6.1.41-gnu, 5.15.122-gnu, 5.10.187-gnu1, 5.4.250-gnu1, and 4.19.289-gnu1. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@19348 559672b5-ba27-0410-b829-e8f1faed8b1b --- deblob-4.19 | 5 ++++- deblob-5.10 | 9 ++++++--- deblob-5.15 | 3 +++ deblob-5.4 | 9 ++++++--- deblob-6.1 | 3 +++ deblob-6.4 | 3 +++ 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/deblob-4.19 b/deblob-4.19 index 91178d0944f..eb87379c2bf 100755 --- a/deblob-4.19 +++ b/deblob-4.19 @@ -632,6 +632,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 @@ -3069,7 +3072,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 diff --git a/deblob-5.10 b/deblob-5.10 index fae6e5bb25d..8a9cc2c57e9 100755 --- 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 diff --git a/deblob-5.15 b/deblob-5.15 index fca1c708dfa..6ff362cf2cb 100755 --- a/deblob-5.15 +++ b/deblob-5.15 @@ -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 diff --git a/deblob-5.4 b/deblob-5.4 index 0dafdd22daa..5131fa9173b 100755 --- a/deblob-5.4 +++ b/deblob-5.4 @@ -602,6 +602,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 @@ -3140,7 +3143,7 @@ clean_blob arch/arm/boot/dts/am4372.dtsi 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 @@ -3151,7 +3154,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 @@ -3161,7 +3164,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 diff --git a/deblob-6.1 b/deblob-6.1 index 244eac3a4bb..39348e11069 100755 --- a/deblob-6.1 +++ b/deblob-6.1 @@ -645,6 +645,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 diff --git a/deblob-6.4 b/deblob-6.4 index 812f3d5dfc6..04db4e276f3 100755 --- a/deblob-6.4 +++ b/deblob-6.4 @@ -643,6 +643,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 -- 2.31.1