[Sound-open-firmware] [PATCH] dist: fix make dist compling issue for HSW, APL and CNL
Signed-off-by: Keqiao.Zhang keqiao.zhang@linux.intel.com --- src/arch/xtensa/include/arch/Makefile.am | 1 + src/arch/xtensa/xtos/Makefile.am | 1 + src/audio/Makefile.am | 4 ++++ src/include/sof/Makefile.am | 2 ++ src/platform/apollolake/Makefile.am | 2 ++ src/platform/cannonlake/Makefile.am | 4 ++++ src/platform/cannonlake/include/xtensa/config/Makefile.am | 1 + src/platform/haswell/Makefile.am | 2 ++ src/platform/haswell/include/xtensa/config/Makefile.am | 1 + 9 files changed, 18 insertions(+)
diff --git a/src/arch/xtensa/include/arch/Makefile.am b/src/arch/xtensa/include/arch/Makefile.am index 779e449..8e08ff5 100644 --- a/src/arch/xtensa/include/arch/Makefile.am +++ b/src/arch/xtensa/include/arch/Makefile.am @@ -6,4 +6,5 @@ noinst_HEADERS = \ spinlock.h \ task.h \ timer.h \ + string.h \ wait.h diff --git a/src/arch/xtensa/xtos/Makefile.am b/src/arch/xtensa/xtos/Makefile.am index 2e855e7..46a3dfe 100644 --- a/src/arch/xtensa/xtos/Makefile.am +++ b/src/arch/xtensa/xtos/Makefile.am @@ -3,6 +3,7 @@ noinst_HEADERS = \ xtos-params.h \ interrupt-pri.h \ window-vectors-new.S \ + int-highpri-dispatcher.S \ int-medpri-dispatcher.S
noinst_LIBRARIES = \ diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 8a0415e..5f69b65 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -2,6 +2,10 @@ includedir = $(prefix)/include/sof/audio
include_HEADERS = \ eq_iir.h \ + iir.h \ + fir.h \ + src_config.h \ + src.h \ eq_fir.h
COMP_SRC = \ diff --git a/src/include/sof/Makefile.am b/src/include/sof/Makefile.am index f620835..b667459 100644 --- a/src/include/sof/Makefile.am +++ b/src/include/sof/Makefile.am @@ -33,4 +33,6 @@ include_HEADERS = \ timer.h \ trace.h \ wait.h \ + string.h \ + hda-dma.h \ work.h diff --git a/src/platform/apollolake/Makefile.am b/src/platform/apollolake/Makefile.am index 8b441b8..fcf321e 100644 --- a/src/platform/apollolake/Makefile.am +++ b/src/platform/apollolake/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = include
+EXTRA_DIST = apollolake.x.in + noinst_LIBRARIES = libplatform.a
libplatform_a_SOURCES = \ diff --git a/src/platform/cannonlake/Makefile.am b/src/platform/cannonlake/Makefile.am index 3fe45ac..503271c 100644 --- a/src/platform/cannonlake/Makefile.am +++ b/src/platform/cannonlake/Makefile.am @@ -1,5 +1,9 @@ SUBDIRS = include
+EXTRA_DIST = \ + cannonlake.x.in \ + boot_ldr.x.in + noinst_LIBRARIES = libplatform.a
libplatform_a_SOURCES = \ diff --git a/src/platform/cannonlake/include/xtensa/config/Makefile.am b/src/platform/cannonlake/include/xtensa/config/Makefile.am index 99c21a5..bfca58b 100644 --- a/src/platform/cannonlake/include/xtensa/config/Makefile.am +++ b/src/platform/cannonlake/include/xtensa/config/Makefile.am @@ -5,4 +5,5 @@ noinst_HEADERS = \ specreg.h \ system.h \ tie.h \ + core-isa-boot.h \ tie-asm.h diff --git a/src/platform/haswell/Makefile.am b/src/platform/haswell/Makefile.am index 59c33b3..4591c12 100644 --- a/src/platform/haswell/Makefile.am +++ b/src/platform/haswell/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = include
+EXTRA_DIST = haswell.x.in + noinst_LIBRARIES = libplatform.a
libplatform_a_SOURCES = \ diff --git a/src/platform/haswell/include/xtensa/config/Makefile.am b/src/platform/haswell/include/xtensa/config/Makefile.am index 99c21a5..2404f99 100644 --- a/src/platform/haswell/include/xtensa/config/Makefile.am +++ b/src/platform/haswell/include/xtensa/config/Makefile.am @@ -5,4 +5,5 @@ noinst_HEADERS = \ specreg.h \ system.h \ tie.h \ + core-isa-hsw.h \ tie-asm.h
typo in the subject, please drop this patch, will send again.
On 4/10/2018 2:59 PM, Keqiao.Zhang wrote:
Signed-off-by: Keqiao.Zhang keqiao.zhang@linux.intel.com
src/arch/xtensa/include/arch/Makefile.am | 1 + src/arch/xtensa/xtos/Makefile.am | 1 + src/audio/Makefile.am | 4 ++++ src/include/sof/Makefile.am | 2 ++ src/platform/apollolake/Makefile.am | 2 ++ src/platform/cannonlake/Makefile.am | 4 ++++ src/platform/cannonlake/include/xtensa/config/Makefile.am | 1 + src/platform/haswell/Makefile.am | 2 ++ src/platform/haswell/include/xtensa/config/Makefile.am | 1 + 9 files changed, 18 insertions(+)
diff --git a/src/arch/xtensa/include/arch/Makefile.am b/src/arch/xtensa/include/arch/Makefile.am index 779e449..8e08ff5 100644 --- a/src/arch/xtensa/include/arch/Makefile.am +++ b/src/arch/xtensa/include/arch/Makefile.am @@ -6,4 +6,5 @@ noinst_HEADERS = \ spinlock.h \ task.h \ timer.h \
- string.h \ wait.h
diff --git a/src/arch/xtensa/xtos/Makefile.am b/src/arch/xtensa/xtos/Makefile.am index 2e855e7..46a3dfe 100644 --- a/src/arch/xtensa/xtos/Makefile.am +++ b/src/arch/xtensa/xtos/Makefile.am @@ -3,6 +3,7 @@ noinst_HEADERS = \ xtos-params.h \ interrupt-pri.h \ window-vectors-new.S \
int-highpri-dispatcher.S \ int-medpri-dispatcher.S
noinst_LIBRARIES = \
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 8a0415e..5f69b65 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -2,6 +2,10 @@ includedir = $(prefix)/include/sof/audio
include_HEADERS = \ eq_iir.h \
iir.h \
fir.h \
src_config.h \
src.h \ eq_fir.h
COMP_SRC = \
diff --git a/src/include/sof/Makefile.am b/src/include/sof/Makefile.am index f620835..b667459 100644 --- a/src/include/sof/Makefile.am +++ b/src/include/sof/Makefile.am @@ -33,4 +33,6 @@ include_HEADERS = \ timer.h \ trace.h \ wait.h \
- string.h \
- hda-dma.h \ work.h
diff --git a/src/platform/apollolake/Makefile.am b/src/platform/apollolake/Makefile.am index 8b441b8..fcf321e 100644 --- a/src/platform/apollolake/Makefile.am +++ b/src/platform/apollolake/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = include
+EXTRA_DIST = apollolake.x.in
noinst_LIBRARIES = libplatform.a
libplatform_a_SOURCES = \
diff --git a/src/platform/cannonlake/Makefile.am b/src/platform/cannonlake/Makefile.am index 3fe45ac..503271c 100644 --- a/src/platform/cannonlake/Makefile.am +++ b/src/platform/cannonlake/Makefile.am @@ -1,5 +1,9 @@ SUBDIRS = include
+EXTRA_DIST = \
cannonlake.x.in \
boot_ldr.x.in
noinst_LIBRARIES = libplatform.a
libplatform_a_SOURCES = \
diff --git a/src/platform/cannonlake/include/xtensa/config/Makefile.am b/src/platform/cannonlake/include/xtensa/config/Makefile.am index 99c21a5..bfca58b 100644 --- a/src/platform/cannonlake/include/xtensa/config/Makefile.am +++ b/src/platform/cannonlake/include/xtensa/config/Makefile.am @@ -5,4 +5,5 @@ noinst_HEADERS = \ specreg.h \ system.h \ tie.h \
- core-isa-boot.h \ tie-asm.h
diff --git a/src/platform/haswell/Makefile.am b/src/platform/haswell/Makefile.am index 59c33b3..4591c12 100644 --- a/src/platform/haswell/Makefile.am +++ b/src/platform/haswell/Makefile.am @@ -1,5 +1,7 @@ SUBDIRS = include
+EXTRA_DIST = haswell.x.in
noinst_LIBRARIES = libplatform.a
libplatform_a_SOURCES = \
diff --git a/src/platform/haswell/include/xtensa/config/Makefile.am b/src/platform/haswell/include/xtensa/config/Makefile.am index 99c21a5..2404f99 100644 --- a/src/platform/haswell/include/xtensa/config/Makefile.am +++ b/src/platform/haswell/include/xtensa/config/Makefile.am @@ -5,4 +5,5 @@ noinst_HEADERS = \ specreg.h \ system.h \ tie.h \
- core-isa-hsw.h \ tie-asm.h
participants (2)
-
Keqiao.Zhang
-
Zhang, Keqiao