xtensa-build-zephyr: re-enable XCC build for Intel cAVS hw

The regression in Zephyr mainline is fixed with
https://github.com/zephyrproject-rtos/zephyr/pull/38374 , so
the XCC build can be renabled for cAVS targets.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
This commit is contained in:
Kai Vehmanen 2021-09-08 17:26:06 +03:00 committed by Liam Girdwood
parent ffff0b0610
commit d3faab3d16
1 changed files with 6 additions and 16 deletions

View File

@ -132,28 +132,18 @@ build()
;; ;;
cnl) cnl)
PLAT_CONFIG='intel_adsp_cavs18' PLAT_CONFIG='intel_adsp_cavs18'
# issues, tracked as XTENSA_CORE="X6H3CNL_2017_8"
# https://github.com/zephyrproject-rtos/zephyr/issues/38349 XTENSA_TOOLS_VERSION="RG-2017.8-linux"
unset XTENSA_TOOLS_ROOT
#XTENSA_CORE="X6H3CNL_2017_8"
#XTENSA_TOOLS_VERSION="RG-2017.8-linux"
# XCC build fails to a linker script compatibility
;; ;;
icl) icl)
PLAT_CONFIG='intel_adsp_cavs20' PLAT_CONFIG='intel_adsp_cavs20'
# issues, tracked as XTENSA_CORE="X6H3CNL_2017_8"
# https://github.com/zephyrproject-rtos/zephyr/issues/38349 XTENSA_TOOLS_VERSION="RG-2017.8-linux"
unset XTENSA_TOOLS_ROOT
#XTENSA_CORE="X6H3CNL_2017_8"
#XTENSA_TOOLS_VERSION="RG-2017.8-linux"
;; ;;
tgl-h|tgl) tgl-h|tgl)
PLAT_CONFIG='intel_adsp_cavs25' PLAT_CONFIG='intel_adsp_cavs25'
# issues, tracked as XTENSA_CORE="cavs2x_LX6HiFi3_2017_8"
# https://github.com/zephyrproject-rtos/zephyr/issues/38349 XTENSA_TOOLS_VERSION="RG-2017.8-linux"
unset XTENSA_TOOLS_ROOT
#XTENSA_CORE="cavs2x_LX6HiFi3_2017_8"
#XTENSA_TOOLS_VERSION="RG-2017.8-linux"
RIMAGE_KEY=modules/audio/sof/keys/otc_private_key_3k.pem RIMAGE_KEY=modules/audio/sof/keys/otc_private_key_3k.pem
;; ;;
imx8) imx8)