diff --git a/boards/intel/adsp/Kconfig.intel_adsp b/boards/intel/adsp/Kconfig.intel_adsp index 0a29c0d1381..1c9faa8b957 100644 --- a/boards/intel/adsp/Kconfig.intel_adsp +++ b/boards/intel/adsp/Kconfig.intel_adsp @@ -2,8 +2,8 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_INTEL_ADSP - select SOC_INTEL_CAVS_V25 if BOARD_INTEL_ADSP_CAVS25 - select SOC_INTEL_CAVS_V25 if BOARD_INTEL_ADSP_CAVS25_TGPH + select SOC_CAVSV25 if BOARD_INTEL_ADSP_CAVS25 + select SOC_CAVSV25 if BOARD_INTEL_ADSP_CAVS25_TGPH select SOC_INTEL_ACE15_MTPM if BOARD_INTEL_ADSP_ACE15_MTPM select SOC_INTEL_ACE15_MTPM if BOARD_INTEL_ADSP_ACE15_MTPM_SIM select SOC_INTEL_ACE20_LNL if BOARD_INTEL_ADSP_ACE20_LNL diff --git a/drivers/interrupt_controller/intc_cavs.c b/drivers/interrupt_controller/intc_cavs.c index 38e22c233e8..154d32c47d3 100644 --- a/drivers/interrupt_controller/intc_cavs.c +++ b/drivers/interrupt_controller/intc_cavs.c @@ -16,7 +16,7 @@ #include "intc_cavs.h" #if defined(CONFIG_SMP) && (CONFIG_MP_MAX_NUM_CPUS > 1) -#if defined(CONFIG_SOC_INTEL_CAVS_V25) +#if defined(CONFIG_SOC_CAVSV25) #define PER_CPU_OFFSET(x) (0x40 * x) #else #error "Must define PER_CPU_OFFSET(x) for SoC" diff --git a/soc/intel/intel_adsp/cavs/Kconfig b/soc/intel/intel_adsp/cavs/Kconfig index a609f56b9b5..a9d127653b4 100644 --- a/soc/intel/intel_adsp/cavs/Kconfig +++ b/soc/intel/intel_adsp/cavs/Kconfig @@ -15,6 +15,6 @@ config SOC_SERIES_INTEL_ADSP_CAVS select INTEL_ADSP_MEMORY_IS_MIRRORED select CACHE_HAS_MIRRORED_MEMORY_REGIONS -config SOC_INTEL_CAVS_V25 +config SOC_CAVSV25 select XTENSA_WAITI_BUG select SCHED_IPI_SUPPORTED diff --git a/soc/intel/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 b/soc/intel/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 index d0e7662195e..79ab1a14f22 100644 --- a/soc/intel/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 +++ b/soc/intel/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 @@ -1,7 +1,7 @@ # Copyright (c) 2020,2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -if SOC_INTEL_CAVS_V25 +if SOC_CAVSV25 # For backward compatibility, to be removed config SOC_SERIES_INTEL_CAVS_V25 @@ -53,4 +53,4 @@ endif config ADSP_NEED_POWER_ON_CACHE default y -endif # SOC_INTEL_CAVS_V25 +endif # SOC_CAVSV25 diff --git a/soc/intel/intel_adsp/cavs/Kconfig.soc b/soc/intel/intel_adsp/cavs/Kconfig.soc index 40bac2f99cc..9322bd3afaf 100644 --- a/soc/intel/intel_adsp/cavs/Kconfig.soc +++ b/soc/intel/intel_adsp/cavs/Kconfig.soc @@ -11,14 +11,14 @@ config SOC_SERIES_INTEL_ADSP_CAVS config SOC_SERIES default "intel_adsp_cavs" if SOC_SERIES_INTEL_ADSP_CAVS -config SOC_INTEL_CAVS_V25 +config SOC_CAVSV25 bool select SOC_SERIES_INTEL_ADSP_CAVS help Intel Tiger Lake config SOC - default "cavs25" if SOC_INTEL_CAVS_V25 + default "cavs25" if SOC_CAVSV25 config SOC_TOOLCHAIN_NAME - default "intel_tgl_adsp" if SOC_INTEL_CAVS_V25 + default "intel_tgl_adsp" if SOC_CAVSV25 diff --git a/soc/intel/intel_adsp/common/gdbstub_backend_sram.c b/soc/intel/intel_adsp/common/gdbstub_backend_sram.c index 93a9dfe5b75..e87f73d8044 100644 --- a/soc/intel/intel_adsp/common/gdbstub_backend_sram.c +++ b/soc/intel/intel_adsp/common/gdbstub_backend_sram.c @@ -19,7 +19,7 @@ #include #define RING_SIZE 512 -#if CONFIG_SOC_INTEL_CAVS_V25 +#if CONFIG_SOC_CAVSV25 #define SOF_GDB_WINDOW_OFFSET 1024 #elif CONFIG_SOC_INTEL_ACE15_MTPM || CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30 || \ CONFIG_SOC_INTEL_ACE40