Commit bc902564 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Carles Cufi
Browse files

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



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: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
parent 264d8125

soc/xtensa/intel_adsp/cavs_v15/Kconfig.defconfig.series

+9 −9
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ config SOC 
config SMP

	default y



config MP_NUM_CPUS

	default 2



config XTENSA_TIMER

	default n
@@ -59,12 +56,6 @@ config TEST_LOGGING_DEFAULTS 
	default n

	depends on TEST



config IPM_CAVS_IDC

	default y



config IPM

	default y



if LOG



config LOG_PRINTK
@@ -77,6 +68,15 @@ endif # LOG 


if SMP



config MP_NUM_CPUS

	default 2



config IPM

       default y



config IPM_CAVS_IDC

	default y



config SCHED_IPI_SUPPORTED

	default y if IPM_CAVS_IDC

soc/xtensa/intel_adsp/cavs_v18/Kconfig.defconfig.series

+11 −8
Original line number Diff line number Diff line
@@ -15,6 +15,15 @@ config SOC 
	string

	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

	default 400000000 if XTENSA_TIMER

	default 24000000 if CAVS_TIMER
@@ -66,12 +75,6 @@ if SMP 
config MP_NUM_CPUS

	default 2



config XTENSA_TIMER

	default n



config CAVS_TIMER

	default y



config IPM

	default y
@@ -81,8 +84,6 @@ config IPM_CAVS_IDC 
config SCHED_IPI_SUPPORTED

	default y if IPM_CAVS_IDC



endif # SMP



config IPM_INTEL_ADSP

	default y

	depends on IPM
@@ -92,4 +93,6 @@ config IPM_CONSOLE 
	depends on CONSOLE

	depends on IPM



endif # SMP



endif

soc/xtensa/intel_adsp/cavs_v20/Kconfig.defconfig.series

+9 −6
Original line number Diff line number Diff line
@@ -15,6 +15,15 @@ config SOC 
	string

	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

	default 400000000 if XTENSA_TIMER

	default 38400000 if CAVS_TIMER
@@ -65,12 +74,6 @@ if SMP 
config MP_NUM_CPUS

	default 2



config XTENSA_TIMER

	default n



config CAVS_TIMER

	default y



config IPM

	default y

soc/xtensa/intel_adsp/cavs_v25/Kconfig.defconfig.series

+9 −6
Original line number Diff line number Diff line
@@ -15,6 +15,15 @@ config SOC 
	string

	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

	default 400000000 if XTENSA_TIMER

	default 38400000 if CAVS_TIMER
@@ -65,12 +74,6 @@ if SMP 
config MP_NUM_CPUS

	default 2



config XTENSA_TIMER

	default n



config CAVS_TIMER

	default y



config IPM

	default y

CRA Git | Maintained and supported by SUSTech CRA and CCSE