From 80de4d8a41a87af42dd71cb2e8456340f1113bd2 Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Fri, 1 Sep 2023 08:52:24 +0200 Subject: [PATCH 1/3] check_whence: Recognize RawFile keyword WHENCE and copy_firmware.sh now support a new keyword RawFile to list files that must not be compressed. Update check_whence.py to recognize that. Signed-off-by: Juerg Haefliger Signed-off-by: Josh Boyer --- check_whence.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_whence.py b/check_whence.py index db6ac0f5..7e0a04f9 100755 --- a/check_whence.py +++ b/check_whence.py @@ -7,11 +7,11 @@ from io import open def list_whence(): with open("WHENCE", encoding="utf-8") as whence: for line in whence: - match = re.match(r'(?:File|Source):\s*"(.*)"', line) + match = re.match(r'(?:RawFile|File|Source):\s*"(.*)"', line) if match: yield match.group(1) continue - match = re.match(r"(?:File|Source):\s*(\S*)", line) + match = re.match(r"(?:RawFile|File|Source):\s*(\S*)", line) if match: yield match.group(1) continue @@ -35,7 +35,7 @@ def list_whence(): def list_whence_files(): with open("WHENCE", encoding="utf-8") as whence: for line in whence: - match = re.match(r"File:\s*(.*)", line) + match = re.match(r"(?:RawFile|File):\s*(.*)", line) if match: yield match.group(1).replace("\ ", " ").replace('"', "") continue From c6ce6ac0ac0e6eb066ddce7c17e55b786b31930f Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Fri, 1 Sep 2023 08:52:25 +0200 Subject: [PATCH 2/3] WHENCE: amd-ucode: Use new RawFile keyword Replace old File/Raw entries with a single RawFile entry now that copy-firmware and check_whence supports that. Signed-off-by: Juerg Haefliger Signed-off-by: Josh Boyer --- WHENCE | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/WHENCE b/WHENCE index 390a5689..852e88f5 100644 --- a/WHENCE +++ b/WHENCE @@ -3912,20 +3912,15 @@ License: Redistributable. See LICENSE.amd-sev for details Driver: microcode_amd - AMD CPU Microcode Update Driver for Linux -File: amd-ucode/microcode_amd.bin -Raw: amd-ucode/microcode_amd.bin +RawFile: amd-ucode/microcode_amd.bin Version: 2013-07-10 -File: amd-ucode/microcode_amd_fam15h.bin -Raw: amd-ucode/microcode_amd_fam15h.bin +RawFile: amd-ucode/microcode_amd_fam15h.bin Version: 2018-05-24 -File: amd-ucode/microcode_amd_fam16h.bin -Raw: amd-ucode/microcode_amd_fam16h.bin +RawFile: amd-ucode/microcode_amd_fam16h.bin Version: 2014-10-28 -File: amd-ucode/microcode_amd_fam17h.bin -Raw: amd-ucode/microcode_amd_fam17h.bin +RawFile: amd-ucode/microcode_amd_fam17h.bin Version: 2023-07-19 -File: amd-ucode/microcode_amd_fam19h.bin -Raw: amd-ucode/microcode_amd_fam19h.bin +RawFile: amd-ucode/microcode_amd_fam19h.bin Version: 2023-08-08 File: amd-ucode/README From e805619f932249b74494906d5b41de0e73ad6013 Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Fri, 1 Sep 2023 08:52:26 +0200 Subject: [PATCH 3/3] WHENCE: Don't compress qcom json files Don't compress qcom json files. They are loaded by the pd-mapper userspace app which doesn't know about compression. Signed-off-by: Juerg Haefliger Signed-off-by: Josh Boyer --- WHENCE | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/WHENCE b/WHENCE index 852e88f5..e057a5e4 100644 --- a/WHENCE +++ b/WHENCE @@ -5630,28 +5630,28 @@ File: qcom/apq8016/modem.mbn File: qcom/apq8016/wcnss.mbn File: qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin File: qcom/apq8096/adsp.mbn -File: qcom/apq8096/adspr.jsn -File: qcom/apq8096/adspua.jsn +RawFile: qcom/apq8096/adspr.jsn +RawFile: qcom/apq8096/adspua.jsn File: qcom/apq8096/mba.mbn File: qcom/apq8096/modem.mbn -File: qcom/apq8096/modemr.jsn +RawFile: qcom/apq8096/modemr.jsn File: qcom/sdm845/adsp.mbn -File: qcom/sdm845/adspr.jsn -File: qcom/sdm845/adspua.jsn +RawFile: qcom/sdm845/adspr.jsn +RawFile: qcom/sdm845/adspua.jsn File: qcom/sdm845/cdsp.mbn -File: qcom/sdm845/cdspr.jsn +RawFile: qcom/sdm845/cdspr.jsn File: qcom/sdm845/Thundercomm/db845c/slpi.mbn -File: qcom/sdm845/Thundercomm/db845c/slpir.jsn -File: qcom/sdm845/Thundercomm/db845c/slpius.jsn +RawFile: qcom/sdm845/Thundercomm/db845c/slpir.jsn +RawFile: qcom/sdm845/Thundercomm/db845c/slpius.jsn File: qcom/sm8250/adsp.mbn -File: qcom/sm8250/adspr.jsn -File: qcom/sm8250/adspua.jsn +RawFile: qcom/sm8250/adspr.jsn +RawFile: qcom/sm8250/adspua.jsn File: qcom/sm8250/cdsp.mbn -File: qcom/sm8250/cdspr.jsn -File: qcom/sc8280xp/LENOVO/21BX/adspr.jsn -File: qcom/sc8280xp/LENOVO/21BX/adspua.jsn -File: qcom/sc8280xp/LENOVO/21BX/battmgr.jsn -File: qcom/sc8280xp/LENOVO/21BX/cdspr.jsn +RawFile: qcom/sm8250/cdspr.jsn +RawFile: qcom/sc8280xp/LENOVO/21BX/adspr.jsn +RawFile: qcom/sc8280xp/LENOVO/21BX/adspua.jsn +RawFile: qcom/sc8280xp/LENOVO/21BX/battmgr.jsn +RawFile: qcom/sc8280xp/LENOVO/21BX/cdspr.jsn File: qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn File: qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn File: qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn @@ -5675,7 +5675,7 @@ Driver: qcom_q6v5_mss - Qualcomm modem subsystem firmware File: qcom/sdm845/mba.mbn File: qcom/sdm845/modem_nm.mbn -File: qcom/sdm845/modemuw.jsn +RawFile: qcom/sdm845/modemuw.jsn Link: qcom/sdm845/modem.mbn -> modem_nm.mbn Licence: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details