Merge pull request #121 from jajanusz/platforms-refactor

platform: refactor: deduplicate code for APL&CNL

Author: lgirdwood

configure.ac

@@ -487,6 +487,7 @@ AC_CONFIG_FILES([
 	src/platform/cannonlake/include/arch/xtensa/config/Makefile
 	src/platform/cannonlake/include/platform/Makefile
 	src/platform/intel/Makefile
+	src/platform/intel/cavs/Makefile
 	src/platform/intel/include/Makefile
 	src/platform/intel/include/platform/Makefile
 	src/platform/intel/include/platform/cavs/Makefile

src/arch/xtensa/Makefile.am

@@ -87,7 +87,7 @@ sof_LDADD = \
 	../../init/libinit.a \
 	../../tasks/libtasks.a \
 	../../lib/libcore.a \
-	../../platform/$(PLATFORM)/libplatform.a \
+	../../platform/$(PLATFORM)/libplatform.la \
 	../../ipc/libsof_ipc.a \
 	../../lib/libdma.a \
 	../../audio/libaudio.a \

src/platform/apollolake/Makefile.am

@@ -4,26 +4,19 @@ EXTRA_DIST = \
 	apollolake.x.in \
 	boot_ldr.x.in
 
-noinst_LIBRARIES = libplatform.a
-
-libplatform_a_SOURCES = \
-	platform.c \
-	dai.c \
-	dma.c \
-	clk.c \
-	timer.c \
-	interrupt.c \
-	memory.c \
-	pm_runtime.c \
-	power_down.S
-
-libplatform_a_CFLAGS = \
+noinst_LTLIBRARIES = libplatform.la
+
+libplatform_la_LIBADD = ../intel/cavs/libcavsplatform.la
+
+libplatform_la_SOURCES = power_down.S
+
+libplatform_la_CFLAGS = \
 	$(ARCH_CFLAGS) \
 	$(ARCH_INCDIR) \
 	$(PLATFORM_INCDIR) \
 	$(SOF_INCDIR)
 
-libplatform_a_CCASFLAGS = \
+libplatform_la_CCASFLAGS = \
 	$(ARCH_INCDIR) \
 	$(ASFLAGS) \
 	$(ARCH_ASFLAGS) \