intel_adsp: Do not use xtensa hal with xcc-clang

Do not usu XTENSA_HAL when building with xt-clang, instead uses the HAL provided together with the toolchain. Just like it is done with "xcc" toolchain variant. Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
zephyrproject-rtos · Aug 23, 2022 · 96e988c · 96e988c
1 parent 8403866
commit 96e988c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/soc/xtensa/intel_adsp/ace_v1x/Kconfig.series b/soc/xtensa/intel_adsp/ace_v1x/Kconfig.series
@@ -5,7 +5,7 @@ config SOC_SERIES_INTEL_ACE1X
 	bool "Intel ACE 1.x"
 	select SOC_FAMILY_INTEL_ADSP
 	select XTENSA
-	select XTENSA_HAL if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"
+	select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc-clang"))
 	select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"
 	select ARCH_HAS_COHERENCE
 	select SCHED_IPI_SUPPORTED

diff --git a/soc/xtensa/intel_adsp/cavs/Kconfig.series b/soc/xtensa/intel_adsp/cavs/Kconfig.series
@@ -5,7 +5,7 @@ config SOC_SERIES_INTEL_ADSP_CAVS
 	bool "Intel CAVS"
 	select SOC_FAMILY_INTEL_ADSP
 	select XTENSA
-	select XTENSA_HAL if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"
+	select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc-clang"))
 	select XTENSA_RESET_VECTOR
 	select XTENSA_USE_CORE_CRT1
 	select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"