rimage: add build scripts to build 1.5 image

add to build scripts and Makefiles to build firmware binary
for kbl and skl

Signed-off-by: Zhu Yingjiang <yingjiang.zhu@linux.intel.com>

Author: zhuyingjiang

configure.ac

@@ -239,7 +239,47 @@ case "$with_platform" in
 	XTENSA_CORE="hifi3_std"
 	AC_SUBST(XTENSA_CORE)
 
-	AC_DEFINE([CONFIG_APOLLOLAKE], [1], [Configure for Apololake])
+	AC_DEFINE([CONFIG_APOLLOLAKE], [1], [Configure for Apollolake])
+	AC_DEFINE([CONFIG_BOOT_LOADER], [1], [Configure Boot Loader])
+	AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
+	AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
+	AC_DEFINE([CONFIG_MEM_WND], [1], [Configure Memory Windows])
+    ;;
+   kabylake*)
+
+	PLATFORM_LDSCRIPT="apollolake.x"
+	AC_SUBST(PLATFORM_LDSCRIPT)
+
+	PLATFORM="apollolake"
+	AC_SUBST(PLATFORM)
+
+	FW_NAME="kbl"
+	AC_SUBST(FW_NAME)
+
+	XTENSA_CORE="hifi3_std"
+	AC_SUBST(XTENSA_CORE)
+
+	AC_DEFINE([CONFIG_APOLLOLAKE], [1], [Configure for Apollolake])
+	AC_DEFINE([CONFIG_BOOT_LOADER], [1], [Configure Boot Loader])
+	AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
+	AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
+	AC_DEFINE([CONFIG_MEM_WND], [1], [Configure Memory Windows])
+    ;;
+    skylake*)
+
+	PLATFORM_LDSCRIPT="apollolake.x"
+	AC_SUBST(PLATFORM_LDSCRIPT)
+
+	PLATFORM="apollolake"
+	AC_SUBST(PLATFORM)
+
+	FW_NAME="skl"
+	AC_SUBST(FW_NAME)
+
+	XTENSA_CORE="hifi3_std"
+	AC_SUBST(XTENSA_CORE)
+
+	AC_DEFINE([CONFIG_APOLLOLAKE], [1], [Configure for Apollolake])
 	AC_DEFINE([CONFIG_BOOT_LOADER], [1], [Configure Boot Loader])
 	AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
 	AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
@@ -353,14 +393,14 @@ AM_CONDITIONAL(BUILD_BAYTRAIL, test "$FW_NAME" = "byt")
 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_APOLLOLAKE,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "skl" -o "$FW_NAME" = "kbl")
 AM_CONDITIONAL(BUILD_CANNONLAKE,  test "$FW_NAME" = "cnl")
 AM_CONDITIONAL(BUILD_SUECREEK,  test "$FW_NAME" = "sue")
 AM_CONDITIONAL(BUILD_ICELAKE,  test "$FW_NAME" = "icl")
-AM_CONDITIONAL(BUILD_BOOTLOADER,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue")
-AM_CONDITIONAL(BUILD_CAVS,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue")
-AM_CONDITIONAL(BUILD_MODULE,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue")
-AM_CONDITIONAL(BUILD_APL_SSP,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue")
+AM_CONDITIONAL(BUILD_BOOTLOADER,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue" -o "$FW_NAME" = "skl" -o "$FW_NAME" = "kbl")
+AM_CONDITIONAL(BUILD_CAVS,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue" -o "$FW_NAME" = "skl" -o "$FW_NAME" = "kbl")
+AM_CONDITIONAL(BUILD_MODULE,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue" -o "$FW_NAME" = "skl" -o "$FW_NAME" = "kbl")
+AM_CONDITIONAL(BUILD_APL_SSP,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue" -o "$FW_NAME" = "skl" -o "$FW_NAME" = "kbl")
 
 # DSP core support (Optional)
 AC_ARG_WITH([dsp-core],

rimage/Makefile.am

@@ -14,6 +14,7 @@ rimage_SOURCES = \
 	file_simple.c \
 	man_apl.c \
 	man_cnl.c \
+	man_kbl.c \
 	cse.c \
 	css.c \
 	plat_auth.c \

scripts/xtensa-build-all.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SUPPORTED_PLATFORMS=(byt cht bdw hsw apl cnl sue icl)
+SUPPORTED_PLATFORMS=(byt cht bdw hsw apl cnl sue icl skl kbl)
 BUILD_RIMAGE=1
 
 pwd=`pwd`
@@ -125,6 +125,40 @@ do
 		ROOT="$pwd/../xtensa-root/$HOST"
 		XTENSA_TOOLS_VERSION="RG-2017.8-linux"
 	fi
+	if [ $j == "skl" ]
+	then
+		PLATFORM="skylake"
+		XTENSA_CORE="X4H3I16w2D48w3a_2017_8"
+
+		# test APL compiler aliases and ignore set -e here
+		type xtensa-bxt-elf-gcc > /dev/null 2>&1 && true
+		if [ $? == 0 ]
+		then
+			HOST="xtensa-bxt-elf"
+		else
+			HOST="xtensa-apl-elf"
+		fi
+
+		ROOT="$pwd/../xtensa-root/$HOST"
+		XTENSA_TOOLS_VERSION="RG-2017.8-linux"
+	fi
+	if [ $j == "kbl" ]
+	then
+		PLATFORM="kabylake"
+		XTENSA_CORE="X4H3I16w2D48w3a_2017_8"
+
+		# test APL compiler aliases and ignore set -e here
+		type xtensa-bxt-elf-gcc > /dev/null 2>&1 && true
+		if [ $? == 0 ]
+		then
+			HOST="xtensa-bxt-elf"
+		else
+			HOST="xtensa-apl-elf"
+		fi
+
+		ROOT="$pwd/../xtensa-root/$HOST"
+		XTENSA_TOOLS_VERSION="RG-2017.8-linux"
+	fi
 	if [ $j == "cnl" ]
 	then
 		PLATFORM="cannonlake"