Ubuntu
firmware-sof package

Merge ~mschiu77/ubuntu/+source/firmware-sof:ubuntu/jammy-devel into ubuntu/+source/firmware-sof:ubuntu/jammy-devel

  1. Git
  2. lp:~mschiu77/ubuntu/+source/firmware-sof
  3. ubuntu/jammy-devel
  4. Merge into ubuntu/jammy-devel
Proposed by Chris Chiu
Status: Merged
Merge reported by: Robie Basak
Merged at revision: 523c1ad817b72dca02820129596e6d016ae6b6b0
Proposed branch: ~mschiu77/ubuntu/+source/firmware-sof:ubuntu/jammy-devel
Merge into: ubuntu/+source/firmware-sof:ubuntu/jammy-devel
Diff against target: 63 lines (+14/-3)
4 files modified
debian/changelog (+9/-0)
debian/patches/series (+2/-1)
debian/rules (+1/-0)
debian/source/include-binaries (+2/-2)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
git-ubuntu import Pending
Review via email: mp+462688@code.launchpad.net

Commit message

UBUNTU: SAUCE: Add sof-v2.8.1 tplg for Intel MTL

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

Add sof-v2.8.1 tplg files for Intel Meteor Lake hardware which is cherry-picked from d8684c237e9d ("Add sof-v2.8.1 tplg for Intel Meteor Lake hardware") and restore the sof-hda-generic-2ch.tplg for older Intel platforms.

Signed-off-by: Chris Chiu <email address hidden>

To post a comment you must log in.
~mschiu77/ubuntu/+source/firmware-sof:ubuntu/jammy-devel updated
523c1ad... by Chris Chiu

Experimental firmware-sof/jammy changes

Revision history for this message
Robie Basak (racb) wrote :

~dbungert asked me to mark this as Merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 47769ac..23e67eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1firmware-sof (2.0-1ubuntu4.7+exp1) jammy; urgency=medium
2
3 * Enable the mic-mute led on Dell MTL laptops. LP: #2049569
4 - Resotore sof-hda-generic-2ch.tplg for Intel platforms older than MTL
5 - Add sof-v2.8.1 tplg for Intel Meteor Lake hardware
6 - Reorder the sof-v2.8.1 patches to align with upstream
7
8 -- Chris Chiu <chris.chiu@canonical.com> Tue, 19 Mar 2024 19:14:54 +0800
9
1firmware-sof (2.0-1ubuntu4.6) jammy; urgency=medium10firmware-sof (2.0-1ubuntu4.6) jammy; urgency=medium
211
3 * Enable the mic-mute led on Dell MTL laptops. LP: #204956912 * Enable the mic-mute led on Dell MTL laptops. LP: #2049569
diff --git a/debian/patches/0005-Add-sof-v2.8.1-tplg-for-Intel-Meteor-Lake-hardware.patch b/debian/patches/0005-Add-sof-v2.8.1-tplg-for-Intel-Meteor-Lake-hardware.patch
4new file mode 10064413new file mode 100644
index 0000000..8ab43e8
5Binary files /dev/null and b/debian/patches/0005-Add-sof-v2.8.1-tplg-for-Intel-Meteor-Lake-hardware.patch differ14Binary files /dev/null and b/debian/patches/0005-Add-sof-v2.8.1-tplg-for-Intel-Meteor-Lake-hardware.patch differ
diff --git a/debian/patches/0005-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch b/debian/patches/0006-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch
6similarity index 100%15similarity index 100%
7rename from debian/patches/0005-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch16rename from debian/patches/0005-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch
8rename to debian/patches/0006-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch17rename to debian/patches/0006-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch
index a3af035..d749f6e 100644
9Binary files a/debian/patches/0005-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch and b/debian/patches/0006-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch differ18Binary files a/debian/patches/0005-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch and b/debian/patches/0006-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch differ
diff --git a/debian/patches/series b/debian/patches/series
index 2b92ebb..9027617 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@
20002-Add-more-sof-v2.7.1-Intel-MTL-binaries.patch20002-Add-more-sof-v2.7.1-Intel-MTL-binaries.patch
30003-Add-Intel-SOF2.7.2-topology-files.patch30003-Add-Intel-SOF2.7.2-topology-files.patch
40004-Update-v2.2.8-topology-files-for-Intel-RPL-platforms.patch40004-Update-v2.2.8-topology-files-for-Intel-RPL-platforms.patch
50005-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch50005-Add-sof-v2.8.1-tplg-for-Intel-Meteor-Lake-hardware.patch
60006-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch
diff --git a/debian/rules b/debian/rules
index d2e0b2a..20f04e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,4 +18,5 @@ override_dh_auto_install:
18 cp -a sof-ipc4-v2.7 $(SOF_INSTALL_DIR)/sof-ipc418 cp -a sof-ipc4-v2.7 $(SOF_INSTALL_DIR)/sof-ipc4
19 cp -a sof-ipc4-v2.7.1/* $(SOF_INSTALL_DIR)/sof-ipc419 cp -a sof-ipc4-v2.7.1/* $(SOF_INSTALL_DIR)/sof-ipc4
20 cp -a sof-ipc4-v2.8.1/* $(SOF_INSTALL_DIR)/sof-ipc420 cp -a sof-ipc4-v2.8.1/* $(SOF_INSTALL_DIR)/sof-ipc4
21 cp -a sof-ace-tplg-v2.8.1/* $(SOF_INSTALL_DIR)/sof-ace-tplg
21 dh_auto_install22 dh_auto_install
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index db7cbaf..cb31e7b 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -29,5 +29,5 @@ debian/patches/0001-Add-sof-v2.7-for-Intel-Meteor-Lake-hardware.patch
29debian/patches/0002-Add-more-sof-v2.7.1-Intel-MTL-binaries.patch29debian/patches/0002-Add-more-sof-v2.7.1-Intel-MTL-binaries.patch
30debian/patches/0003-Add-Intel-SOF2.7.2-topology-files.patch30debian/patches/0003-Add-Intel-SOF2.7.2-topology-files.patch
31debian/patches/0004-Update-v2.2.8-topology-files-for-Intel-RPL-platforms.patch31debian/patches/0004-Update-v2.2.8-topology-files-for-Intel-RPL-platforms.patch
32debian/patches/0005-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch32debian/patches/0005-Add-sof-v2.8.1-tplg-for-Intel-Meteor-Lake-hardware.patch
33v2.0.x/sof-tplg-v2.0/sof-hda-generic-2ch.tplg33debian/patches/0006-Add-sof-ipc4-v2.8.1-mtl-intel-signed-community.patch
diff --git a/v2.0.x/sof-tplg-v2.0/sof-hda-generic-2ch.tplg b/v2.0.x/sof-tplg-v2.0/sof-hda-generic-2ch.tplg
index 8d9a180..34e51d4 100644
34Binary files a/v2.0.x/sof-tplg-v2.0/sof-hda-generic-2ch.tplg and b/v2.0.x/sof-tplg-v2.0/sof-hda-generic-2ch.tplg differ34Binary files a/v2.0.x/sof-tplg-v2.0/sof-hda-generic-2ch.tplg and b/v2.0.x/sof-tplg-v2.0/sof-hda-generic-2ch.tplg differ

Subscribers

People subscribed via source and target branches

to all changes: