forked from thesofproject/sof
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app: Intel: switch cAVS2.5 configs to use IPC4 by default
The IPC3 build is no longer supported for Intel cAVS2.5 target, so move the config overlay definitions as-is to the main board config file. To smoothen the transition, keep an empty IPC4 overlay file in the tree to allow developers to update build scripts. Signed-off-by: Kai Vehmanen <[email protected]>
- Loading branch information
Showing
4 changed files
with
126 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,5 @@ | ||
| CONFIG_IPC_MAJOR_4=y | ||
| CONFIG_INTEL_DMIC_NHLT=y | ||
| CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" | ||
| CONFIG_PCM_CONVERTER_FORMAT_S16LE=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S24LE=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S32LE=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y | ||
| CONFIG_COMP_VOLUME_WINDOWS_FADE=y | ||
| CONFIG_COMP_DRC=y | ||
|
|
||
| # route SOF logs to Zephyr logging subsystem | ||
| CONFIG_SOF_LOG_LEVEL_INF=y | ||
| CONFIG_ZEPHYR_LOG=y | ||
|
|
||
| # use mtrace for IPC4 and disable etrace/ADSP backend | ||
| CONFIG_LOG_BACKEND_ADSP_MTRACE=y | ||
| CONFIG_LOG_BACKEND_ADSP=n | ||
| CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y | ||
| CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y | ||
| CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y | ||
| CONFIG_LOG_FUNC_NAME_PREFIX_INF=y | ||
| CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y | ||
|
|
||
| CONFIG_INTEL_ADSP_TIMER=y | ||
| CONFIG_FORMAT_CONVERT_HIFI3=n | ||
|
|
||
| CONFIG_PM=y | ||
| CONFIG_PM_DEVICE=y | ||
| CONFIG_PM_DEVICE_RUNTIME=y | ||
| CONFIG_PM_POLICY_CUSTOM=y | ||
|
|
||
| CONFIG_CLOCK_CONTROL_ADSP=y | ||
| CONFIG_CLOCK_CONTROL=y | ||
|
|
||
| CONFIG_ZEPHYR_NATIVE_DRIVERS=y | ||
| CONFIG_DAI=y | ||
| CONFIG_DAI_INIT_PRIORITY=70 | ||
| CONFIG_DAI_INTEL_SSP=y | ||
| CONFIG_DAI_INTEL_DMIC=y | ||
| CONFIG_DAI_INTEL_ALH=y | ||
| CONFIG_DAI_INTEL_DMIC_NHLT=y | ||
| CONFIG_DAI_INTEL_HDA=y | ||
| CONFIG_DAI_DMIC_HW_IOCLK=38400000 | ||
|
|
||
| CONFIG_INTEL_ADSP_IPC=y | ||
|
|
||
| CONFIG_DMA=y | ||
| CONFIG_DMA_DW_LLI_POOL_SIZE=100 | ||
| CONFIG_DMA_DW_HW_LLI=y | ||
| CONFIG_DMA_DW_FIFO_PARTITION=y | ||
| CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y | ||
|
|
||
| CONFIG_HEAP_MEM_POOL_SIZE=8192 | ||
| # This file is empty as IPC4 now the default. | ||
| # | ||
| # The file is kept around for the time being to | ||
| # smoothen the transition for users who use | ||
| # this overlay file in their build scripts. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,5 @@ | ||
| CONFIG_IPC_MAJOR_4=y | ||
| CONFIG_INTEL_DMIC_NHLT=y | ||
| CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs" | ||
| CONFIG_PCM_CONVERTER_FORMAT_S16LE=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S24LE=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S32LE=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S24_3LE=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y | ||
| CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y | ||
| CONFIG_COMP_VOLUME_WINDOWS_FADE=y | ||
| CONFIG_COMP_DRC=y | ||
|
|
||
| # route SOF logs to Zephyr logging subsystem | ||
| CONFIG_SOF_LOG_LEVEL_INF=y | ||
| CONFIG_ZEPHYR_LOG=y | ||
|
|
||
| # use mtrace for IPC4 and disable etrace/ADSP backend | ||
| CONFIG_LOG_BACKEND_ADSP_MTRACE=y | ||
| CONFIG_LOG_BACKEND_ADSP=n | ||
| CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y | ||
| CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y | ||
| CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y | ||
| CONFIG_LOG_FUNC_NAME_PREFIX_INF=y | ||
| CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y | ||
|
|
||
| CONFIG_INTEL_ADSP_TIMER=y | ||
| CONFIG_FORMAT_CONVERT_HIFI3=n | ||
|
|
||
| CONFIG_PM=y | ||
| CONFIG_PM_DEVICE=y | ||
| CONFIG_PM_DEVICE_RUNTIME=y | ||
| CONFIG_PM_POLICY_CUSTOM=y | ||
|
|
||
| CONFIG_CLOCK_CONTROL_ADSP=y | ||
| CONFIG_CLOCK_CONTROL=y | ||
|
|
||
| CONFIG_ZEPHYR_NATIVE_DRIVERS=y | ||
| CONFIG_DAI=y | ||
| CONFIG_DAI_INIT_PRIORITY=70 | ||
| CONFIG_DAI_INTEL_SSP=y | ||
| CONFIG_DAI_INTEL_DMIC=y | ||
| CONFIG_DAI_INTEL_ALH=y | ||
| CONFIG_DAI_INTEL_DMIC_NHLT=y | ||
| CONFIG_DAI_INTEL_HDA=y | ||
| CONFIG_DAI_DMIC_HW_IOCLK=38400000 | ||
|
|
||
| CONFIG_INTEL_ADSP_IPC=y | ||
|
|
||
| CONFIG_DMA=y | ||
| CONFIG_DMA_DW_LLI_POOL_SIZE=100 | ||
| CONFIG_DMA_DW_HW_LLI=y | ||
| CONFIG_DMA_DW_FIFO_PARTITION=y | ||
| CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y | ||
|
|
||
| CONFIG_HEAP_MEM_POOL_SIZE=8192 | ||
| # This file is empty as IPC4 now the default. | ||
| # | ||
| # The file is kept around for the time being to | ||
| # smoothen the transition for users who use | ||
| # this overlay file in their build scripts. |