1 files changed, 29 insertions, 59 deletions
diff --git a/debian/config/intel-sound/defines b/debian/config/intel-sound/defines
index e85febd..d63fdce 100644
--- a/debian/config/intel-sound/defines
+++ b/debian/config/intel-sound/defines
@@ -1,65 +1,38 @@
 [base]
 desc: Intel sound DSPs
+longdesc: Intel SST sound DSPs supported by the snd-soc-sst-acpi or
+ snd-intel-sst-acpi driver
 files:
- intel/IntcSST2.bin
- intel/catpt/bdw/dsp_basefw.bin
- intel/avs/skl/dsp_basefw.bin
- intel/avs/skl/dsp_mod_7CAD0808-AB10-CD23-EF45-12AB34CD56EF.bin
- intel/avs/apl/dsp_basefw.bin
- intel/avs/cnl/dsp_basefw.bin
  intel/dsp_fw_bxtn.bin
- intel/dsp_fw_bxtn_v3366.bin
  intel/dsp_fw_cnl.bin
- intel/dsp_fw_cnl_v1191.bin
- intel/dsp_fw_cnl_v1858.bin
  intel/dsp_fw_glk.bin
- intel/dsp_fw_glk_v3366.bin
  intel/dsp_fw_kbl.bin
- intel/dsp_fw_kbl_v3402.bin
- intel/dsp_fw_kbl_v3420.bin
  intel/dsp_fw_release.bin
- intel/dsp_fw_release_v3402.bin
- intel/fw_sst_0f28.bin-48kHz_i2s_master
  intel/fw_sst_0f28.bin
+ intel/fw_sst_0f28.bin-48kHz_i2s_master
  intel/fw_sst_0f28_ssp0.bin
  intel/fw_sst_22a8.bin
-longdesc: Intel SST sound DSPs supported by the snd-soc-sst-acpi or
- snd-intel-sst-acpi driver
-
-[intel/dsp_fw_bxtn_v3366.bin_base]
-desc: Intel "Broxton" SST DSP firmware
-version: 9.22.01.3366_157
-
-[intel/dsp_fw_cnl_v1191.bin_base]
-desc: Intel "Cannonlake" SST DSP firmware
-version: 10.00.00.1191
-
-[intel/dsp_fw_cnl_v1858.bin_base]
-desc: Intel "Cannonlake" SST DSP firmware
-version: 10.23.00.1858
-
-[intel/dsp_fw_glk_v3366.bin_base]
-desc: Intel "Geminilake" SST DSP firmware
-version: 9.22.01.3366_157
-
-[intel/dsp_fw_kbl_v3402.bin_base]
-desc: Intel "Kabylake" SST DSP firmware
-version: 9.21.00.3402_161
+ intel/IntcSST2.bin
+ intel/avs/apl/dsp_basefw.bin
+ intel/avs/cnl/dsp_basefw.bin
+ intel/avs/skl/dsp_basefw.bin
+ intel/avs/skl/dsp_mod_7CAD0808-AB10-CD23-EF45-12AB34CD56EF.bin
+ intel/catpt/bdw/dsp_basefw.bin
 
-[intel/dsp_fw_kbl_v3420.bin_base]
-desc: Intel "Kabylake" SST DSP firmware
-version: 9.21.00.3420_163
+[intel/fw_sst_0f28.bin_base]
+desc: Intel "Bay Trail" SST DSP firmware
+version: 01.0C.00.01
 
-[intel/dsp_fw_release_v3402.bin_base]
-desc: Intel "Skylake" SST DSP firmware
-version: 9.21.00.3402_161
+[intel/fw_sst_0f28.bin-48kHz_i2s_master_base]
+desc: Intel "Bay Trail" SST DSP firmware
 
-[intel/catpt/bdw/dsp_basefw.bin_base]
-desc: Intel AudioDSP driver base firmware for HSW/BDW
+[intel/fw_sst_0f28_ssp0.bin_base]
+desc: Intel "Bay Trail" SST DSP firmware
+version: 01.0C.00.01
 
-[intel/avs/skl/dsp_basefw.bin_base]
-desc: Intel AudioDSP driver base firmware for SKL-based platforms
-version: 9.21.00.4899
+[intel/fw_sst_22a8.bin_base]
+desc: Intel "Cherry Trail"/"Braswell" SST DSP firmware
+version: 01.0B.02.02
 
 [intel/avs/apl/dsp_basefw.bin_base]
 desc: Intel AudioDSP driver base firmware for APL-based platforms
@@ -69,17 +42,14 @@ version: 9.22.01.4908
 desc: Intel AudioDSP driver base firmware for CNL-based platforms
 version: 10.23.00.8551
 
-[intel/fw_sst_0f28.bin-48kHz_i2s_master_base]
-desc: Intel "Bay Trail" SST DSP firmware
-
-[intel/fw_sst_0f28.bin_base]
-desc: Intel "Bay Trail" SST DSP firmware
-version: 01.0C.00.01
+[intel/avs/skl/dsp_basefw.bin_base]
+desc: Intel AudioDSP driver base firmware for SKL-based platforms
+version: 9.21.00.4899
 
-[intel/fw_sst_0f28_ssp0.bin_base]
-desc: Intel "Bay Trail" SST DSP firmware
-version: 01.0C.00.01
+[intel/avs/skl/dsp_mod_7CAD0808-AB10-CD23-EF45-12AB34CD56EF.bin_base]
+desc: Intel AudioDSP driver base firmware for SKL-based platforms
+version: 9.21.00.4899
 
-[intel/fw_sst_22a8.bin_base]
-desc: Intel "Cherry Trail"/"Braswell" SST DSP firmware
-version: 01.0B.02.02
+[intel/catpt/bdw/dsp_basefw.bin_base]
+desc: Intel AudioDSP base firmware for BDW platforms
+version: 44b81c4d5397a63108356f58f036953d9b288c4e