From 095c907a3f6708c246d324ebe2f57e930ea03ecb Mon Sep 17 00:00:00 2001
From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Date: Tue, 23 Jan 2018 14:53:00 +0000
Subject: [PATCH] build: add build support for apollolake

Build the Intel apollolake platform.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
---
 configure.ac                    | 23 +++++++++++++++++++++++
 src/arch/xtensa/hal/Makefile.am |  9 +++++++++
 src/platform/Makefile.am        |  4 ++++
 3 files changed, 36 insertions(+)

diff --git a/configure.ac b/configure.ac
index 20c5ab428..744d81510 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,23 @@ case "$with_platform" in
 	AC_DEFINE([CONFIG_CHERRYTRAIL], [1], [Configure for Cherrytrail])
 	AC_DEFINE([CONFIG_HOST_PTABLE], [1], [Configure handling host page table])
     ;;
+   apollolake*)
+
+	PLATFORM_LDSCRIPT="apollolake.x"
+	AC_SUBST(PLATFORM_LDSCRIPT)
+
+	PLATFORM="apollolake"
+	AC_SUBST(PLATFORM)
+
+	FW_NAME="apl"
+	AC_SUBST(FW_NAME)
+
+	XTENSA_CORE="hifi3_std"
+	AC_SUBST(XTENSA_CORE)
+
+	AC_DEFINE([CONFIG_APOLLOLAKE], [1], [Configure for Apololake])
+	AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
+    ;;
     haswell*)
 
 	PLATFORM_LDSCRIPT="haswell.x"
@@ -150,6 +167,7 @@ AM_CONDITIONAL(BUILD_CHERRYTRAIL,  test "$FW_NAME" = "cht")
 AM_CONDITIONAL(BUILD_HASWELL,  test "$FW_NAME" = "hsw")
 AM_CONDITIONAL(BUILD_BROADWELL,  test "$FW_NAME" = "bdw")
 AM_CONDITIONAL(BUILD_APOLLOLAKE,  test "$FW_NAME" = "apl")
+AM_CONDITIONAL(BUILD_MODULE,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl")
 
 # DSP core support (Optional)
 AC_ARG_WITH([dsp-core],
@@ -218,6 +236,11 @@ AC_CONFIG_FILES([
 	src/platform/baytrail/include/platform/Makefile
 	src/platform/baytrail/include/xtensa/Makefile
 	src/platform/baytrail/include/xtensa/config/Makefile
+	src/platform/apollolake/Makefile
+	src/platform/apollolake/include/Makefile
+	src/platform/apollolake/include/platform/Makefile
+	src/platform/apollolake/include/xtensa/Makefile
+	src/platform/apollolake/include/xtensa/config/Makefile
 	src/platform/haswell/Makefile
 	src/platform/haswell/include/Makefile
 	src/platform/haswell/include/platform/Makefile
diff --git a/src/arch/xtensa/hal/Makefile.am b/src/arch/xtensa/hal/Makefile.am
index 23c1b79bd..247473efb 100644
--- a/src/arch/xtensa/hal/Makefile.am
+++ b/src/arch/xtensa/hal/Makefile.am
@@ -152,6 +152,15 @@ PLATFORM_DEFS = \
 	$(CACHE_DEFS)
 endif
 
+if BUILD_APOLLOLAKE
+PLATFORM_DEFS = \
+	$(STATE_DEFS) \
+	$(DISASS_DEFS) \
+	$(MISC_DEFS) \
+	$(INTERRUPTS_DEFS) \
+	$(CACHE_DEFS)
+endif
+
 noinst_LIBRARIES = libhal.a
 
 libhal_a_SOURCES = \
diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am
index 9d360c32a..79446d06d 100644
--- a/src/platform/Makefile.am
+++ b/src/platform/Makefile.am
@@ -6,6 +6,10 @@ if BUILD_CHERRYTRAIL
 SUBDIRS = baytrail 
 endif
 
+if BUILD_APOLLOLAKE
+SUBDIRS = apollolake
+endif
+
 if BUILD_HASWELL
 SUBDIRS = haswell
 endif