Merge ~hui.wang/ubuntu/+source/firmware-sof:ubuntu/devel into ubuntu/+source/firmware-sof:ubuntu/devel

[Hui Wang]

commit e6f4666ee3a0e49c5c3dcfa882a2f1974e21e2ae (HEAD -> ubuntu/devel)
Author: Hui Wang <email address hidden>
Date: Wed Apr 13 11:49:37 2022 +0800

    UBUNTU: SAUCE: add a tplg file from sof-bin-v1.9.3-tplg2

    BugLink: https://bugs.launchpad.net/bugs/1966841

    DEll SDW machine has a new config, on that config, there is no camera
    and no internal mic, so need a new tplg file to enable the audio on
    this config. This file is picked from c8635c9d4afd ("add v1.9.3-tplg2
    topology binaries") of git://github.com/thesofproject/sof-bin.git

    [And this change refers to the Vicamo and Juerg's work]

    Signed-off-by: Hui Wang <email address hidden>

just add a new file.

[Timo Aaltonen (tjaalton)]

uploaded

Unmerged commits

e6f4666... by Hui Wang on 2022-04-13

UBUNTU: SAUCE: add a tplg file from sof-bin-v1.9.3-tplg2

BugLink: https://bugs.launchpad.net/bugs/1966841

DEll SDW machine has a new config, on that config, there is no camera
and no internal mic, so need a new tplg file to enable the audio on
this config. This file is picked from c8635c9d4afd ("add v1.9.3-tplg2
topology binaries") of git://github.com/thesofproject/sof-bin.git

[And this change refers to the Vicamo and Juerg's work]

Signed-off-by: Hui Wang <email address hidden>

d0b6845... by Gianfranco Costamagna on 2022-03-10

2.0-1ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 83ca619..ef09ef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+firmware-sof (2.0-1ubuntu3) jammy; urgency=low
+
+  * Add a new tplg file to v2.0.x
+    - Intel released a new tplg file in the sof-bin-v1.9.3-tplg2 for a
+      Dell machine which has no internal mic. Now picking that file and
+      put it as v2.0.x/sof-tplg-v2.0/sof-adl-rt711-l2-rt1316-l01.tplg.
+      (LP: #1966841)
+
+ -- Hui Wang <[e-mail]>  Wed, 13 Apr 2022 11:30:46 +0800
+
 firmware-sof (2.0-1ubuntu2) jammy; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..f07e2ee
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+v2.0.x/sof-tplg-v2.0/sof-adl-rt711-l2-rt1316-l01.tplg
diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-rt711-l2-rt1316-l01.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-rt711-l2-rt1316-l01.tplg
new file mode 100644
index 0000000..37776e1
Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-rt711-l2-rt1316-l01.tplg differ