Unverified Commit 9cfefbd7 authored by Thierry Reding's avatar Thierry Reding Committed by Josh Boyer
Browse files

Remove duplicate symlinks



Now that the copy-firmware.sh script can create symlinks from the Link:
entries in the WHENCE file on the fly, remove the duplicate symlinks
from the filesystem.

One odd entry was intel/dsp_fw_cnl.bin which was listed both as symlink
and as a regular file. Both entries can be removed since the it's really
a symlink, so it will be recreated at installation time.

While at it, update the check_whence.py script to not look for the
existence of symlinks in the filesystem because they are created on the
fly at installation time by the copy_firmware.sh script.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarJosh Boyer <jwboyer@kernel.org>
parent 2de7abd4
...@@ -3678,7 +3678,6 @@ File: intel/dsp_fw_cnl_v1191.bin ...@@ -3678,7 +3678,6 @@ File: intel/dsp_fw_cnl_v1191.bin
Version: 10.00.00.1191 Version: 10.00.00.1191
File: intel/dsp_fw_cnl_v1858.bin File: intel/dsp_fw_cnl_v1858.bin
Version: 10.23.00.1858 Version: 10.23.00.1858
File: intel/dsp_fw_cnl.bin
Link: intel/dsp_fw_cnl.bin -> dsp_fw_cnl_v1858.bin Link: intel/dsp_fw_cnl.bin -> dsp_fw_cnl_v1858.bin
License: Redistributable. See LICENCE.adsp_sst for details License: Redistributable. See LICENCE.adsp_sst for details
......
qcom/a300_pfp.fw
\ No newline at end of file
qcom/a300_pm4.fw
\ No newline at end of file
...@@ -5,11 +5,11 @@ import os, re, sys ...@@ -5,11 +5,11 @@ import os, re, sys
def list_whence(): def list_whence():
with open('WHENCE') as whence: with open('WHENCE') as whence:
for line in whence: for line in whence:
match = re.match(r'(?:File|Link|Source):\s*"(.*)"', line) match = re.match(r'(?:File|Source):\s*"(.*)"', line)
if match: if match:
yield match.group(1) yield match.group(1)
continue continue
match = re.match(r'(?:File|Link|Source):\s*(\S*)', line) match = re.match(r'(?:File|Source):\s*(\S*)', line)
if match: if match:
yield match.group(1) yield match.group(1)
continue continue
......
configs/t4-config-default.txt
\ No newline at end of file
t4fw-1.24.3.0.bin
\ No newline at end of file
configs/t5-config-default.txt
\ No newline at end of file
t5fw-1.24.3.0.bin
\ No newline at end of file
configs/t6-config-default.txt
\ No newline at end of file
t6fw-1.24.3.0.bin
\ No newline at end of file
dsp_fw_bxtn_v3366.bin
\ No newline at end of file
dsp_fw_cnl_v1858.bin
\ No newline at end of file
dsp_fw_glk_v3366.bin
\ No newline at end of file
dsp_fw_kbl_v3402.bin
\ No newline at end of file
dsp_fw_release_v3402.bin
\ No newline at end of file
irci_irci_ecr-master_20161208_0213_20170112_1500.bin
\ No newline at end of file
../mrvl/sd8688.bin
\ No newline at end of file
../mrvl/sd8688_helper.bin
\ No newline at end of file
nic_AMDA0058.nffw
\ No newline at end of file
nic_AMDA0058.nffw
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment