installer: add IPC_VERSION

One-line change + new test set Signed-off-by: Marc Herbert <marc.herbert@intel.com>
jsarha · Apr 25, 2022 · 5f04af9 · 5f04af9
1 parent 0c5dcac
commit 5f04af9
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 2 deletions.
diff --git a/installer/GNUmakefile b/installer/GNUmakefile
@@ -197,7 +197,7 @@ ${BUILD_SOF_RIS}: ${BUILDS_ROOT}/build_%_${TOOLCHAIN}/sof.ri: | ${BUILDS_ROOT}
 	cd ${BUILDS_ROOT} && bdir="$$(dirname $@)" &&  \
       if [ -d $${bdir} ] && [ xcc != "${TOOLCHAIN}" ] ; then \
         cmake --build $${bdir} -- bin; else \
-      $(CURDIR)/../scripts/xtensa-build-all.sh $*; fi
+      $(CURDIR)/../scripts/xtensa-build-all.sh -i "${IPC_VERSION}" $*; fi
 
 
        ########################################
@@ -305,7 +305,7 @@ checktree:
 	cd ${STAGING_SOF_VERSION} && \
              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
+	diff -u tests/staging_sof${IPC_VERSION}_ref.txt ${BUILDS_ROOT}/staging_sof_tree.txt
 	# Check two random topologies are there
 	test -f ${STAGING_SOF_TPLG}/sof-apl-nocodec.tplg
 	test -f ${STAGING_SOF_TPLG}/sof-imx8-wm8960.tplg

diff --git a/installer/sample-config.mk b/installer/sample-config.mk
@@ -5,6 +5,8 @@
 # arguments or environment variables.  Warning: undefined is NOT the
 # same as blank!
 
+# You MUST "make cleanall" after changing anything here
+
 # Everything is installed by default. To install and deploy fewer
 # patforms override the default lists like this:
 # UNSIGNED_list :=
@@ -15,6 +17,10 @@
 # FW_DESTDIR     := root@${_remote}:/lib/firmware/intel
 # USER_DESTDIR   := ${_remote}:bin/
 
+# Passed to ./scripts/xtensa-build-all.sh -i
+# Ignored by incremental builds, MUST cleanall after changing this
+# IPC_VERSION    := IPC4
+
 # Define this empty for a plain sof/ directory and no sof -> sof-v1.2.3
 # symbolic links. This is _only_ to override the top-level directory
 # name; for sof_versions.h see version.cmake and try sof/.tarball-version

diff --git a/installer/tests/staging_sofIPC4_ref.txt b/installer/tests/staging_sofIPC4_ref.txt
@@ -0,0 +1,41 @@
+.
+├── 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-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-tgl-h.ldc
+├── sof-tgl-h.ri -> intel-signed/sof-tgl-h.ri
+├── sof-tgl.ldc
+└── sof-tgl.ri -> intel-signed/sof-tgl.ri
+
+2 directories, 36 files