From a05cce698f8523f54cc8bafe02a64f4de00f1b23 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 10 Dec 2020 17:20:05 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/alsa-sof-firmware.git#38c4e4561fb5b34d395b448298bdc30796347231
---
 .gitignore             |  1 +
 alsa-sof-firmware.spec | 33 +++++++++++++++++++--------------
 sources                |  2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c87519..311c6e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /sof-bin-e6d11bf.tar.gz
 /sof-bin-47b436a.tar.gz
 /sof-bin-da8cb04.tar.gz
+/sof-bin-faa5bdc.tar.gz
diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec
index 4fa6378..23ff1e3 100644
--- a/alsa-sof-firmware.spec
+++ b/alsa-sof-firmware.spec
@@ -5,13 +5,13 @@
 
 
 %global sof_version 1.6
-%global sof_commit da8cb04cbd2f6031a2465794282f103ec83f15fe
+%global sof_commit faa5bdc276651f3f8b7c77612fff770bd778987b
 %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7})
 
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
 Version:        %{sof_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 # See later in the spec for a breakdown of licensing
 License:        BSD
 URL:            https://github.com/thesofproject/sof-bin
@@ -38,37 +38,39 @@ This package contains the debug files for the Sound Open Firmware project.
 cd lib/firmware
 
 # we have the version in the package name
-mv intel/sof/%{sof_version}/* intel/sof
-rmdir intel/sof/%{sof_version}
+mv intel/sof/v%{sof_version}/* intel/sof
+rmdir intel/sof/v%{sof_version}
 
 # rename intel signed firmware files
-for platform in apl cnl icl tgl; do
-  mv intel/sof/intel-signed/sof-$platform-%{sof_version}.ri intel/sof/intel-signed/sof-$platform.ri
+for platform in apl cnl ehl icl tgl; do
+  mv intel/sof/intel-signed/sof-$platform-v%{sof_version}.ri intel/sof/intel-signed/sof-$platform.ri
   ln -sf intel-signed/sof-$platform.ri intel/sof/sof-$platform.ri
 done
 
 # rename public signed firmware files
-for platform in apl cnl icl tgl; do
-  mv intel/sof/public-signed/sof-$platform-%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri
+for platform in apl cnl icl jsl tgl; do
+  mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri
 done
 
 # rename unsigned firmware files
 for platform in bdw byt cht; do
-  mv intel/sof/sof-$platform-%{sof_version}.ri intel/sof/sof-$platform.ri
+  mv intel/sof/sof-$platform-v%{sof_version}.ri intel/sof/sof-$platform.ri
 done
 
 # rename debug files
-for platform in apl bdw byt cht cnl icl tgl; do
-  mv intel/sof/sof-$platform-%{sof_version}.ldc intel/sof/sof-$platform.ldc
+for platform in apl bdw byt cht cnl ehl icl jsl tgl; do
+  mv intel/sof/sof-$platform-v%{sof_version}.ldc intel/sof/sof-$platform.ldc
 done
 
-# add missing symlink
+# add missing symlinks
+ln -s public-signed/sof-jsl.ri intel/sof/sof-jsl.ri
+ln -s intel-signed/sof-apl.ri intel/sof/sof-glk.ri
 ln -s intel-signed/sof-cnl.ri intel/sof/sof-cml.ri
 ln -s intel-signed/sof-cnl.ri intel/sof/sof-cfl.ri
 
 # move topology files
 rm -f intel/sof-tplg
-mv intel/sof-tplg-%{sof_version} intel/sof-tplg
+mv intel/sof-tplg-v%{sof_version} intel/sof-tplg
 
 # remove NXP firmware files
 rm -rf nxp ../../LICENCE.NXP
@@ -115,7 +117,10 @@ if st and st.type == "link" then
 end
 
 %changelog
-* Wed Oct 14 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-3
+* Thu Dec 10 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-4
+- Update to v1.6 (Dec 9)
+
+* Thu Nov 19 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-3
 - Update to v1.6 (Nov 19)
 
 * Wed Oct 14 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-1
diff --git a/sources b/sources
index e20e77b..89eea20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sof-bin-da8cb04.tar.gz) = a20c25b293903a7ab9581545e584500c9c09133bd9c71c233fa4ccae3a5678357af185953d592a634c5254590855df1ce1ed280413b19cdaa5364715281020bb
+SHA512 (sof-bin-faa5bdc.tar.gz) = 0e1bd526b3fd1c85d10b6612da25f044a62eeb2025dc4ac19ed2c7a2cffecdab50ce65ec714cf8ce2bb2eb2efe128495f9a13a48264593c15649f76b4b026359