From 7b31f93980dccc852f140ac484780053330738af Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Tue, 7 Apr 2020 15:21:34 -0700 Subject: [PATCH] xtensa: enable XTENSA_HAL at SoC level This moves enabling XTENSA_HAL to the SoC definitions. As Xtensa SoCs are highly configurable, it is possible that the generic Xtensa HAL provided in the tree is not suitable. So only enable XTENSA_HAL only if the generic version can be used. Signed-off-by: Daniel Leung --- arch/Kconfig | 1 - soc/xtensa/intel_apl_adsp/Kconfig.soc | 1 + soc/xtensa/intel_s1000/Kconfig.soc | 1 + soc/xtensa/sample_controller/Kconfig.soc | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/Kconfig b/arch/Kconfig index d039003d119..dba5109b9f8 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -62,7 +62,6 @@ config XTENSA select HAS_DTS select USE_SWITCH select USE_SWITCH_SUPPORTED - select XTENSA_HAL if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" help Xtensa architecture diff --git a/soc/xtensa/intel_apl_adsp/Kconfig.soc b/soc/xtensa/intel_apl_adsp/Kconfig.soc index 72e0d27f0ed..2a76ea8f163 100644 --- a/soc/xtensa/intel_apl_adsp/Kconfig.soc +++ b/soc/xtensa/intel_apl_adsp/Kconfig.soc @@ -4,6 +4,7 @@ config SOC_INTEL_APL_ADSP bool "intel_apl_adsp" select XTENSA + select XTENSA_HAL if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" select XTENSA_RESET_VECTOR select XTENSA_USE_CORE_CRT1 select ATOMIC_OPERATIONS_BUILTIN diff --git a/soc/xtensa/intel_s1000/Kconfig.soc b/soc/xtensa/intel_s1000/Kconfig.soc index c8142e05d6f..b40a3a56f6d 100644 --- a/soc/xtensa/intel_s1000/Kconfig.soc +++ b/soc/xtensa/intel_s1000/Kconfig.soc @@ -4,5 +4,6 @@ config SOC_INTEL_S1000 bool "intel_s1000" select XTENSA + select XTENSA_HAL if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" select HAS_I2C_DW if I2C select HAS_SPI_DW if SPI diff --git a/soc/xtensa/sample_controller/Kconfig.soc b/soc/xtensa/sample_controller/Kconfig.soc index 7ce51a54906..d1ca1e189ad 100644 --- a/soc/xtensa/sample_controller/Kconfig.soc +++ b/soc/xtensa/sample_controller/Kconfig.soc @@ -4,3 +4,4 @@ config SOC_XTENSA_SAMPLE_CONTROLLER bool "Xtensa sample_controller core" select XTENSA + select XTENSA_HAL