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

[Sound-open-firmware] [PATCH] topology: test: fix m4 macro expansion for MCLK argument
by Pierre-Louis Bossart 16 Jan '18

16 Jan '18

M4 expands $10 as $1 followed by 0, so test .conf topology files contained mclk_freq "codec0" instead of the expected value (e.g. 19200000). Parenthesis are required when there are more than 9 arguments to a macro... Reported-by: "Wang, Yan" <yan.wang(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- topology/test/tplg-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 2392135..d322ce7 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -39,7 +39,7 @@ function simple_test { -DTEST_SSP_FORMAT=$6 \ -DTEST_PIPE_FORMAT=$4 \ -DTEST_SSP_BCLK=$9 \ - -DTEST_SSP_MCLK=$10 \ + -DTEST_SSP_MCLK=${10} \ -DTEST_SSP_PHY_BITS=$7 \ -DTEST_SSP_DATA_BITS=$8 \ $i.m4 > ${TFILE}.conf -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] build: add library build support for host platform
by Ranjani Sridharan 12 Jan '18

12 Jan '18

This patch provides library build support for host platform architecture. It enables creating separate libraries for each SOF audio component. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- README | 7 + build-all.sh | 6 + configure.ac | 3 + src/Makefile.am | 11 + src/arch/host/include/Makefile.am | 1 + src/arch/host/include/arch/Makefile.am | 8 + src/audio/Makefile.am | 1005 +++++++++++++++++++++++++++++- src/include/reef/Makefile.am | 4 +- src/include/reef/audio/Makefile.am | 8 +- src/include/uapi/Makefile.am | 2 +- src/ipc/Makefile.am | 28 +- src/library/include/platform/Makefile.am | 12 + src/math/Makefile.am | 22 +- 13 files changed, 1096 insertions(+), 21 deletions(-) create mode 100644 src/arch/host/include/Makefile.am create mode 100644 src/arch/host/include/arch/Makefile.am create mode 100644 src/library/include/platform/Makefile.am diff --git a/README b/README index 9ca5b12..463fc42 100644 --- a/README +++ b/README @@ -13,6 +13,13 @@ Cherrytrail :- ./configure --with-arch=xtensa --with-platform=cherrytrail --with-root-dir=$PWD/../xtensa-root/xtensa-byt-elf --host=xtensa-byt-elf +Library for Host Platform :- +If building library for host platform, run the following configure. Please modify +the --prefix option to choose the directory for installing the library files and +headers + +./configure --with-arch=host --enable-library=yes --host=x86_64-unknown-linux-gnu --prefix=$pwd/../host-root/ + 3) make 4) make bin diff --git a/build-all.sh b/build-all.sh index 2e015f6..a0ce575 100755 --- a/build-all.sh +++ b/build-all.sh @@ -9,6 +9,12 @@ pwd=`pwd` rm -fr src/arch/xtensa/*.ri +# build library for host platform architecture +./configure --with-arch=host --enable-library=yes +--host=x86_64-unknown-linux-gnu --prefix=$pwd/../host-root/ +make +make install + # Build for Baytrail ./configure --with-arch=xtensa --with-platform=baytrail --with-root-dir=$pwd/../xtensa-root/xtensa-byt-elf --host=xtensa-byt-elf make clean diff --git a/configure.ac b/configure.ac index 00c377f..6c559fc 100644 --- a/configure.ac +++ b/configure.ac @@ -161,6 +161,9 @@ AC_CONFIG_FILES([ src/arch/xtensa/include/xtensa/config/Makefile src/arch/xtensa/hal/Makefile 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 fb82330..8944a8d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1 +1,12 @@ SUBDIRS = include init math audio platform tasks drivers ipc lib arch + +export COMMON_INCDIR = \ + $(REEF_INCDIR) \ + $(ARCH_INCDIR) \ + $(PLATFORM_INCDIR) + +if BUILD_LIB +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 new file mode 100644 index 0000000..f0ac9b7 --- /dev/null +++ b/src/arch/host/include/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = arch diff --git a/src/arch/host/include/arch/Makefile.am b/src/arch/host/include/arch/Makefile.am new file mode 100644 index 0000000..6dddb35 --- /dev/null +++ b/src/arch/host/include/arch/Makefile.am @@ -0,0 +1,8 @@ +includedir = $(prefix)/include/sof/arch + +include_HEADERS = \ + cache.h \ + interrupt.h \ + reef.h \ + spinlock.h \ + timer.h diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index d19dff7..9441e7e 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -1,3 +1,1002 @@ +includedir = $(prefix)/include/sof/audio + +include_HEADERS = \ + eq_iir.h \ + eq_fir.h + +COMP_SRC = \ + eq_iir.c \ + iir.c \ + eq_fir.c \ + fir.c \ + tone.c \ + src.c \ + src_core.c \ + mixer.c \ + mux.c \ + volume.c \ + switch.c \ + dai.c \ + host.c \ + pipeline.c \ + 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 = $(SOF_SRC) + +libsof_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(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 = $(SOF_SRC) + +libsof_sse42_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(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 = $(SOF_SRC) + +libsof_avx_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX_CFLAGS) \ + $(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 = $(SOF_SRC) + +libsof_avx2_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(AVX2_CFLAGS) \ + $(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 = $(SOF_SRC) + +libsof_fma_la_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(FMA_CFLAGS) \ + $(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 = $(SOF_SRC) + +libsof_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(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 = $(SOF_SRC) + +libsof_hifi2ep_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(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) + +libsof_hifi3_a_CFLAGS = \ + $(ARCH_CFLAGS) \ + $(SSE42_CFLAGS) \ + $(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 + +else + +# build for firmware image + noinst_LIBRARIES = libaudio.a noinst_HEADERS = \ @@ -29,6 +1028,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 3f90e90..31bd091 100644 --- a/src/include/reef/Makefile.am +++ b/src/include/reef/Makefile.am @@ -1,6 +1,8 @@ SUBDIRS = audio math -noinst_HEADERS = \ +includedir = $(prefix)/include/sof/reef + +include_HEADERS = \ alloc.h \ clock.h \ dai.h \ diff --git a/src/include/reef/audio/Makefile.am b/src/include/reef/audio/Makefile.am index 60b7145..1d2b9cb 100644 --- a/src/include/reef/audio/Makefile.am +++ b/src/include/reef/audio/Makefile.am @@ -1,7 +1,9 @@ SUBDIRS = coefficients -noinst_HEADERS = \ +includedir = $(prefix)/include/sof/reef/audio + +include_HEADERS = \ component.h \ pipeline.h \ - buffer.h \ - format.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 new file mode 100644 index 0000000..5a735ae --- /dev/null +++ b/src/library/include/platform/Makefile.am @@ -0,0 +1,12 @@ +includedir = $(prefix)/include/sof/platform + +include_HEADERS = \ + clk.h \ + dma.h \ + interrupt.h \ + mailbox.h \ + memory.h \ + platform.h \ + pmc.h \ + shim.h \ + timer.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

2 1

[Sound-open-firmware] [PATCH] build: dist: make sure agent.h is added to make dist.
by Liam Girdwood 11 Jan '18

11 Jan '18

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/reef/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/include/reef/Makefile.am b/src/include/reef/Makefile.am index 3f90e90..50ffada 100644 --- a/src/include/reef/Makefile.am +++ b/src/include/reef/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = audio math noinst_HEADERS = \ + agent.h \ alloc.h \ clock.h \ dai.h \ -- 2.14.1

1 0

[Sound-open-firmware] [PATCHv2] build: fix version script to use correct version in tarball build
by Liam Girdwood 11 Jan '18

11 Jan '18

make sure the tarball build and worktree build uses the correct version. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- version.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.sh b/version.sh index 1f57c53..4f25ecd 100755 --- a/version.sh +++ b/version.sh @@ -10,8 +10,8 @@ else DIR=$1 fi -# create git version if we are a git repo -if [ ! -d $DIR/.git ]; then +# create git version if we are a git repo or git worktree +if [ -e $DIR/.git -o -d $DIR/.git ]; then # version for make dist git describe --abbrev=4 > $DIR/.version git describe --abbrev=4 > $DIR/.tarball-version @@ -19,7 +19,7 @@ if [ ! -d $DIR/.git ]; then # 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 + echo "#define REEF_TAG \"0\"" > $DIR/src/include/version.h fi # build counter -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] build: fix version script to use correct version in tarball build
by Liam Girdwood 11 Jan '18

11 Jan '18

make sure the tarball build uses the correct version. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.sh b/version.sh index 1f57c53..33b1451 100755 --- a/version.sh +++ b/version.sh @@ -11,7 +11,7 @@ else fi # create git version if we are a git repo -if [ ! -d $DIR/.git ]; then +if [ -d $DIR/.git ]; then # version for make dist git describe --abbrev=4 > $DIR/.version git describe --abbrev=4 > $DIR/.tarball-version @@ -19,7 +19,7 @@ if [ ! -d $DIR/.git ]; then # 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 + echo "#define REEF_TAG \"0\"" > $DIR/src/include/version.h fi # build counter -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] topology: test: fix MCLK macro usage
by Liam Girdwood 11 Jan '18

11 Jan '18

Incorrect BCLK macro name used to specify MCLK. Fix. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/test/tplg-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 71bb120..2392135 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -39,7 +39,7 @@ function simple_test { -DTEST_SSP_FORMAT=$6 \ -DTEST_PIPE_FORMAT=$4 \ -DTEST_SSP_BCLK=$9 \ - -DTEST_SSP_BCLK=$10 \ + -DTEST_SSP_MCLK=$10 \ -DTEST_SSP_PHY_BITS=$7 \ -DTEST_SSP_DATA_BITS=$8 \ $i.m4 > ${TFILE}.conf -- 2.14.1

1 0

[Sound-open-firmware] [PATCH v5] [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/arch/host/include/arch/Makefile.am | 8 + 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 +- 11 files changed, 941 insertions(+), 52 deletions(-) create mode 100644 src/arch/host/include/arch/Makefile.am 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/arch/host/include/arch/Makefile.am b/src/arch/host/include/arch/Makefile.am new file mode 100644 index 0000000..6dddb35 --- /dev/null +++ b/src/arch/host/include/arch/Makefile.am @@ -0,0 +1,8 @@ +includedir = $(prefix)/include/sof/arch + +include_HEADERS = \ + cache.h \ + interrupt.h \ + reef.h \ + spinlock.h \ + timer.h 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

2 1

[Sound-open-firmware] [PATCH] rimage: build: Fix make dist and version.
by Liam Girdwood 10 Jan '18

10 Jan '18

make dist will now include the topology files. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- configure.ac | 6 +++++- topology/Makefile.am | 15 ++++++++++++++- topology/common/Makefile.am | 3 +++ topology/dsps/Makefile.am | 7 +++++++ topology/m4/Makefile.am | 3 +++ topology/sof/Makefile.am | 14 ++++++++++++++ topology/test/Makefile.am | 9 +++++++++ 7 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 topology/common/Makefile.am create mode 100644 topology/dsps/Makefile.am create mode 100644 topology/m4/Makefile.am create mode 100644 topology/sof/Makefile.am diff --git a/configure.ac b/configure.ac index 1b4f59b..8c65760 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT([rimage], [0.1]) +AC_INIT([sof-tools], [1.0.1]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_SRCDIR([rimage/rimage.c]) AC_CONFIG_HEADERS([config.h]) @@ -17,6 +17,10 @@ AC_OUTPUT([ rimage/Makefile rmbox/Makefile topology/Makefile + topology/common/Makefile + topology/dsps/Makefile + topology/m4/Makefile + topology/sof/Makefile topology/test/Makefile ]) diff --git a/topology/Makefile.am b/topology/Makefile.am index 3cbc5e6..3b5a3a9 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -3,7 +3,7 @@ # Dependencies # -SUBDIRS = test +SUBDIRS = test m4 sof common dsps DEPS = \ dsps/*.m4 \ @@ -44,3 +44,16 @@ clean: rm -f *.conf rm -f *.tplg +EXTRA_DIST = \ + reef-cht-nocodec.m4 \ + reef-cht-max98090.m4 \ + reef-apl-nocodec.m4 \ + reef-bxt-nocodec.m4 \ + reef-byt-nocodec.m4 \ + reef-bdw-rt286.m4 \ + reef-bdw-rt5640.m4 \ + reef-byt-rt5640.m4 \ + reef-byt-rt5645.m4 \ + reef-byt-rt5651.m4 \ + reef-byt-da7212.m4 \ + reef-hsw-rt5640.m4 diff --git a/topology/common/Makefile.am b/topology/common/Makefile.am new file mode 100644 index 0000000..980f0ce --- /dev/null +++ b/topology/common/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ + tlv.m4 + diff --git a/topology/dsps/Makefile.am b/topology/dsps/Makefile.am new file mode 100644 index 0000000..9bbade7 --- /dev/null +++ b/topology/dsps/Makefile.am @@ -0,0 +1,7 @@ +EXTRA_DIST = \ + bdw.m4 \ + bxt.m4 \ + byt.m4 \ + cht.m4 \ + hsw.m4 + diff --git a/topology/m4/Makefile.am b/topology/m4/Makefile.am new file mode 100644 index 0000000..35b3f81 --- /dev/null +++ b/topology/m4/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ + build.m4 \ + local.m4 diff --git a/topology/sof/Makefile.am b/topology/sof/Makefile.am new file mode 100644 index 0000000..fc92591 --- /dev/null +++ b/topology/sof/Makefile.am @@ -0,0 +1,14 @@ +EXTRA_DIST = \ + pipe-dai-capture.m4 \ + pipe-dai-playback.m4 \ + pipe-low-latency-capture.m4 \ + pipe-low-latency-playback.m4 \ + pipe-passthrough-capture.m4 \ + pipe-passthrough-playback.m4 \ + pipe-pcm-media.m4 \ + pipe-src-capture.m4 \ + pipe-src-playback.m4 \ + pipe-tone.m4 \ + pipe-volume-capture.m4 \ + pipe-volume-playback.m4 \ + tokens.m4 diff --git a/topology/test/Makefile.am b/topology/test/Makefile.am index 7da075d..49f2240 100644 --- a/topology/test/Makefile.am +++ b/topology/test/Makefile.am @@ -3,6 +3,8 @@ # Dependencies # + + DEPS = \ ../dsps/*.m4 \ ../common/*.m4 \ @@ -18,3 +20,10 @@ all : *.m4 ${DEPS} clean: rm -f *.conf rm -f *.tplg + + +EXTRA_DIST = \ + test-capture-ssp.m4 \ + test-playback-ssp.m4 \ + test-ssp.m4 \ + tplg-build.sh -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] build: fix package name to sof
by Liam Girdwood 10 Jan '18

10 Jan '18

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a47a714..00c377f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([Reef],[m4_esyscmd(./version.sh)],[sound-open-firmware(a)alsa-project.org]) +AC_INIT([sof],[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]) -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] topology: test: make mclk configurable
by Keyon Jie 10 Jan '18

10 Jan '18

The mclk may be different for different platforms, here make it configurable for test topology files. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- topology/test/test-capture-ssp.m4 | 3 ++- topology/test/test-playback-ssp.m4 | 3 ++- topology/test/test-ssp.m4 | 3 ++- topology/test/tplg-build.sh | 43 ++++++++++++++++++++++---------------- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/topology/test/test-capture-ssp.m4 b/topology/test/test-capture-ssp.m4 index 613e666..2c808ba 100644 --- a/topology/test/test-capture-ssp.m4 +++ b/topology/test/test-capture-ssp.m4 @@ -23,6 +23,7 @@ include(`dsps/byt.m4') # TEST_SSP_PORT - SSP port number e.g. 2 # TEST_SSP_FORMAT - SSP data format e.g s16le # TEST_PIPE_FORMAT - Pipeline format e.g. s16le +# TEST_SSP_MCLK - SSP MCLK in Hz # TEST_SSP_BCLK - SSP BCLK in Hz # TEST_SSP_PHY_BITS - SSP physical slot size # TEST_SSP_DATA_BITS - SSP data slot size @@ -66,7 +67,7 @@ PCM_CAPTURE_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_2) # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, - DAI_CLOCK(mclk, 19200000, slave), + DAI_CLOCK(mclk, TEST_SSP_MCLK, slave), DAI_CLOCK(bclk, TEST_SSP_BCLK, slave), DAI_CLOCK(fsync, 48000, slave), DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3)) diff --git a/topology/test/test-playback-ssp.m4 b/topology/test/test-playback-ssp.m4 index 351b8af..093ad17 100644 --- a/topology/test/test-playback-ssp.m4 +++ b/topology/test/test-playback-ssp.m4 @@ -23,6 +23,7 @@ include(`dsps/byt.m4') # TEST_SSP_PORT - SSP port number e.g. 2 # TEST_SSP_FORMAT - SSP data format e.g s16le # TEST_PIPE_FORMAT - Pipeline format e.g. s16le +# TEST_SSP_MCLK - SSP MCLK in Hz # TEST_SSP_BCLK - SSP BCLK in Hz # TEST_SSP_PHY_BITS - SSP physical slot size # TEST_SSP_DATA_BITS - SSP data slot size @@ -66,7 +67,7 @@ PCM_PLAYBACK_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1) # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, - DAI_CLOCK(mclk, 19200000, slave), + DAI_CLOCK(mclk, TEST_SSP_MCLK, slave), DAI_CLOCK(bclk, TEST_SSP_BCLK, slave), DAI_CLOCK(fsync, 48000, slave), DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3)) diff --git a/topology/test/test-ssp.m4 b/topology/test/test-ssp.m4 index 92e91bf..304aab9 100644 --- a/topology/test/test-ssp.m4 +++ b/topology/test/test-ssp.m4 @@ -23,6 +23,7 @@ include(`dsps/byt.m4') # TEST_SSP_PORT - SSP port number e.g. 2 # TEST_SSP_FORMAT - SSP data format e.g s16le # TEST_PIPE_FORMAT - Pipeline format e.g. s16le +# TEST_SSP_MCLK - SSP BCLK in Hz # TEST_SSP_BCLK - SSP BCLK in Hz # TEST_SSP_PHY_BITS - SSP physical slot size # TEST_SSP_DATA_BITS - SSP data slot size @@ -84,7 +85,7 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, - DAI_CLOCK(mclk, 19200000, slave), + DAI_CLOCK(mclk, TEST_SSP_MCLK, slave), DAI_CLOCK(bclk, TEST_SSP_BCLK, slave), DAI_CLOCK(fsync, 48000, slave), DAI_TDM(2, TEST_SSP_PHY_BITS, 3, 3)) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 5d7cd49..71bb120 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -25,6 +25,7 @@ SIMPLE_TESTS=(test-ssp test-capture-ssp test-playback-ssp) # 7) dai_phy_bits - SSP physical number of BLKCs per slot/channel # 8) dai_data_bits - SSP number of valid daat bits per slot/channel # 9) dai_bclk - SSP BCLK in HZ +# 10) dai_mclk - SSP MCLK in HZ # function simple_test { for i in ${SIMPLE_TESTS[@]} @@ -38,6 +39,7 @@ function simple_test { -DTEST_SSP_FORMAT=$6 \ -DTEST_PIPE_FORMAT=$4 \ -DTEST_SSP_BCLK=$9 \ + -DTEST_SSP_BCLK=$10 \ -DTEST_SSP_PHY_BITS=$7 \ -DTEST_SSP_DATA_BITS=$8 \ $i.m4 > ${TFILE}.conf @@ -47,23 +49,28 @@ function simple_test { } # Pre-process the simple tests -simple_test nocodec passthrough "NoCodec" s16le 2 s16le 20 16 1920000 -simple_test nocodec passthrough "NoCodec" s24le 2 s24le 25 24 2400000 -simple_test nocodec volume "NoCodec" s16le 2 s16le 20 16 1920000 -simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 -simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 -simple_test nocodec src "NoCodec" s24le 2 s24le 25 24 2400000 +simple_test nocodec passthrough "NoCodec" s16le 2 s16le 20 16 1920000 19200000 +simple_test nocodec passthrough "NoCodec" s24le 2 s24le 25 24 2400000 19200000 +simple_test nocodec volume "NoCodec" s16le 2 s16le 20 16 1920000 19200000 +simple_test nocodec volume "NoCodec" s24le 2 s24le 25 24 2400000 19200000 +simple_test nocodec volume "NoCodec" s16le 2 s24le 25 24 2400000 19200000 +simple_test nocodec src "NoCodec" s24le 2 s24le 25 24 2400000 19200000 + +simple_test codec passthrough "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 +simple_test codec passthrough "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 +simple_test codec volume "SSP2-Codec" s16le 2 s16le 20 16 1920000 19200000 +simple_test codec volume "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 +simple_test codec volume "SSP2-Codec" s16le 2 s24le 25 24 2400000 19200000 +simple_test codec src "SSP2-Codec" s24le 2 s24le 25 24 2400000 19200000 + +simple_test baytrail passthrough "Baytrail Audio" s16le 2 s16le 20 16 1920000 19200000 +simple_test baytrail passthrough "Baytrail Audio" s24le 2 s24le 25 24 2400000 19200000 +simple_test baytrail volume "Baytrail Audio" s16le 2 s16le 20 16 1920000 19200000 +simple_test baytrail volume "Baytrail Audio" s24le 2 s24le 25 24 2400000 19200000 +simple_test baytrail volume "Baytrail Audio" s16le 2 s24le 25 24 2400000 19200000 +simple_test baytrail src "Baytrail Audio" s24le 2 s24le 25 24 2400000 19200000 + +simple_test nocodec passthrough "NoCodec" s16le 4 s16le 16 16 1536000 24576000 +simple_test apollolake passthrough "SSP4-Codec" s16le 4 s16le 16 16 1536000 24576000 -simple_test codec passthrough "SSP2-Codec" s16le 2 s16le 20 16 1920000 -simple_test codec passthrough "SSP2-Codec" s24le 2 s24le 25 24 2400000 -simple_test codec volume "SSP2-Codec" s16le 2 s16le 20 16 1920000 -simple_test codec volume "SSP2-Codec" s24le 2 s24le 25 24 2400000 -simple_test codec volume "SSP2-Codec" s16le 2 s24le 25 24 2400000 -simple_test codec src "SSP2-Codec" s24le 2 s24le 25 24 2400000 -simple_test baytrail passthrough "Baytrail Audio" s16le 2 s16le 20 16 1920000 -simple_test baytrail passthrough "Baytrail Audio" s24le 2 s24le 25 24 2400000 -simple_test baytrail volume "Baytrail Audio" s16le 2 s16le 20 16 1920000 -simple_test baytrail volume "Baytrail Audio" s24le 2 s24le 25 24 2400000 -simple_test baytrail volume "Baytrail Audio" s16le 2 s24le 25 24 2400000 -simple_test baytrail src "Baytrail Audio" s24le 2 s24le 25 24 2400000 -- 2.11.0

2 1