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

Proposed by AceLan Kao
Status: Needs review
Proposed branch: ~acelankao/ubuntu/+source/firmware-sof:jammy-devel
Merge into: ubuntu/+source/firmware-sof:ubuntu/jammy-devel
Diff against target: 112 lines (+24/-1)
2 files modified
debian/changelog (+8/-0)
debian/source/include-binaries (+16/-1)
Reviewer Review Type Date Requested Status
Andreas Hasenack Needs Fixing
git-ubuntu import Pending
Review via email: mp+446354@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

I believe this was uploaded already, as I see it in jammy-unapproved[1].

It doesn't match this MP, though, at least the d/changelog entry here in the MP is incorrect, as it has "UNRELEASED" instead of "jammy" in the entry.

Besides that, as I stated in the bug[2], I don't know how to review firmware changes. I don't know where the binary blobs *.tplg come from.

I'll mark this as "needs fixing" due to the changelog entry, but I personally cannot make further progress in this review due to my limited knowledge about this package.

I just noticed another MP against this same package, at [3]. It's using the same version for the package as this one, should they be merged?

1. https://launchpadlibrarian.net/676934809/firmware-sof_2.0-1ubuntu4.2_source.changes
2. https://bugs.launchpad.net/bugs/2023201
3. https://code.launchpad.net/~jianhuilee/ubuntu/+source/firmware-sof/+git/firmware-sof/+merge/446350

review: Needs Fixing

Unmerged commits

601dd38... by AceLan Kao

UBUNTU: SAUCE: Add v2.2.5 & v2.2.6 topology updates for Intel ADL and RPL

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

The v2.2.6 sof tplg firmware is required for the Smart Amplifier IC
ALC1319D on Intel platforms, so pull in v2.2.5 and v2.2.6 tplg updates.

Signed-off-by: Chia-Lin Kao (AceLan) <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 19d95a2..6f1397b 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+firmware-sof (2.0-1ubuntu4.2) UNRELEASED; urgency=medium
7+
8+ * Add ADL/RPL topology updates
9+ - UBUNTU: SAUCE: Add v2.2.5 & v2.2.6 topology updates for Intel ADL and
10+ RPL. (LP: #2023201)
11+
12+ -- Chia-Lin Kao (AceLan) <acelan.kao@canonical.com> Fri, 07 Jul 2023 12:24:27 +0800
13+
14 firmware-sof (2.0-1ubuntu4.1) jammy; urgency=medium
15
16 * Add RPL topology updates
17diff --git a/debian/source/include-binaries b/debian/source/include-binaries
18index 1797605..f0ace1e 100644
19--- a/debian/source/include-binaries
20+++ b/debian/source/include-binaries
21@@ -1,11 +1,26 @@
22 v2.0.x/sof-tplg-v2.0/sof-adl-rt711-l2-rt1316-l01.tplg
23+v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp0.tplg
24+v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp1.tplg
25+v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp2.tplg
26+v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp0.tplg
27+v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp1.tplg
28+v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp2.tplg
29+v2.0.x/sof-tplg-v2.0/sof-adl-es8336-ssp0.tplg
30+v2.0.x/sof-tplg-v2.0/sof-adl-es8336-ssp2.tplg
31+v2.0.x/sof-tplg-v2.0/sof-adl-es8336.tplg
32+v2.0.x/sof-tplg-v2.0/sof-adl-nocodec-hdmi-ssp02.tplg
33+v2.0.x/sof-tplg-v2.0/sof-adl-rt1316-l1-mono-rt714-l0.tplg
34 v2.0.x/sof-tplg-v2.0/sof-rpl-rt1316-l12-rt714-l0.tplg
35 v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l0-rt1318-l12-rt714-l3.tplg
36 v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l0-rt1318-l12.tplg
37 v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l2-rt1316-l01-rt714-l3.tplg
38 v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l2-rt1316-l01.tplg
39+v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg
40+v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l0.tplg
41+v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l2.tplg
42+v2.0.x/sof-tplg-v2.0/sof-tgl-nocodec-hdmi-ssp15.tplg
43+v2.0.x/sof-tplg-v2.0/sof-tgl-rt1308-ssp2-hdmi-ssp15.tplg
44 v2.0.x/sof-v2.0/sof-rpl-s.ldc
45 v2.0.x/sof-v2.0/sof-rpl-s.ri
46 v2.0.x/sof-v2.0/sof-rpl.ldc
47 v2.0.x/sof-v2.0/sof-rpl.ri
48-
49diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp0.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp0.tplg
50new file mode 100644
51index 0000000..8b7aaf9
52Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp0.tplg differ
53diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp1.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp1.tplg
54new file mode 100644
55index 0000000..3a0236e
56Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp1.tplg differ
57diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp2.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp2.tplg
58new file mode 100644
59index 0000000..c67e87f
60Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic2ch-ssp2.tplg differ
61diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp0.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp0.tplg
62new file mode 100644
63index 0000000..dbe57df
64Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp0.tplg differ
65diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp1.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp1.tplg
66new file mode 100644
67index 0000000..52b2502
68Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp1.tplg differ
69diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp2.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp2.tplg
70new file mode 100644
71index 0000000..fa4f77e
72Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-dmic4ch-ssp2.tplg differ
73diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-ssp0.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-ssp0.tplg
74new file mode 100644
75index 0000000..12d450b
76Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-ssp0.tplg differ
77diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-ssp2.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-ssp2.tplg
78new file mode 100644
79index 0000000..90f85a1
80Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336-ssp2.tplg differ
81diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-es8336.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336.tplg
82new file mode 100644
83index 0000000..8b7aaf9
84Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-es8336.tplg differ
85diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-nocodec-hdmi-ssp02.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-nocodec-hdmi-ssp02.tplg
86new file mode 100644
87index 0000000..480fbe2
88Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-nocodec-hdmi-ssp02.tplg differ
89diff --git a/v2.0.x/sof-tplg-v2.0/sof-adl-rt1316-l1-mono-rt714-l0.tplg b/v2.0.x/sof-tplg-v2.0/sof-adl-rt1316-l1-mono-rt714-l0.tplg
90new file mode 100644
91index 0000000..f646961
92Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-adl-rt1316-l1-mono-rt714-l0.tplg differ
93diff --git a/v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg b/v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg
94new file mode 100644
95index 0000000..6e48647
96Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg differ
97diff --git a/v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l0.tplg b/v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l0.tplg
98new file mode 100644
99index 0000000..b6e9c39
100Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l0.tplg differ
101diff --git a/v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l2.tplg b/v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l2.tplg
102new file mode 100644
103index 0000000..31bdfbc
104Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-rpl-rt711-l2.tplg differ
105diff --git a/v2.0.x/sof-tplg-v2.0/sof-tgl-nocodec-hdmi-ssp15.tplg b/v2.0.x/sof-tplg-v2.0/sof-tgl-nocodec-hdmi-ssp15.tplg
106new file mode 100644
107index 0000000..e939315
108Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-tgl-nocodec-hdmi-ssp15.tplg differ
109diff --git a/v2.0.x/sof-tplg-v2.0/sof-tgl-rt1308-ssp2-hdmi-ssp15.tplg b/v2.0.x/sof-tplg-v2.0/sof-tgl-rt1308-ssp2-hdmi-ssp15.tplg
110new file mode 100644
111index 0000000..cd30434
112Binary files /dev/null and b/v2.0.x/sof-tplg-v2.0/sof-tgl-rt1308-ssp2-hdmi-ssp15.tplg differ

Subscribers

People subscribed via source and target branches

to all changes: