January 2018 - Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] [PATCH] build: version Add micro version to supporting versioning stable releases
by Liam Girdwood 10 Jan '18

10 Jan '18

Currently SOF is version as x.y. Add a z so that the version is x.y.z and can represent different stable versions. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- configure.ac | 2 ++ version.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5ade40b..a47a714 100644 --- a/configure.ac +++ b/configure.ac @@ -11,8 +11,10 @@ AM_MAINTAINER_MODE([enable]) # get version info from git m4_define(reef_major, `cat .version | cut -dv -f2 | cut -d. -f1`) m4_define(reef_minor, `cat .version | cut -d. -f2 | cut -d- -f1`) +m4_define(reef_micro, `cat .version | cut -d. -f3 | cut -d- -f1`) AC_DEFINE_UNQUOTED([REEF_MAJOR], reef_major, [Reef major version]) AC_DEFINE_UNQUOTED([REEF_MINOR], reef_minor, [Reef minor version]) +AC_DEFINE_UNQUOTED([REEF_MICRO], reef_micro, [Reef micro version]) AC_CANONICAL_HOST diff --git a/version.sh b/version.sh index fb5f3e4..1f57c53 100755 --- a/version.sh +++ b/version.sh @@ -35,5 +35,5 @@ echo "#define REEF_BUILD $num" >> $DIR/src/include/version.h #echo version for AC_INIT if [ -e $DIR/.version ]; then - echo -n `cat $DIR/.version | cut -dv -f2 | cut -d. -f1`.`cat $DIR/.version | cut -d. -f2 | cut -d- -f1` + echo -n `cat $DIR/.version | cut -dv -f2 | cut -d. -f1`.`cat $DIR/.version | cut -d. -f2 | cut -d- -f1`.`cat $DIR/.version | cut -d. -f3 | cut -d- -f1` fi -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] build: fix install and dist build targets.
by Liam Girdwood 10 Jan '18

10 Jan '18

Make install/dist were missing some headers files and dirs. Add them and make sure version generation works for building from the dist directory where there is no git versioning information available. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- Makefile.am | 9 ++-- configure.ac | 8 ++- git-version.sh | 24 --------- src/Makefile.am | 2 +- src/arch/xtensa/Makefile.am | 5 +- src/arch/xtensa/hal/Makefile.am | 2 +- src/arch/xtensa/include/Makefile.am | 13 +---- src/arch/xtensa/include/arch/Makefile.am | 7 +++ src/arch/xtensa/include/xtensa/Makefile.am | 33 ++++++++++++ src/arch/xtensa/include/xtensa/config/Makefile.am | 2 + src/arch/xtensa/xtos/Makefile.am | 11 +++- src/audio/Makefile.am | 8 +++ src/include/Makefile.am | 7 +++ src/include/reef/Makefile.am | 4 +- src/include/reef/audio/Makefile.am | 5 +- src/include/reef/audio/coefficients/Makefile.am | 1 + .../reef/audio/coefficients/src/Makefile.am | 58 ++++++++++++++++++++++ src/include/reef/math/Makefile.am | 3 ++ src/platform/baytrail/Makefile.am | 2 + .../baytrail/include/xtensa/config/Makefile.am | 2 + version.sh | 39 +++++++++++++++ 21 files changed, 195 insertions(+), 50 deletions(-) delete mode 100755 git-version.sh create mode 100644 src/arch/xtensa/include/arch/Makefile.am create mode 100644 src/arch/xtensa/include/xtensa/Makefile.am create mode 100644 src/arch/xtensa/include/xtensa/config/Makefile.am create mode 100644 src/include/reef/audio/coefficients/Makefile.am create mode 100644 src/include/reef/audio/coefficients/src/Makefile.am create mode 100644 src/include/reef/math/Makefile.am create mode 100755 version.sh diff --git a/Makefile.am b/Makefile.am index 362e2bd..c05f042 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,8 @@ SUBDIRS = src ACLOCAL_AMFLAGS = -I m4 +EXTRA_DIST = version.sh + SRC_DIR = $(abs_top_builddir)/src export REEF_INCDIR = \ @@ -15,13 +17,8 @@ export ARCH_INCDIR = \ export PLATFORM_INCDIR = \ -I $(SRC_DIR)/platform/$(PLATFORM)/include -BUILT_SOURCES = $(top_srcdir)/src/include/version.h - -$(top_srcdir)/src/include/version.h: Makefile - ./git-version.sh - dist-hook: - ./git-version.sh + ./version.sh $(top_srcdir) cat .version > $(distdir)/.tarball-version cat .version > $(distdir)/.version diff --git a/configure.ac b/configure.ac index 44ede24..5ade40b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([Reef],[m4_esyscmd(./git-version.sh)],[sound-open-firmware(a)alsa-project.org]) +AC_INIT([Reef],[m4_esyscmd(./version.sh)],[sound-open-firmware(a)alsa-project.org]) AC_CONFIG_SRCDIR([src/init/init.c]) AC_CONFIG_HEADERS([src/include/config.h]) AC_CONFIG_MACRO_DIRS([m4]) @@ -154,6 +154,9 @@ AC_CONFIG_FILES([ src/arch/Makefile src/arch/xtensa/Makefile src/arch/xtensa/include/Makefile + src/arch/xtensa/include/arch/Makefile + src/arch/xtensa/include/xtensa/Makefile + src/arch/xtensa/include/xtensa/config/Makefile src/arch/xtensa/hal/Makefile src/arch/xtensa/xtos/Makefile src/audio/Makefile @@ -162,6 +165,9 @@ AC_CONFIG_FILES([ src/include/Makefile src/include/reef/Makefile src/include/reef/audio/Makefile + src/include/reef/audio/coefficients/Makefile + src/include/reef/audio/coefficients/src/Makefile + src/include/reef/math/Makefile src/include/uapi/Makefile src/ipc/Makefile src/lib/Makefile diff --git a/git-version.sh b/git-version.sh deleted file mode 100755 index 1c2d275..0000000 --- a/git-version.sh +++ /dev/null @@ -1,24 +0,0 @@ - -# version for configure -# echo -n `git describe --abbrev=4` - -# version for make dist -git describe --abbrev=4 > .version -git describe --abbrev=4 > .tarball-version - -# git commit for IPC -echo "#define REEF_TAG \"`git log --pretty=format:\"%h\" -1 | cut -c1-5`\"" > src/include/version.h - -# build counter -if [ -e .build ]; then - num=$((`cat .build` + 1)) -else - num=0 -fi - -# save and insert build counter -echo $num > .build -echo "#define REEF_BUILD $num" >> src/include/version.h - -#echo version for AC_INIT -echo -n `cat .version | cut -dv -f2 | cut -d. -f1`:`cat .version | cut -d. -f2 | cut -d- -f1` diff --git a/src/Makefile.am b/src/Makefile.am index c2cc8f1..fb82330 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1 +1 @@ -SUBDIRS = init math audio platform tasks drivers ipc lib arch +SUBDIRS = include init math audio platform tasks drivers ipc lib arch diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index 828db91..00f6b68 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = hal xtos include -bin_PROGRAMS = \ +noinst_PROGRAMS = \ reef # generate linker script from platform headers @@ -79,3 +79,6 @@ vminstall-local: clean-local: rm -f reef-*.bin + rm -fr *.lst + rm -fr *.map + rm -fr *.dis diff --git a/src/arch/xtensa/hal/Makefile.am b/src/arch/xtensa/hal/Makefile.am index ad87877..e1e7a80 100644 --- a/src/arch/xtensa/hal/Makefile.am +++ b/src/arch/xtensa/hal/Makefile.am @@ -134,7 +134,7 @@ PLATFORM_DEFS = \ $(CACHE_DEFS) endif -lib_LIBRARIES = libhal.a +noinst_LIBRARIES = libhal.a libhal_a_SOURCES = \ attribute.c \ diff --git a/src/arch/xtensa/include/Makefile.am b/src/arch/xtensa/include/Makefile.am index f114582..b2e07bf 100644 --- a/src/arch/xtensa/include/Makefile.am +++ b/src/arch/xtensa/include/Makefile.am @@ -1,12 +1 @@ -noinst_HEADERS = \ - xtensa/cacheasm.h \ - xtensa/coreasm.h \ - xtensa/corebits.h \ - xtensa/hal.h \ - xtensa/xtensa-xer.h \ - xtensa/config/core.h \ - arch/interrupt.h \ - arch/reef.h \ - arch/spinlock.h \ - arch/timer.h \ - arch/task.h +SUBDIRS = arch xtensa diff --git a/src/arch/xtensa/include/arch/Makefile.am b/src/arch/xtensa/include/arch/Makefile.am new file mode 100644 index 0000000..d8ba0df --- /dev/null +++ b/src/arch/xtensa/include/arch/Makefile.am @@ -0,0 +1,7 @@ +noinst_HEADERS = \ + cache.h \ + interrupt.h \ + reef.h \ + spinlock.h \ + task.h \ + timer.h diff --git a/src/arch/xtensa/include/xtensa/Makefile.am b/src/arch/xtensa/include/xtensa/Makefile.am new file mode 100644 index 0000000..8fd532d --- /dev/null +++ b/src/arch/xtensa/include/xtensa/Makefile.am @@ -0,0 +1,33 @@ +noinst_HEADERS = \ + board.h \ + config \ + hal.h \ + overlay.h \ + trax-api.h \ + trax-proto.h \ + xdm-regs.h \ + xtensa-versions.h \ + xtruntime.h \ + c6x-compat.h \ + coreasm.h \ + overlay_os_asm.h \ + trax-core-config.h \ + traxreg.h \ + xmon.h \ + xtensa-xer.h \ + cacheasm.h \ + corebits.h \ + simboard.h \ + traxfile.h \ + trax-util.h \ + xtbsp.h \ + xtruntime-core-state.h \ + cacheattrasm.h \ + core-macros.h \ + specreg.h \ + trax.h \ + uart-16550.h \ + xtensa-libdb-macros.h \ + xtruntime-frames.h + +SUBDIRS = config diff --git a/src/arch/xtensa/include/xtensa/config/Makefile.am b/src/arch/xtensa/include/xtensa/config/Makefile.am new file mode 100644 index 0000000..69f1b8a --- /dev/null +++ b/src/arch/xtensa/include/xtensa/config/Makefile.am @@ -0,0 +1,2 @@ +noinst_HEADERS = \ + core.h diff --git a/src/arch/xtensa/xtos/Makefile.am b/src/arch/xtensa/xtos/Makefile.am index 6bf882e..9fff986 100644 --- a/src/arch/xtensa/xtos/Makefile.am +++ b/src/arch/xtensa/xtos/Makefile.am @@ -1,4 +1,11 @@ -lib_LIBRARIES = \ +noinst_HEADERS = \ + xtos-internal.h \ + xtos-params.h \ + interrupt-pri.h \ + window-vectors-new.S \ + int-medpri-dispatcher.S + +noinst_LIBRARIES = \ libxtos.a \ libxlevel2.a \ libxlevel3.a \ @@ -26,7 +33,7 @@ endif if BUILD_APOLLOLAKE PLATFORM_DEFS = $(VECTOR_DEFS) -lib_LIBRARIES += libxlevel6.a +noinst_LIBRARIES += libxlevel6.a VECTOR_DEFS += -D__SPLIT__level6 endif diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 285422e..d19dff7 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -1,5 +1,13 @@ noinst_LIBRARIES = libaudio.a +noinst_HEADERS = \ + eq_fir.h \ + eq_iir.h \ + fir.h \ + iir.h \ + src_config.h \ + src_core.h + libaudio_a_SOURCES = \ eq_iir.c \ iir.c \ diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 49f8bbf..a42403b 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -1 +1,8 @@ SUBDIRS = reef uapi + +version.h: + $(top_srcdir)/version.sh $(top_srcdir) + +noinst_HEADERS = \ + config.h \ + version.h diff --git a/src/include/reef/Makefile.am b/src/include/reef/Makefile.am index f690e2a..3f90e90 100644 --- a/src/include/reef/Makefile.am +++ b/src/include/reef/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = audio +SUBDIRS = audio math noinst_HEADERS = \ alloc.h \ @@ -6,8 +6,10 @@ noinst_HEADERS = \ dai.h \ debug.h \ dma.h \ + dma-trace.h \ dw-dma.h \ init.h \ + intel-ipc.h \ interrupt.h \ interrupt-map.h \ io.h \ diff --git a/src/include/reef/audio/Makefile.am b/src/include/reef/audio/Makefile.am index b02684c..60b7145 100644 --- a/src/include/reef/audio/Makefile.am +++ b/src/include/reef/audio/Makefile.am @@ -1,4 +1,7 @@ +SUBDIRS = coefficients + noinst_HEADERS = \ component.h \ pipeline.h \ - buffer.h + buffer.h \ + format.h diff --git a/src/include/reef/audio/coefficients/Makefile.am b/src/include/reef/audio/coefficients/Makefile.am new file mode 100644 index 0000000..af437a6 --- /dev/null +++ b/src/include/reef/audio/coefficients/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = src diff --git a/src/include/reef/audio/coefficients/src/Makefile.am b/src/include/reef/audio/coefficients/src/Makefile.am new file mode 100644 index 0000000..ca30972 --- /dev/null +++ b/src/include/reef/audio/coefficients/src/Makefile.am @@ -0,0 +1,58 @@ +noinst_HEADERS = \ + src_small_int24_1_2_4375_5000.h \ + src_small_int24_1_3_2188_5000.h \ + src_small_int24_1_3_4375_5000.h \ + src_small_int24_20_21_4020_5000.h \ + src_small_int24_21_20_4020_5000.h \ + src_small_int24_2_1_4375_5000.h \ + src_small_int24_2_3_4375_5000.h \ + src_small_int24_3_1_2188_5000.h \ + src_small_int24_3_1_4375_5000.h \ + src_small_int24_3_2_4375_5000.h \ + src_small_int24_7_8_4375_5000.h \ + src_small_int24_8_7_4375_5000.h \ + src_small_int24_define.h \ + src_small_int24_table.h \ + src_std_int24_10_21_4375_5000.h \ + src_std_int24_10_9_4375_5000.h \ + src_std_int24_1_2_2188_5000.h \ + src_std_int24_1_2_4375_5000.h \ + src_std_int24_1_3_2188_5000.h \ + src_std_int24_1_3_4375_5000.h \ + src_std_int24_16_7_3938_5000.h \ + src_std_int24_20_21_4020_5000.h \ + src_std_int24_20_7_2871_5000.h \ + src_std_int24_21_20_4020_5000.h \ + src_std_int24_2_1_2188_5000.h \ + src_std_int24_21_40_3828_5000.h \ + src_std_int24_2_1_4375_5000.h \ + src_std_int24_21_80_3828_5000.h \ + src_std_int24_2_3_4375_5000.h \ + src_std_int24_3_1_2188_5000.h \ + src_std_int24_3_1_4375_5000.h \ + src_std_int24_32_21_4375_5000.h \ + src_std_int24_3_2_4375_5000.h \ + src_std_int24_3_4_4375_5000.h \ + src_std_int24_40_21_3828_5000.h \ + src_std_int24_4_3_4375_5000.h \ + src_std_int24_5_7_4375_5000.h \ + src_std_int24_7_8_4375_5000.h \ + src_std_int24_8_21_3125_5000.h\ + src_std_int24_8_7_2381_5000.h \ + src_std_int24_8_7_4375_5000.h \ + src_std_int24_define.h \ + src_std_int24_table.h \ + src_tiny_int16_1_2_3750_5100.h \ + src_tiny_int16_1_3_1875_5100.h \ + src_tiny_int16_1_3_3750_5100.h \ + src_tiny_int16_20_21_3445_5100.h \ + src_tiny_int16_21_20_3445_5100.h \ + src_tiny_int16_2_1_3750_5100.h \ + src_tiny_int16_2_3_3750_5100.h \ + src_tiny_int16_3_1_1875_5100.h \ + src_tiny_int16_3_1_3750_5100.h \ + src_tiny_int16_3_2_3750_5100.h \ + src_tiny_int16_7_8_3750_5100.h \ + src_tiny_int16_8_7_3750_5100.h \ + src_tiny_int16_define.h \ + src_tiny_int16_table.h diff --git a/src/include/reef/math/Makefile.am b/src/include/reef/math/Makefile.am new file mode 100644 index 0000000..fcd1d2f --- /dev/null +++ b/src/include/reef/math/Makefile.am @@ -0,0 +1,3 @@ +noinst_HEADERS = \ + numbers.h \ + trig.h diff --git a/src/platform/baytrail/Makefile.am b/src/platform/baytrail/Makefile.am index bf9d40a..05b1235 100644 --- a/src/platform/baytrail/Makefile.am +++ b/src/platform/baytrail/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = include +EXTRA_DIST = baytrail.x.in + noinst_LIBRARIES = libplatform.a libplatform_a_SOURCES = \ diff --git a/src/platform/baytrail/include/xtensa/config/Makefile.am b/src/platform/baytrail/include/xtensa/config/Makefile.am index 99c21a5..c68949b 100644 --- a/src/platform/baytrail/include/xtensa/config/Makefile.am +++ b/src/platform/baytrail/include/xtensa/config/Makefile.am @@ -1,5 +1,7 @@ noinst_HEADERS = \ core-isa.h \ + core-isa-byt.h \ + core-isa-cht.h \ core-matmap.h \ defs.h \ specreg.h \ diff --git a/version.sh b/version.sh new file mode 100755 index 0000000..fb5f3e4 --- /dev/null +++ b/version.sh @@ -0,0 +1,39 @@ + +# version for configure, make dist and FW etc +# usage "version.sh dir" +# Where dir is the top level directory path. + +# use pwd is no path argument is given +if [ $# -eq 0 ]; then + DIR=`pwd` +else + DIR=$1 +fi + +# create git version if we are a git repo +if [ ! -d $DIR/.git ]; then +# version for make dist + git describe --abbrev=4 > $DIR/.version + git describe --abbrev=4 > $DIR/.tarball-version + + # git commit for IPC + echo "#define REEF_TAG \"`git log --pretty=format:\"%h\" -1 | cut -c1-5`\"" > $DIR/src/include/version.h +else + echo "#define REEF_TAG 0" > $DIR/src/include/version.h +fi + +# build counter +if [ -e $DIR/.build ]; then + num=$((`cat $DIR/.build` + 1)) +else + num=0 +fi + +# save and insert build counter +echo $num > $DIR/.build +echo "#define REEF_BUILD $num" >> $DIR/src/include/version.h + +#echo version for AC_INIT +if [ -e $DIR/.version ]; then + echo -n `cat $DIR/.version | cut -dv -f2 | cut -d. -f1`.`cat $DIR/.version | cut -d. -f2 | cut -d- -f1` +fi -- 2.14.1

1 0

[Sound-open-firmware] [PATCH v4] [RFC][host-1.0] library: split SOF library into separate component libraries
by Ranjani Sridharan 10 Jan '18

10 Jan '18

This patch enables creating a separate library per component and a common library for pipeline, buffer etc Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- configure.ac | 1 + src/Makefile.am | 7 +- src/arch/host/include/Makefile.am | 1 + src/audio/Makefile.am | 909 +++++++++++++++++++++++++++++-- src/include/reef/Makefile.am | 6 +- src/include/reef/audio/Makefile.am | 5 +- src/include/uapi/Makefile.am | 2 +- src/ipc/Makefile.am | 28 +- src/library/include/platform/Makefile.am | 4 +- src/math/Makefile.am | 22 +- 10 files changed, 933 insertions(+), 52 deletions(-) diff --git a/configure.ac b/configure.ac index 925d450..a0ae651 100644 --- a/configure.ac +++ b/configure.ac @@ -243,6 +243,7 @@ AC_CONFIG_FILES([ src/arch/xtensa/xtos/Makefile src/arch/host/Makefile src/arch/host/include/Makefile + src/arch/host/include/arch/Makefile src/audio/Makefile src/math/Makefile src/drivers/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 57c40e8..ed21692 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,10 @@ +export COMMON_INCDIR = \ + $(REEF_INCDIR) \ + $(ARCH_INCDIR) \ + $(PLATFORM_INCDIR) + if BUILD_LIB -SUBDIRS = math audio arch include library +SUBDIRS = ipc math audio arch include library else SUBDIRS = init math audio platform tasks drivers ipc lib arch include endif diff --git a/src/arch/host/include/Makefile.am b/src/arch/host/include/Makefile.am index e69de29..f0ac9b7 100644 --- a/src/arch/host/include/Makefile.am +++ b/src/arch/host/include/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = arch diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 4a2ee0f..b968c4b 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -1,3 +1,9 @@ +includedir = $(prefix)/include/sof/audio + +include_HEADERS = \ + eq_iir.h \ + eq_fir.h + COMP_SRC = \ eq_iir.c \ iir.c \ @@ -16,126 +22,885 @@ COMP_SRC = \ component.c \ buffer.c +SOF_SRC = \ + dai.c \ + host.c \ + pipeline.c \ + component.c \ + buffer.c + +SRC_SRC = \ + src.c \ + src_core.c + +EQ_FIR_SRC = \ + eq_fir.c \ + fir.c + +EQ_IIR_SRC = \ + eq_iir.c \ + iir.c + if BUILD_LIB # only host builds shared libraries, the rest are static if BUILD_HOST +# libsof lib_LTLIBRARIES = libsof.la -libsof_la_SOURCES = $(COMP_SRC) +libsof_la_SOURCES = $(SOF_SRC) libsof_la_CFLAGS = \ $(ARCH_CFLAGS) \ - $(REEF_INCDIR) \ - $(ARCH_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) libsof_la_LDFLAGS = \ -version-info $(VERSION) \ -no-undefined \ -export-dynamic +# libsof_src +lib_LTLIBRARIES += libsof_src.la + +libsof_src_la_SOURCES = $(SRC_SRC) + +libsof_src_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_src_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_eq_fir +lib_LTLIBRARIES += libsof_eq_fir.la + +libsof_eq_fir_la_SOURCES = $(EQ_FIR_SRC) + +libsof_eq_fir_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_eq_fir_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_eq_iir +lib_LTLIBRARIES += libsof_eq_iir.la + +libsof_eq_iir_la_SOURCES = $(EQ_IIR_SRC) + +libsof_eq_iir_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_eq_iir_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_volume +lib_LTLIBRARIES += libsof_volume.la + +libsof_volume_la_SOURCES = volume.c + +libsof_volume_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_volume_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_mux +lib_LTLIBRARIES += libsof_mux.la + +libsof_mux_la_SOURCES = mux.c + +libsof_mux_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_mux_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_switch +lib_LTLIBRARIES += libsof_switch.la + +libsof_switch_la_SOURCES = switch.c + +libsof_switch_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_switch_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_mixer +lib_LTLIBRARIES += libsof_mixer.la + +libsof_mixer_la_SOURCES = mixer.c + +libsof_mixer_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_mixer_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_tone +lib_LTLIBRARIES += libsof_tone.la + +libsof_tone_la_SOURCES = tone.c + +libsof_tone_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_tone_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + if HAVE_SSE42 +# libsof lib_LTLIBRARIES += libsof_sse42.la -libsof_sse42_la_SOURCES = $(COMP_SRC) +libsof_sse42_la_SOURCES = $(SOF_SRC) libsof_sse42_la_CFLAGS = \ $(ARCH_CFLAGS) \ $(SSE42_CFLAGS) \ - $(REEF_INCDIR) \ - $(ARCH_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) libsof_sse42_la_LDFLAGS = \ -version-info $(VERSION) \ -no-undefined \ -export-dynamic + +# libsof_src +lib_LTLIBRARIES += libsof_src_sse42.la + +libsof_src_sse42_la_SOURCES = $(SRC_SRC) + +libsof_src_sse42_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_src_sse42_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_eq_fir +lib_LTLIBRARIES += libsof_eq_fir_sse42.la + +libsof_eq_fir_sse42_la_SOURCES = $(EQ_FIR_SRC) + +libsof_eq_fir_sse42_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_eq_fir_sse42_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_eq_iir +lib_LTLIBRARIES += libsof_eq_iir_sse42.la + +libsof_eq_iir_sse42_la_SOURCES = $(EQ_IIR_SRC) + +libsof_eq_iir_sse42_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_eq_iir_sse42_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_volume +lib_LTLIBRARIES += libsof_volume_sse42.la + +libsof_volume_sse42_la_SOURCES = volume.c + +libsof_volume_sse42_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_volume_sse42_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_mux +lib_LTLIBRARIES += libsof_mux_sse42.la + +libsof_mux_sse42_la_SOURCES = mux.c + +libsof_mux_sse42_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_mux_sse42_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_switch +lib_LTLIBRARIES += libsof_switch_sse42.la + +libsof_switch_sse42_la_SOURCES = switch.c + +libsof_switch_sse42_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_switch_sse42_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_mixer +lib_LTLIBRARIES += libsof_mixer_sse42.la + +libsof_mixer_sse42_la_SOURCES = mixer.c + +libsof_mixer_sse42_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_mixer_sse42_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_tone +lib_LTLIBRARIES += libsof_tone_sse42.la + +libsof_tone_sse42_la_SOURCES = tone.c + +libsof_tone_sse42_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_tone_sse42_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic endif if HAVE_AVX +# libsof lib_LTLIBRARIES += libsof_avx.la -libsof_avx_la_SOURCES = $(COMP_SRC) +libsof_avx_la_SOURCES = $(SOF_SRC) libsof_avx_la_CFLAGS = \ $(ARCH_CFLAGS) \ $(AVX_CFLAGS) \ - $(REEF_INCDIR) \ - $(ARCH_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) libsof_avx_la_LDFLAGS = \ -version-info $(VERSION) \ -no-undefined \ -export-dynamic + +# libsof_src +lib_LTLIBRARIES += libsof_src_avx.la + +libsof_src_avx_la_SOURCES = $(SRC_SRC) + +libsof_src_avx_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_src_avx_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_eq_fir +lib_LTLIBRARIES += libsof_eq_fir_avx.la + +libsof_eq_fir_avx_la_SOURCES = $(EQ_FIR_SRC) + +libsof_eq_fir_avx_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_eq_fir_avx_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_eq_iir +lib_LTLIBRARIES += libsof_eq_iir_avx.la + +libsof_eq_iir_avx_la_SOURCES = $(EQ_IIR_SRC) + +libsof_eq_iir_avx_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_eq_iir_avx_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_volume +lib_LTLIBRARIES += libsof_volume_avx.la + +libsof_volume_avx_la_SOURCES = volume.c + +libsof_volume_avx_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_volume_avx_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_mux +lib_LTLIBRARIES += libsof_mux_avx.la + +libsof_mux_avx_la_SOURCES = mux.c + +libsof_mux_avx_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_mux_avx_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_switch +lib_LTLIBRARIES += libsof_switch_avx.la + +libsof_switch_avx_la_SOURCES = switch.c + +libsof_switch_avx_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_switch_avx_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_mixer +lib_LTLIBRARIES += libsof_mixer_avx.la + +libsof_mixer_avx_la_SOURCES = mixer.c + +libsof_mixer_avx_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_mixer_avx_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_tone +lib_LTLIBRARIES += libsof_tone_avx.la + +libsof_tone_avx_la_SOURCES = tone.c + +libsof_tone_avx_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_tone_avx_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic endif if HAVE_AVX2 +# libsof lib_LTLIBRARIES += libsof_avx2.la -libsof_avx2_la_SOURCES = $(COMP_SRC) +libsof_avx2_la_SOURCES = $(SOF_SRC) libsof_avx2_la_CFLAGS = \ $(ARCH_CFLAGS) \ $(AVX2_CFLAGS) \ - $(REEF_INCDIR) \ - $(ARCH_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) libsof_avx2_la_LDFLAGS = \ -version-info $(VERSION) \ -no-undefined \ -export-dynamic + +# libsof_src +lib_LTLIBRARIES += libsof_src_avx2.la + +libsof_src_avx2_la_SOURCES = $(SRC_SRC) + +libsof_src_avx2_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX2_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_src_avx2_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_eq_fir +lib_LTLIBRARIES += libsof_eq_fir_avx2.la + +libsof_eq_fir_avx2_la_SOURCES = $(EQ_FIR_SRC) + +libsof_eq_fir_avx2_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX2_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_eq_fir_avx2_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_eq_iir +lib_LTLIBRARIES += libsof_eq_iir_avx2.la + +libsof_eq_iir_avx2_la_SOURCES = $(EQ_IIR_SRC) + +libsof_eq_iir_avx2_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX2_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_eq_iir_avx2_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_volume +lib_LTLIBRARIES += libsof_volume_avx2.la + +libsof_volume_avx2_la_SOURCES = volume.c + +libsof_volume_avx2_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX2_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_volume_avx2_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_mux +lib_LTLIBRARIES += libsof_mux_avx2.la + +libsof_mux_avx2_la_SOURCES = mux.c + +libsof_mux_avx2_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX2_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_mux_avx2_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_switch +lib_LTLIBRARIES += libsof_switch_avx2.la + +libsof_switch_avx2_la_SOURCES = switch.c + +libsof_switch_avx2_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX2_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_switch_avx2_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_mixer +lib_LTLIBRARIES += libsof_mixer_avx2.la + +libsof_mixer_avx2_la_SOURCES = mixer.c + +libsof_mixer_avx2_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX2_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_mixer_avx2_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_tone +lib_LTLIBRARIES += libsof_tone_avx2.la + +libsof_tone_avx2_la_SOURCES = tone.c + +libsof_tone_avx2_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX2_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_tone_avx2_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + endif if HAVE_FMA +# libsof lib_LTLIBRARIES += libsof_fma.la -libsof_fma_la_SOURCES = $(COMP_SRC) +libsof_fma_la_SOURCES = $(SOF_SRC) libsof_fma_la_CFLAGS = \ $(ARCH_CFLAGS) \ $(FMA_CFLAGS) \ - $(REEF_INCDIR) \ - $(ARCH_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) libsof_fma_la_LDFLAGS = \ -version-info $(VERSION) \ -no-undefined \ -export-dynamic + +# libsof_src +lib_LTLIBRARIES += libsof_src_fma.la + +libsof_src_fma_la_SOURCES = $(SRC_SRC) + +libsof_src_fma_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(FMA_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_src_fma_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_eq_fir +lib_LTLIBRARIES += libsof_eq_fir_fma.la + +libsof_eq_fir_fma_la_SOURCES = $(EQ_FIR_SRC) + +libsof_eq_fir_fma_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(FMA_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_eq_fir_fma_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_eq_iir +lib_LTLIBRARIES += libsof_eq_iir_fma.la + +libsof_eq_iir_fma_la_SOURCES = $(EQ_IIR_SRC) + +libsof_eq_iir_fma_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(FMA_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_eq_iir_fma_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_volume +lib_LTLIBRARIES += libsof_volume_fma.la + +libsof_volume_fma_la_SOURCES = volume.c + +libsof_volume_fma_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(FMA_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_volume_fma_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_mux +lib_LTLIBRARIES += libsof_mux_fma.la + +libsof_mux_fma_la_SOURCES = mux.c + +libsof_mux_fma_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(FMA_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_mux_fma_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_switch +lib_LTLIBRARIES += libsof_switch_fma.la + +libsof_switch_fma_la_SOURCES = switch.c + +libsof_switch_fma_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(FMA_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_switch_fma_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_mixer +lib_LTLIBRARIES += libsof_mixer_fma.la + +libsof_mixer_fma_la_SOURCES = mixer.c + +libsof_mixer_fma_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(FMA_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_mixer_fma_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +# libsof_tone +lib_LTLIBRARIES += libsof_tone_fma.la + +libsof_tone_fma_la_SOURCES = tone.c + +libsof_tone_fma_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(FMA_CFLAGS) \ + $(COMMON_INCDIR) + +libsof_tone_fma_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic endif else # Build for non host targets +# libsof lib_LIBRARIES = libsof.a -libsof_a_SOURCES = $(COMP_SRC) +libsof_a_SOURCES = $(SOF_SRC) libsof_a_CFLAGS = \ $(ARCH_CFLAGS) \ - $(REEF_INCDIR) \ - $(ARCH_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) + +# libsof_src +lib_LIBRARIES += libsof_src.a + +libsof_src_a_SOURCES = $(SRC_SRC) + +libsof_src_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_eq_fir +lib_LIBRARIES += libsof_eq_fir.a + +libsof_eq_fir_a_SOURCES = $(EQ_FIR_SRC) + +libsof_eq_fir_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_eq_iir +lib_LIBRARIES += libsof_eq_iir.a + +libsof_eq_iir_a_SOURCES = $(EQ_IIR_SRC) + +libsof_eq_iir_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_volume +lib_LIBRARIES += libsof_volume.a + +libsof_volume_a_SOURCES = volume.c + +libsof_volume_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_mux +lib_LIBRARIES += libsof_mux.a + +libsof_mux_a_SOURCES = mux.c + +libsof_mux_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_switch +lib_LIBRARIES += libsof_switch.a + +libsof_switch_a_SOURCES = switch.c + +libsof_switch_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_mixer +lib_LIBRARIES += libsof_mixer.a + +libsof_mixer_a_SOURCES = mixer.c + +libsof_mixer_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_tone +lib_LIBRARIES += libsof_tone.a + +libsof_tone_a_SOURCES = tone.c + +libsof_tone_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) + if HAVE_HIFI2EP +# libsof lib_LIBRARIES += libsof_hifi2ep.a -libsof_hifi2ep_a_SOURCES = $(COMP_SRC) +libsof_hifi2ep_a_SOURCES = $(SOF_SRC) libsof_hifi2ep_a_CFLAGS = \ $(ARCH_CFLAGS) \ $(SSE42_CFLAGS) \ - $(REEF_INCDIR) \ - $(ARCH_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) + +# libsof_src +lib_LIBRARIES += libsof_src_hifi2ep.a + +libsof_src_hifi2ep_a_SOURCES = $(SRC_SRC) + +libsof_src_hifi2ep_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_eq_fir +lib_LIBRARIES += libsof_eq_fir_hifi2ep.a + +libsof_eq_fir_hifi2ep_a_SOURCES = $(EQ_FIR_SRC) + +libsof_eq_fir_hifi2ep_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_eq_iir +lib_LIBRARIES += libsof_eq_iir_hifi2ep.a + +libsof_eq_iir_hifi2ep_a_SOURCES = $(EQ_IIR_SRC) + +libsof_eq_iir_hifi2ep_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_volume +lib_LIBRARIES += libsof_volume_hifi2ep.a + +libsof_volume_hifi2ep_a_SOURCES = volume.c + +libsof_volume_hifi2ep_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_mux +lib_LIBRARIES += libsof_mux_hifi2ep.a + +libsof_mux_hifi2ep_a_SOURCES = mux.c + +libsof_mux_hifi2ep_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_switch +lib_LIBRARIES += libsof_switch_hifi2ep.a + +libsof_switch_hifi2ep_a_SOURCES = switch.c + +libsof_switch_hifi2ep_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_mixer +lib_LIBRARIES += libsof_mixer_hifi2ep.a + +libsof_mixer_hifi2ep_a_SOURCES = mixer.c + +libsof_mixer_hifi2ep_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_tone +lib_LIBRARIES += libsof_tone_hifi2ep.a + +libsof_tone_hifi2ep_a_SOURCES = tone.c + +libsof_tone_hifi2ep_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) endif if HAVE_HIFI3 +# libsof lib_LIBRARIES += libsof_hifi3.a libsof_hifi3_a_SOURCES = $(COMP_SRC) @@ -143,9 +908,87 @@ libsof_hifi3_a_SOURCES = $(COMP_SRC) libsof_hifi3_a_CFLAGS = \ $(ARCH_CFLAGS) \ $(SSE42_CFLAGS) \ - $(REEF_INCDIR) \ - $(ARCH_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) + +# libsof_src +lib_LIBRARIES += libsof_src_hifi3.a + +libsof_src_hifi3_a_SOURCES = $(SRC_SRC) + +libsof_src_hifi3_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_eq_fir +lib_LIBRARIES += libsof_eq_fir_hifi3.a + +libsof_eq_fir_hifi3_a_SOURCES = $(EQ_FIR_SRC) + +libsof_eq_fir_hifi3_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_eq_iir +lib_LIBRARIES += libsof_eq_iir_hifi3.a + +libsof_eq_iir_hifi3_a_SOURCES = $(EQ_IIR_SRC) + +libsof_eq_iir_hifi3_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_volume +lib_LIBRARIES += libsof_volume_hifi3.a + +libsof_volume_hifi3_a_SOURCES = volume.c + +libsof_volume_hifi3_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_mux +lib_LIBRARIES += libsof_mux_hifi3.a + +libsof_mux_hifi3_a_SOURCES = mux.c + +libsof_mux_hifi3_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_switch +lib_LIBRARIES += libsof_switch_hifi3.a + +libsof_switch_hifi3_a_SOURCES = switch.c + +libsof_switch_hifi3_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_mixer +lib_LIBRARIES += libsof_mixer_hifi3.a + +libsof_mixer_hifi3_a_SOURCES = mixer.c + +libsof_mixer_hifi3_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) + +# libsof_tone +lib_LIBRARIES += libsof_tone_hifi3.a + +libsof_tone_hifi3_a_SOURCES = tone.c + +libsof_tone_hifi3_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(COMMON_INCDIR) endif endif @@ -177,8 +1020,6 @@ libaudio_a_SOURCES = \ libaudio_a_CFLAGS = \ $(ARCH_CFLAGS) \ - $(REEF_INCDIR) \ - $(ARCH_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) endif diff --git a/src/include/reef/Makefile.am b/src/include/reef/Makefile.am index f690e2a..d098036 100644 --- a/src/include/reef/Makefile.am +++ b/src/include/reef/Makefile.am @@ -1,13 +1,17 @@ SUBDIRS = audio -noinst_HEADERS = \ +includedir = $(prefix)/include/sof/reef + +include_HEADERS = \ alloc.h \ clock.h \ dai.h \ debug.h \ dma.h \ + dma-trace.h \ dw-dma.h \ init.h \ + intel-ipc.h \ interrupt.h \ interrupt-map.h \ io.h \ diff --git a/src/include/reef/audio/Makefile.am b/src/include/reef/audio/Makefile.am index b02684c..2e0e8d6 100644 --- a/src/include/reef/audio/Makefile.am +++ b/src/include/reef/audio/Makefile.am @@ -1,4 +1,7 @@ -noinst_HEADERS = \ +includedir = $(prefix)/include/sof/reef/audio + +include_HEADERS = \ component.h \ pipeline.h \ + format.h \ buffer.h diff --git a/src/include/uapi/Makefile.am b/src/include/uapi/Makefile.am index 103d692..f202eca 100644 --- a/src/include/uapi/Makefile.am +++ b/src/include/uapi/Makefile.am @@ -1,4 +1,4 @@ -includedir = $(prefix)/include/sof +includedir = $(prefix)/include/sof/uapi include_HEADERS = \ ipc.h \ diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am index 7e63ca6..9878273 100644 --- a/src/ipc/Makefile.am +++ b/src/ipc/Makefile.am @@ -1,7 +1,22 @@ -noinst_LIBRARIES = libipc.a +if BUILD_LIB +lib_LTLIBRARIES = libsof_ipc.la + +libsof_ipc_la_SOURCES = \ + ipc.c + +libsof_ipc_la_LDFLAGS = \ + -version-info $(VERSION) \ + -no-undefined \ + -export-dynamic + +libsof_ipc_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) +else +noinst_LIBRARIES = libsof_ipc.a if BUILD_BAYTRAIL -libipc_a_SOURCES = \ +libsof_ipc_a_SOURCES = \ ipc.c \ intel-ipc.c \ byt-ipc.c \ @@ -10,7 +25,7 @@ libipc_a_SOURCES = \ endif if BUILD_CHERRYTRAIL -libipc_a_SOURCES = \ +libsof_ipc_a_SOURCES = \ ipc.c \ intel-ipc.c \ byt-ipc.c \ @@ -18,9 +33,8 @@ libipc_a_SOURCES = \ dma-copy.c endif -libipc_a_CFLAGS = \ +libsof_ipc_a_CFLAGS = \ $(ARCH_CFLAGS) \ - $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) +endif diff --git a/src/library/include/platform/Makefile.am b/src/library/include/platform/Makefile.am index 5775230..898867f 100644 --- a/src/library/include/platform/Makefile.am +++ b/src/library/include/platform/Makefile.am @@ -1,4 +1,6 @@ -noinst_HEADERS = \ +includedir = $(prefix)/include/sof/platform + +include_HEADERS = \ clk.h \ dma.h \ interrupt.h \ diff --git a/src/math/Makefile.am b/src/math/Makefile.am index b795afa..6a48e29 100644 --- a/src/math/Makefile.am +++ b/src/math/Makefile.am @@ -1,11 +1,21 @@ -noinst_LIBRARIES = libmath.a +if BUILD_LIB +lib_LTLIBRARIES = libsof_math.la -libmath_a_SOURCES = \ +libsof_math_la_SOURCES = \ trig.c \ numbers.c -libmath_a_CFLAGS = \ +libsof_math_la_CFLAGS = \ $(ARCH_CFLAGS) \ - $(REEF_INCDIR) \ - $(ARCH_INCDIR) \ - $(PLATFORM_INCDIR) + $(COMMON_INCDIR) +else +noinst_LIBRARIES = libsof_math.a + +libsof_math_a_SOURCES = \ + trig.c \ + numbers.c + +libsof_math_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(COMMON_INCDIR) +endif -- 2.11.0

1 0

[Sound-open-firmware] [ANNOUNCE] SOF 1.0 Release
by Liam Girdwood 10 Jan '18

10 Jan '18

I'd like to announce the 1.0 release of Sound Open Firmware (SOF) is available for download on git.alsa-project.org. SOF is an open source BSD licensed audio DSP firmware that currently runs on Cadence xtensa architecture DSPs found on Intel Baytrail, Braswell and Cherrytrail based devices, however SOF is architecture and platform independent meaning it's not tightly coupled to xtensa DSPs or Intel CPUs/SoCs. The 1.0 release supports limited playback and capture topologies alongside volume, mixing and sample format conversion. Information about SOF can be found on the ALSA SOF wiki here :- https://www.alsa-project.org/main/index.php/Firmware Development for SOF 1.1 has started which will include support for Haswell, Broadwell and Apollolake platform alongside support for SRC and more complex topologies. Liam

3 3