Skip to content

Commit 312c80a

Browse files
marc-hblgirdwood
authored andcommitted
installer: remove byt..jsl platforms
Not supported in the main branch anymore, go to stable-v2.3 Signed-off-by: Marc Herbert <marc.herbert@intel.com> (cherry picked from commit e09d853)
1 parent 012eb9a commit 312c80a

File tree

4 files changed

+13
-66
lines changed

4 files changed

+13
-66
lines changed

.github/workflows/installer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix: # just a vector in this case
2525
make_env: [
2626
IPC_VERSION=, # default version
27-
IPC_VERSION=IPC4 UNSIGNED_list= SIGNED_list='tgl tgl-h cnl icl jsl',
27+
IPC_VERSION=IPC4 UNSIGNED_list= SIGNED_list='tgl tgl-h',
2828
]
2929

3030
steps:

installer/GNUmakefile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,26 @@
1515
# released by Intel.
1616

1717
# See rimage/config/*.toml
18-
UNSIGNED_list ?= bdw byt cht
19-
SIGNED_list ?= apl cnl icl jsl tgl tgl-h
18+
SIGNED_list ?= tgl tgl-h
2019

2120
# To find aliases, try in a Linux kernel git clone:
2221
#
2322
# git grep 'sof-.*\.ri' -- sound/soc/
2423

25-
ALIAS_SAME_KEY_list := glk cfl cml
26-
ALIAS_OTHER_KEY_list := ehl adl adl-s rpl rpl-s
27-
ALIAS_list ?= ${ALIAS_SAME_KEY_list} ${ALIAS_OTHER_KEY_list}
24+
ALIAS_OTHER_KEY_list += adl adl-s rpl rpl-s
2825

26+
# Not supported in the main branch anymore, go to stable-v2.3
27+
# UNSIGNED_list += bdw byt cht
28+
# SIGNED_list += apl cnl icl jsl
29+
# ALIAS_SAME_KEY_list += glk cfl cml
30+
# ALIAS_OTHER_KEY_list += ehl
2931

30-
# Older platforms not released anymore
32+
# Much older platforms
3133
# UNSIGNED_list += hsw sue
3234
# SIGNED_list += kbl skl
3335

36+
ALIAS_list := ${ALIAS_SAME_KEY_list} ${ALIAS_OTHER_KEY_list}
37+
3438
$(info UNSIGNED_list = ${UNSIGNED_list} )
3539
$(info SIGNED_list = ${SIGNED_list} )
3640
$(info ALIAS_list = ${ALIAS_list} )

installer/tests/staging_sofIPC4_ref.txt

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,15 @@
22
├── community
33
│   ├── sof-adl-s.ri -> sof-tgl-h.ri
44
│   ├── sof-adl.ri -> sof-tgl.ri
5-
│   ├── sof-cfl.ri -> sof-cnl.ri
6-
│   ├── sof-cml.ri -> sof-cnl.ri
7-
│   ├── sof-cnl.ri
8-
│   ├── sof-ehl.ri -> sof-tgl.ri
9-
│   ├── sof-glk.ri -> sof-apl.ri
10-
│   ├── sof-icl.ri
11-
│   ├── sof-jsl.ri
125
│   ├── sof-rpl-s.ri -> sof-tgl-h.ri
136
│   ├── sof-rpl.ri -> sof-tgl.ri
147
│   ├── sof-tgl-h.ri
158
│   └── sof-tgl.ri
169
├── intel-signed
17-
│   ├── sof-cfl.ri -> sof-cnl.ri
18-
│   ├── sof-cml.ri -> sof-cnl.ri
19-
│   └── sof-glk.ri -> sof-apl.ri
2010
├── sof-adl-s.ldc -> sof-tgl-h.ldc
2111
├── sof-adl-s.ri -> intel-signed/sof-adl-s.ri
2212
├── sof-adl.ldc -> sof-tgl.ldc
2313
├── sof-adl.ri -> intel-signed/sof-adl.ri
24-
├── sof-cfl.ldc -> sof-cnl.ldc
25-
├── sof-cfl.ri -> intel-signed/sof-cfl.ri
26-
├── sof-cml.ldc -> sof-cnl.ldc
27-
├── sof-cml.ri -> intel-signed/sof-cml.ri
28-
├── sof-cnl.ldc
29-
├── sof-cnl.ri -> intel-signed/sof-cnl.ri
30-
├── sof-ehl.ldc -> sof-tgl.ldc
31-
├── sof-ehl.ri -> intel-signed/sof-ehl.ri
32-
├── sof-glk.ldc -> sof-apl.ldc
33-
├── sof-glk.ri -> intel-signed/sof-glk.ri
34-
├── sof-icl.ldc
35-
├── sof-icl.ri -> intel-signed/sof-icl.ri
36-
├── sof-jsl.ldc
37-
├── sof-jsl.ri -> intel-signed/sof-jsl.ri
3814
├── sof-rpl-s.ldc -> sof-tgl-h.ldc
3915
├── sof-rpl-s.ri -> intel-signed/sof-rpl-s.ri
4016
├── sof-rpl.ldc -> sof-tgl.ldc
@@ -44,4 +20,4 @@
4420
├── sof-tgl.ldc
4521
└── sof-tgl.ri -> intel-signed/sof-tgl.ri
4622

47-
2 directories, 42 files
23+
2 directories, 18 files

installer/tests/staging_sof_ref.txt

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,15 @@
22
├── community
33
│   ├── sof-adl-s.ri -> sof-tgl-h.ri
44
│   ├── sof-adl.ri -> sof-tgl.ri
5-
│   ├── sof-apl.ri
6-
│   ├── sof-cfl.ri -> sof-cnl.ri
7-
│   ├── sof-cml.ri -> sof-cnl.ri
8-
│   ├── sof-cnl.ri
9-
│   ├── sof-ehl.ri -> sof-tgl.ri
10-
│   ├── sof-glk.ri -> sof-apl.ri
11-
│   ├── sof-icl.ri
12-
│   ├── sof-jsl.ri
135
│   ├── sof-rpl-s.ri -> sof-tgl-h.ri
146
│   ├── sof-rpl.ri -> sof-tgl.ri
157
│   ├── sof-tgl-h.ri
168
│   └── sof-tgl.ri
179
├── intel-signed
18-
│   ├── sof-cfl.ri -> sof-cnl.ri
19-
│   ├── sof-cml.ri -> sof-cnl.ri
20-
│   └── sof-glk.ri -> sof-apl.ri
2110
├── sof-adl-s.ldc -> sof-tgl-h.ldc
2211
├── sof-adl-s.ri -> intel-signed/sof-adl-s.ri
2312
├── sof-adl.ldc -> sof-tgl.ldc
2413
├── sof-adl.ri -> intel-signed/sof-adl.ri
25-
├── sof-apl.ldc
26-
├── sof-apl.ri -> intel-signed/sof-apl.ri
27-
├── sof-bdw.ldc
28-
├── sof-bdw.ri
29-
├── sof-byt.ldc
30-
├── sof-byt.ri
31-
├── sof-cfl.ldc -> sof-cnl.ldc
32-
├── sof-cfl.ri -> intel-signed/sof-cfl.ri
33-
├── sof-cht.ldc
34-
├── sof-cht.ri
35-
├── sof-cml.ldc -> sof-cnl.ldc
36-
├── sof-cml.ri -> intel-signed/sof-cml.ri
37-
├── sof-cnl.ldc
38-
├── sof-cnl.ri -> intel-signed/sof-cnl.ri
39-
├── sof-ehl.ldc -> sof-tgl.ldc
40-
├── sof-ehl.ri -> intel-signed/sof-ehl.ri
41-
├── sof-glk.ldc -> sof-apl.ldc
42-
├── sof-glk.ri -> intel-signed/sof-glk.ri
43-
├── sof-icl.ldc
44-
├── sof-icl.ri -> intel-signed/sof-icl.ri
45-
├── sof-jsl.ldc
46-
├── sof-jsl.ri -> intel-signed/sof-jsl.ri
4714
├── sof-rpl-s.ldc -> sof-tgl-h.ldc
4815
├── sof-rpl-s.ri -> intel-signed/sof-rpl-s.ri
4916
├── sof-rpl.ldc -> sof-tgl.ldc
@@ -53,4 +20,4 @@
5320
├── sof-tgl.ldc
5421
└── sof-tgl.ri -> intel-signed/sof-tgl.ri
5522

56-
2 directories, 51 files
23+
2 directories, 18 files

0 commit comments

Comments
 (0)