From c47ab895ef233ef10611ba646cbb46a90e73d920 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 14 Oct 2020 16:19:31 +0200
Subject: [PATCH] Update to v1.6 (Oct 13 2020)

---
 .gitignore             |  1 +
 alsa-sof-firmware.spec | 18 +++++++++---------
 sources                |  3 +--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c7be40..c5cc832 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /sof-bin-72a04d5.tar.gz
 /sof-bin-topology-1.5-dmic-20db-fix.tar.gz
 /sof-bin-e6d11bf.tar.gz
+/sof-bin-47b436a.tar.gz
diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec
index ef94d8b..dd80117 100644
--- a/alsa-sof-firmware.spec
+++ b/alsa-sof-firmware.spec
@@ -4,8 +4,8 @@
 %global _firmwarepath  /usr/lib/firmware
 
 
-%global sof_version 1.5
-%global sof_commit e6d11bf44f0c7ad6032d201e753aa254bb075ee7
+%global sof_version 1.6
+%global sof_commit 47b436af36c18c3b4f409e1d9452aea18e17abc8
 %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7})
 
 Summary:        Firmware and topology files for Sound Open Firmware project
@@ -16,7 +16,6 @@ Release:        2%{?dist}
 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
-Source10:       https://www.alsa-project.org/files/pub/misc/sof/sof-bin-topology-1.5-dmic-20db-fix.tar.gz
 Conflicts:      alsa-firmware <= 1.2.1-6
 
 # noarch, since the package is firmware
@@ -43,13 +42,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; do
+for platform in apl cnl 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; do
+for platform in apl cnl icl tgl; do
   mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri
 done
 
@@ -72,10 +71,8 @@ rm -f intel/sof-tplg
 mv intel/sof-tplg-v%{sof_version} intel/sof-tplg
 
 # remove NXP firmware files
-rm -rf nxp
-
-# patch the topology files (DMIC equalizer fix)
-tar xvzf %{SOURCE10} -C intel/sof-tplg
+rm -rf nxp ../../LICENCE.NXP
+rm -rf intel/sof-tplg/sof-imx8*
 
 %build
 
@@ -118,6 +115,9 @@ if st and st.type == "link" then
 end
 
 %changelog
+* Wed Oct 14 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-1
+- Update to v1.6 (Oct 13)
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 3f4f401..63b02cf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (sof-bin-topology-1.5-dmic-20db-fix.tar.gz) = d933433a1327cc32f2b4c783aee7fca8d5d89f04ebb764b9e6ebb46c84b0035b54083aab50118879da16eedaf8301063be87c680eec09f4b2c4d2915735b7247
-SHA512 (sof-bin-e6d11bf.tar.gz) = 6f5ece43a6f15be4dd38b52bf2d65402a667a8c431688f815e5eabd22ff7efa273052823dba64d68096202e468c7a623bb2338d7cbcbae855cdac78af41824c2
+SHA512 (sof-bin-47b436a.tar.gz) = 447726c70344f029c246f83d8071da953e7a90b2f810ecd46a42802956173e4faabf86f65a18fbfbea570190f081cb026b688209218b9ac9b51fee94fbacc0ca