From f1fd4cdd581aac2684689a8351e6509d6125b295 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 12 2020 06:09:09 +0000
Subject: import alsa-sof-firmware-1.6-2.el8


---

diff --git a/.alsa-sof-firmware.metadata b/.alsa-sof-firmware.metadata
index 896a7f0..291dc93 100644
--- a/.alsa-sof-firmware.metadata
+++ b/.alsa-sof-firmware.metadata
@@ -1 +1 @@
-2e1ed5118664ba1efd77cfb94284f96385c30f82 SOURCES/sof-bin-47b436a.tar.gz
+2c6cf16df43a414e464b6865e1c8ebd2a9313a8c SOURCES/sof-bin-faa5bdc.tar.gz
diff --git a/.gitignore b/.gitignore
index e126e73..f452162 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/sof-bin-47b436a.tar.gz
+SOURCES/sof-bin-faa5bdc.tar.gz
diff --git a/SPECS/alsa-sof-firmware.spec b/SPECS/alsa-sof-firmware.spec
index 973b7b5..5a9bfe7 100644
--- a/SPECS/alsa-sof-firmware.spec
+++ b/SPECS/alsa-sof-firmware.spec
@@ -5,18 +5,17 @@
 
 
 %global sof_version 1.6
-%global sof_commit 47b436af36c18c3b4f409e1d9452aea18e17abc8
+%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:        1%{?dist}
+Release:        2%{?dist}
 # See later in the spec for a breakdown of licensing
 License:        BSD
 URL:            https://github.com/thesofproject/sof-bin
 Source:         https://github.com/thesofproject/sof-bin/archive/%{sof_commit}/sof-bin-%{sof_shortcommit}.tar.gz
-Conflicts:      alsa-firmware <= 1.2.1-5
 
 # noarch, since the package is firmware
 BuildArch:      noarch
@@ -42,13 +41,13 @@ 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
+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
+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
 
@@ -58,11 +57,13 @@ for platform in bdw byt cht; do
 done
 
 # rename debug files
-for platform in apl bdw byt cht cnl icl; do
+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
 
@@ -108,6 +109,9 @@ cat alsa-sof-firmware.files
 %files debug -f alsa-sof-firmware.debug-files
 
 %changelog
+* Thu Dec 10 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-2
+- Update to v1.6 (Dec 9)
+
 * Wed Nov 11 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-1
 - Update to v1.6 (Oct 13)