From 11fb638bd820725a32a3482d1c17abea1aba0e63 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Mon, 27 Sep 2021 06:37:19 +0000 Subject: [PATCH 1/2] installer: use tree -v to make the test output deterministic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoids semi-random order like: -- tests/staging_sof_ref.txt ++ sof/installer-builds/staging_sof_tree.txt @ -1,7 +1,7 @@ . ├── community -│ ├── sof-adl.ri -> sof-tgl.ri │ ├── 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 @ -16,10 +16,10 @@ Signed-off-by: Marc Herbert --- installer/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/GNUmakefile b/installer/GNUmakefile index 6ba6dfa1fc98..6f3d1fb4534f 100644 --- a/installer/GNUmakefile +++ b/installer/GNUmakefile @@ -293,7 +293,7 @@ COMPARE_REFS ?= /lib/firmware/intel checktree: cd ${STAGING_SOF_VERSION} && \ - tree -a --dirsfirst . > ${BUILDS_ROOT}/staging_sof_tree.txt + tree -a -v --dirsfirst . > ${BUILDS_ROOT}/staging_sof_tree.txt # Update sof-apl-nocodec.tplg when adding or removing a default platform diff -u tests/staging_sof_ref.txt ${BUILDS_ROOT}/staging_sof_tree.txt # Check two random topologies are there From 5635ef970798b7233751439da875a48521d7a3ef Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Mon, 27 Sep 2021 05:28:28 +0000 Subject: [PATCH 2/2] installer: add adl and adl-s links ADL and ADL-S binaries share FW build configuration with TGL and TGL-H. See also issue #3491 and commit 15e03fd29729 ("config: intel: use PCH name for tigerlake") and the corresponding review in PR #3451. Signed-off-by: Marc Herbert --- installer/GNUmakefile | 4 +++- installer/tests/staging_sof_ref.txt | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/installer/GNUmakefile b/installer/GNUmakefile index 6f3d1fb4534f..b8d85ecc8059 100644 --- a/installer/GNUmakefile +++ b/installer/GNUmakefile @@ -22,7 +22,7 @@ SIGNED_list ?= apl cnl icl jsl tgl tgl-h ALIAS_SAME_KEY_list := glk cfl cml -ALIAS_OTHER_KEY_list := ehl +ALIAS_OTHER_KEY_list := ehl adl adl-s ALIAS_list ?= ${ALIAS_SAME_KEY_list} ${ALIAS_OTHER_KEY_list} $(info UNSIGNED_list = ${UNSIGNED_list} ) @@ -34,6 +34,8 @@ target_of_cfl := cnl target_of_cml := cnl target_of_ehl := tgl +target_of_adl := tgl +target_of_adl-s := tgl-h ifeq (,${TOOLCHAIN}) ifeq (,${XTENSA_TOOLS_ROOT}) diff --git a/installer/tests/staging_sof_ref.txt b/installer/tests/staging_sof_ref.txt index 6e279f1c3110..53ec6c80cf5d 100644 --- a/installer/tests/staging_sof_ref.txt +++ b/installer/tests/staging_sof_ref.txt @@ -1,5 +1,7 @@ . ├── 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 @@ -14,6 +16,10 @@ │   ├── 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 @@ -41,4 +47,4 @@ ├── sof-tgl.ldc └── sof-tgl.ri -> intel-signed/sof-tgl.ri -2 directories, 39 files +2 directories, 45 files