diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index 178c090f8..b3f6d3f58 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -24,7 +24,7 @@ jobs: matrix: # just a vector in this case make_env: [ IPC_VERSION=, # default version - IPC_VERSION=IPC4 UNSIGNED_list= SIGNED_list='tgl tgl-h cnl icl jsl', + IPC_VERSION=IPC4 UNSIGNED_list= SIGNED_list='tgl tgl-h', ] steps: diff --git a/installer/GNUmakefile b/installer/GNUmakefile index 1332f73cd..5c196afa4 100644 --- a/installer/GNUmakefile +++ b/installer/GNUmakefile @@ -15,22 +15,26 @@ # released by Intel. # See rimage/config/*.toml -UNSIGNED_list ?= bdw byt cht -SIGNED_list ?= apl cnl icl jsl tgl tgl-h +SIGNED_list ?= tgl tgl-h # To find aliases, try in a Linux kernel git clone: # # git grep 'sof-.*\.ri' -- sound/soc/ -ALIAS_SAME_KEY_list := glk cfl cml -ALIAS_OTHER_KEY_list := ehl adl adl-s rpl rpl-s -ALIAS_list ?= ${ALIAS_SAME_KEY_list} ${ALIAS_OTHER_KEY_list} +ALIAS_OTHER_KEY_list += adl adl-s rpl rpl-s +# Not supported in the main branch anymore, go to stable-v2.3 +# UNSIGNED_list += bdw byt cht +# SIGNED_list += apl cnl icl jsl +# ALIAS_SAME_KEY_list += glk cfl cml +# ALIAS_OTHER_KEY_list += ehl -# Older platforms not released anymore +# Much older platforms # UNSIGNED_list += hsw sue # SIGNED_list += kbl skl +ALIAS_list := ${ALIAS_SAME_KEY_list} ${ALIAS_OTHER_KEY_list} + $(info UNSIGNED_list = ${UNSIGNED_list} ) $(info SIGNED_list = ${SIGNED_list} ) $(info ALIAS_list = ${ALIAS_list} ) diff --git a/installer/tests/staging_sofIPC4_ref.txt b/installer/tests/staging_sofIPC4_ref.txt index 650494da8..2cad7d207 100644 --- a/installer/tests/staging_sofIPC4_ref.txt +++ b/installer/tests/staging_sofIPC4_ref.txt @@ -2,39 +2,15 @@ ├── community │   ├── sof-adl-s.ri -> sof-tgl-h.ri │   ├── sof-adl.ri -> sof-tgl.ri -│   ├── sof-cfl.ri -> sof-cnl.ri -│   ├── sof-cml.ri -> sof-cnl.ri -│   ├── sof-cnl.ri -│   ├── sof-ehl.ri -> sof-tgl.ri -│   ├── sof-glk.ri -> sof-apl.ri -│   ├── sof-icl.ri -│   ├── sof-jsl.ri │   ├── sof-rpl-s.ri -> sof-tgl-h.ri │   ├── sof-rpl.ri -> sof-tgl.ri │   ├── sof-tgl-h.ri │   └── sof-tgl.ri ├── intel-signed -│   ├── sof-cfl.ri -> sof-cnl.ri -│   ├── sof-cml.ri -> sof-cnl.ri -│   └── sof-glk.ri -> sof-apl.ri ├── sof-adl-s.ldc -> sof-tgl-h.ldc ├── sof-adl-s.ri -> intel-signed/sof-adl-s.ri ├── sof-adl.ldc -> sof-tgl.ldc ├── sof-adl.ri -> intel-signed/sof-adl.ri -├── sof-cfl.ldc -> sof-cnl.ldc -├── sof-cfl.ri -> intel-signed/sof-cfl.ri -├── sof-cml.ldc -> sof-cnl.ldc -├── sof-cml.ri -> intel-signed/sof-cml.ri -├── sof-cnl.ldc -├── sof-cnl.ri -> intel-signed/sof-cnl.ri -├── sof-ehl.ldc -> sof-tgl.ldc -├── sof-ehl.ri -> intel-signed/sof-ehl.ri -├── sof-glk.ldc -> sof-apl.ldc -├── sof-glk.ri -> intel-signed/sof-glk.ri -├── sof-icl.ldc -├── sof-icl.ri -> intel-signed/sof-icl.ri -├── sof-jsl.ldc -├── sof-jsl.ri -> intel-signed/sof-jsl.ri ├── sof-rpl-s.ldc -> sof-tgl-h.ldc ├── sof-rpl-s.ri -> intel-signed/sof-rpl-s.ri ├── sof-rpl.ldc -> sof-tgl.ldc @@ -44,4 +20,4 @@ ├── sof-tgl.ldc └── sof-tgl.ri -> intel-signed/sof-tgl.ri -2 directories, 42 files +2 directories, 18 files diff --git a/installer/tests/staging_sof_ref.txt b/installer/tests/staging_sof_ref.txt index ffc1c7936..2cad7d207 100644 --- a/installer/tests/staging_sof_ref.txt +++ b/installer/tests/staging_sof_ref.txt @@ -2,48 +2,15 @@ ├── community │   ├── sof-adl-s.ri -> sof-tgl-h.ri │   ├── sof-adl.ri -> sof-tgl.ri -│   ├── sof-apl.ri -│   ├── sof-cfl.ri -> sof-cnl.ri -│   ├── sof-cml.ri -> sof-cnl.ri -│   ├── sof-cnl.ri -│   ├── sof-ehl.ri -> sof-tgl.ri -│   ├── sof-glk.ri -> sof-apl.ri -│   ├── sof-icl.ri -│   ├── sof-jsl.ri │   ├── sof-rpl-s.ri -> sof-tgl-h.ri │   ├── sof-rpl.ri -> sof-tgl.ri │   ├── sof-tgl-h.ri │   └── sof-tgl.ri ├── intel-signed -│   ├── sof-cfl.ri -> sof-cnl.ri -│   ├── sof-cml.ri -> sof-cnl.ri -│   └── sof-glk.ri -> sof-apl.ri ├── sof-adl-s.ldc -> sof-tgl-h.ldc ├── sof-adl-s.ri -> intel-signed/sof-adl-s.ri ├── sof-adl.ldc -> sof-tgl.ldc ├── sof-adl.ri -> intel-signed/sof-adl.ri -├── sof-apl.ldc -├── sof-apl.ri -> intel-signed/sof-apl.ri -├── sof-bdw.ldc -├── sof-bdw.ri -├── sof-byt.ldc -├── sof-byt.ri -├── sof-cfl.ldc -> sof-cnl.ldc -├── sof-cfl.ri -> intel-signed/sof-cfl.ri -├── sof-cht.ldc -├── sof-cht.ri -├── sof-cml.ldc -> sof-cnl.ldc -├── sof-cml.ri -> intel-signed/sof-cml.ri -├── sof-cnl.ldc -├── sof-cnl.ri -> intel-signed/sof-cnl.ri -├── sof-ehl.ldc -> sof-tgl.ldc -├── sof-ehl.ri -> intel-signed/sof-ehl.ri -├── sof-glk.ldc -> sof-apl.ldc -├── sof-glk.ri -> intel-signed/sof-glk.ri -├── sof-icl.ldc -├── sof-icl.ri -> intel-signed/sof-icl.ri -├── sof-jsl.ldc -├── sof-jsl.ri -> intel-signed/sof-jsl.ri ├── sof-rpl-s.ldc -> sof-tgl-h.ldc ├── sof-rpl-s.ri -> intel-signed/sof-rpl-s.ri ├── sof-rpl.ldc -> sof-tgl.ldc @@ -53,4 +20,4 @@ ├── sof-tgl.ldc └── sof-tgl.ri -> intel-signed/sof-tgl.ri -2 directories, 51 files +2 directories, 18 files