From f6995feae912cccbad8d31e362d4318a17382dec Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Thu, 25 Jan 2024 14:29:34 +0200 Subject: [PATCH] soc: xtensa: intel_adsp: cavs: fix XCC build Commit 3b99fb1b4a55c ("xtensa: do not imply atomic ops kconfig") removed ATOMIC_OPERATIONS_ARCH at xtensa arch level. This triggers a bug in intel_adsp cavs builds with XCC compiler as CONFIG_ATOMIC_OPERATIONS_BUILTIN is not defined but neither is CONFIG_ATOMIC_OPERATIONS_ARCH anymore, resulting in failed builds. Fix the XCC build by defining CONFIG_ATOMIC_OPERATIONS_ARCH at soc level. Signed-off-by: Kai Vehmanen --- soc/xtensa/intel_adsp/cavs/Kconfig.series | 1 + 1 file changed, 1 insertion(+) diff --git a/soc/xtensa/intel_adsp/cavs/Kconfig.series b/soc/xtensa/intel_adsp/cavs/Kconfig.series index adbc1f39e1d..a88bec1ec2e 100644 --- a/soc/xtensa/intel_adsp/cavs/Kconfig.series +++ b/soc/xtensa/intel_adsp/cavs/Kconfig.series @@ -9,6 +9,7 @@ config SOC_SERIES_INTEL_ADSP_CAVS select XTENSA_RESET_VECTOR select XTENSA_USE_CORE_CRT1 select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" + select ATOMIC_OPERATIONS_ARCH if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "xcc" select ARCH_HAS_COHERENCE select HAS_PM help