Skip to content

Commit 52b4852

Browse files
kartbendkalowsk
authored andcommitted
soc: intel_adsp: condition mem-coherence select on cache mgmt
The ADSP family and both series symbols select CACHE_CAN_SAY_MEM_COHERENCE unconditionally, but that symbol is only defined under CACHE_MANAGEMENT, so a build that turns cache management off aborts on an unsatisfiable select. Guard the three selects with the dependency they need. Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org> Assisted-by: Claude:opus-5
1 parent 2428d3c commit 52b4852

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎soc/intel/intel_adsp/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ config SOC_FAMILY_INTEL_ADSP
99
select CPU_HAS_DCACHE
1010
select CPU_HAS_ICACHE
1111
select CPU_CACHE_INCOHERENT
12-
select CACHE_CAN_SAY_MEM_COHERENCE
12+
select CACHE_CAN_SAY_MEM_COHERENCE if CACHE_MANAGEMENT
1313
select SOC_HAS_CACHE_FUNCTIONS
1414
select IPC_SERVICE if DT_HAS_INTEL_ADSP_HOST_IPC_ENABLED
1515
imply XTENSA_ENABLE_BACKTRACE

‎soc/intel/intel_adsp/ace/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ config SOC_SERIES_INTEL_ADSP_ACE
66
select XTENSA
77
select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang"))
88
select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"
9-
select CACHE_CAN_SAY_MEM_COHERENCE
9+
select CACHE_CAN_SAY_MEM_COHERENCE if CACHE_MANAGEMENT
1010
select ARCH_HAS_DIRECTED_IPIS
1111
select SCHED_IPI_SUPPORTED if SMP
1212
select ARCH_HAS_CUSTOM_CPU_IDLE

‎soc/intel/intel_adsp/cavs/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config SOC_SERIES_INTEL_ADSP_CAVS
1010
select XTENSA_USE_CORE_CRT1
1111
select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"
1212
select ATOMIC_OPERATIONS_ARCH if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "xcc"
13-
select CACHE_CAN_SAY_MEM_COHERENCE
13+
select CACHE_CAN_SAY_MEM_COHERENCE if CACHE_MANAGEMENT
1414
select ARCH_HAS_GDBSTUB
1515
select HAS_PM
1616
select PM_STATE_SET_IRQ_UNLOCKED

0 commit comments

Comments
 (0)