michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cavs: unify defconfigs for v15, v18, v20 and v25

Browse source 
Unify default configurations to support both SMP and UP:

1. make SMP default, although it's currently disabled in prj.conf
2. use CAVS timer by default in both UP and SMP configurations
3. make MP_NUM_CPUS, IPM and IPM_CAVS_IDC depend on SMP

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2020-10-07 09:21:38 +02:00 • committed by Carles Cufí
commit bc90256423
4 changed files with 38 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
soc/xtensa/intel_adsp/cavs_v15/Kconfig.defconfig.series
View file

@ -18,9 +18,6 @@ config SOC
config SMP config SMP
default y default y
config MP_NUM_CPUS
default 2
config XTENSA_TIMER config XTENSA_TIMER
default n default n
@ -59,12 +56,6 @@ config TEST_LOGGING_DEFAULTS
default n default n
depends on TEST depends on TEST
config IPM_CAVS_IDC
default y
config IPM
default y
if LOG if LOG
config LOG_PRINTK config LOG_PRINTK
@ -77,6 +68,15 @@ endif # LOG
if SMP if SMP
config MP_NUM_CPUS
default 2
config IPM
default y
config IPM_CAVS_IDC
default y
config SCHED_IPI_SUPPORTED config SCHED_IPI_SUPPORTED
default y if IPM_CAVS_IDC default y if IPM_CAVS_IDC

19
soc/xtensa/intel_adsp/cavs_v18/Kconfig.defconfig.series
View file

@ -15,6 +15,15 @@ config SOC
string string
default "intel_cavs_18" default "intel_cavs_18"
config SMP
default y
config XTENSA_TIMER
default n
config CAVS_TIMER
default y
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 400000000 if XTENSA_TIMER default 400000000 if XTENSA_TIMER
default 24000000 if CAVS_TIMER default 24000000 if CAVS_TIMER
@ -66,12 +75,6 @@ if SMP
config MP_NUM_CPUS config MP_NUM_CPUS
default 2 default 2
config XTENSA_TIMER
default n
config CAVS_TIMER
default y
config IPM config IPM
default y default y
@ -81,8 +84,6 @@ config IPM_CAVS_IDC
config SCHED_IPI_SUPPORTED config SCHED_IPI_SUPPORTED
default y if IPM_CAVS_IDC default y if IPM_CAVS_IDC
endif # SMP
config IPM_INTEL_ADSP config IPM_INTEL_ADSP
default y default y
depends on IPM depends on IPM
@ -92,4 +93,6 @@ config IPM_CONSOLE
depends on CONSOLE depends on CONSOLE
depends on IPM depends on IPM
endif # SMP
endif endif

15
soc/xtensa/intel_adsp/cavs_v20/Kconfig.defconfig.series
View file

@ -15,6 +15,15 @@ config SOC
string string
default "intel_cavs_20" default "intel_cavs_20"
config SMP
default y
config XTENSA_TIMER
default n
config CAVS_TIMER
default y
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 400000000 if XTENSA_TIMER default 400000000 if XTENSA_TIMER
default 38400000 if CAVS_TIMER default 38400000 if CAVS_TIMER
@ -65,12 +74,6 @@ if SMP
config MP_NUM_CPUS config MP_NUM_CPUS
default 2 default 2
config XTENSA_TIMER
default n
config CAVS_TIMER
default y
config IPM config IPM
default y default y

15
soc/xtensa/intel_adsp/cavs_v25/Kconfig.defconfig.series
View file

@ -15,6 +15,15 @@ config SOC
string string
default "intel_cavs_25" default "intel_cavs_25"
config SMP
default y
config XTENSA_TIMER
default n
config CAVS_TIMER
default y
config SYS_CLOCK_HW_CYCLES_PER_SEC config SYS_CLOCK_HW_CYCLES_PER_SEC
default 400000000 if XTENSA_TIMER default 400000000 if XTENSA_TIMER
default 38400000 if CAVS_TIMER default 38400000 if CAVS_TIMER
@ -65,12 +74,6 @@ if SMP
config MP_NUM_CPUS config MP_NUM_CPUS
default 2 default 2
config XTENSA_TIMER
default n
config CAVS_TIMER
default y
config IPM config IPM
default y default y