Skip to content

Commit 5f04af9

Browse files
marc-hblgirdwood
authored andcommitted
installer: add IPC_VERSION
One-line change + new test set Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent 0c5dcac commit 5f04af9

File tree

3 files changed

+49
-2
lines changed

3 files changed

+49
-2
lines changed

installer/GNUmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ ${BUILD_SOF_RIS}: ${BUILDS_ROOT}/build_%_${TOOLCHAIN}/sof.ri: | ${BUILDS_ROOT}
197197
cd ${BUILDS_ROOT} && bdir="$$(dirname $@)" && \
198198
if [ -d $${bdir} ] && [ xcc != "${TOOLCHAIN}" ] ; then \
199199
cmake --build $${bdir} -- bin; else \
200-
$(CURDIR)/../scripts/xtensa-build-all.sh $*; fi
200+
$(CURDIR)/../scripts/xtensa-build-all.sh -i "${IPC_VERSION}" $*; fi
201201

202202

203203
########################################
@@ -305,7 +305,7 @@ checktree:
305305
cd ${STAGING_SOF_VERSION} && \
306306
tree -a -v --dirsfirst . > ${BUILDS_ROOT}/staging_sof_tree.txt
307307
# Update sof-apl-nocodec.tplg when adding or removing a default platform
308-
diff -u tests/staging_sof_ref.txt ${BUILDS_ROOT}/staging_sof_tree.txt
308+
diff -u tests/staging_sof${IPC_VERSION}_ref.txt ${BUILDS_ROOT}/staging_sof_tree.txt
309309
# Check two random topologies are there
310310
test -f ${STAGING_SOF_TPLG}/sof-apl-nocodec.tplg
311311
test -f ${STAGING_SOF_TPLG}/sof-imx8-wm8960.tplg

installer/sample-config.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
# arguments or environment variables. Warning: undefined is NOT the
66
# same as blank!
77

8+
# You MUST "make cleanall" after changing anything here
9+
810
# Everything is installed by default. To install and deploy fewer
911
# patforms override the default lists like this:
1012
# UNSIGNED_list :=
@@ -15,6 +17,10 @@
1517
# FW_DESTDIR := root@${_remote}:/lib/firmware/intel
1618
# USER_DESTDIR := ${_remote}:bin/
1719

20+
# Passed to ./scripts/xtensa-build-all.sh -i
21+
# Ignored by incremental builds, MUST cleanall after changing this
22+
# IPC_VERSION := IPC4
23+
1824
# Define this empty for a plain sof/ directory and no sof -> sof-v1.2.3
1925
# symbolic links. This is _only_ to override the top-level directory
2026
# name; for sof_versions.h see version.cmake and try sof/.tarball-version
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
.
2+
├── community
3+
│   ├── sof-adl-s.ri -> sof-tgl-h.ri
4+
│   ├── 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
12+
│   ├── sof-tgl-h.ri
13+
│   └── sof-tgl.ri
14+
├── intel-signed
15+
│   ├── sof-cfl.ri -> sof-cnl.ri
16+
│   ├── sof-cml.ri -> sof-cnl.ri
17+
│   └── sof-glk.ri -> sof-apl.ri
18+
├── sof-adl-s.ldc -> sof-tgl-h.ldc
19+
├── sof-adl-s.ri -> intel-signed/sof-adl-s.ri
20+
├── sof-adl.ldc -> sof-tgl.ldc
21+
├── sof-adl.ri -> intel-signed/sof-adl.ri
22+
├── sof-cfl.ldc -> sof-cnl.ldc
23+
├── sof-cfl.ri -> intel-signed/sof-cfl.ri
24+
├── sof-cml.ldc -> sof-cnl.ldc
25+
├── sof-cml.ri -> intel-signed/sof-cml.ri
26+
├── sof-cnl.ldc
27+
├── sof-cnl.ri -> intel-signed/sof-cnl.ri
28+
├── sof-ehl.ldc -> sof-tgl.ldc
29+
├── sof-ehl.ri -> intel-signed/sof-ehl.ri
30+
├── sof-glk.ldc -> sof-apl.ldc
31+
├── sof-glk.ri -> intel-signed/sof-glk.ri
32+
├── sof-icl.ldc
33+
├── sof-icl.ri -> intel-signed/sof-icl.ri
34+
├── sof-jsl.ldc
35+
├── sof-jsl.ri -> intel-signed/sof-jsl.ri
36+
├── sof-tgl-h.ldc
37+
├── sof-tgl-h.ri -> intel-signed/sof-tgl-h.ri
38+
├── sof-tgl.ldc
39+
└── sof-tgl.ri -> intel-signed/sof-tgl.ri
40+
41+
2 directories, 36 files

0 commit comments

Comments
 (0)