mirror of https://github.com/thesofproject/sof.git
topology1: add build with no hotword or 16k dmic
Some builds require more memory, hotword can be handled by CRAS so lets add the ability to drop it. The 16kHz dmic is not needed either so lets drop that too. Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
This commit is contained in:
parent
2055068104
commit
57e0e149aa
|
@ -145,7 +145,7 @@ set(TPLGS
|
|||
"sof-tgl-max98357a-rt5682\;sof-tgl-max98357a-rt5682-rtnr\;-DCODEC=MAX98357A\;-DFMT=s16le\;-DPLATFORM=tgl\;-DAMP_SSP=1\;-DCHANNELS=2\;-DRTNR"
|
||||
"sof-tgl-max98357a-rt5682\;sof-adl-max98390-rt5682\;-DCODEC=MAX98390\;-DFMT=s32le\;-DPLATFORM=adl\;-DAMP_SSP=1\;-DBT_OFFLOAD"
|
||||
"sof-tgl-max98357a-rt5682\;sof-adl-max98390-rt5682-google-aec\;-DCODEC=MAX98390\;-DFMT=s32le\;-DPLATFORM=adl\;-DAMP_SSP=1\;-DBT_OFFLOAD\;-DGOOGLE_RTC_AUDIO_PROCESSING"
|
||||
"sof-tgl-max98357a-rt5682\;sof-adl-max98390-rt5682-rtnr\;-DCODEC=MAX98390\;-DFMT=s32le\;-DPLATFORM=adl\;-DAMP_SSP=1\;-DBT_OFFLOAD\;-DCHANNELS=2\;-DRTNR"
|
||||
"sof-tgl-max98357a-rt5682\;sof-adl-max98390-rt5682-rtnr\;-DCODEC=MAX98390\;-DFMT=s32le\;-DPLATFORM=adl\;-DAMP_SSP=1\;-DBT_OFFLOAD\;-DCHANNELS=2\;-DRTNR\;-DNOHOTWORD\;-DDMICPROC=rtnr\;-DNO16KDMIC"
|
||||
"sof-tgl-max98357a-rt5682\;sof-adl-max98390-ssp2-rt5682-ssp0\;-DCODEC=MAX98390\;-DFMT=s32le\;-DPLATFORM=adl\;-DAMP_SSP=2"
|
||||
"sof-tgl-max98357a-rt5682\;sof-adl-rt5682\;-DNO_AMP\;-DPLATFORM=adl"
|
||||
"sof-tgl-max98373-rt5682\;sof-tgl-max98373-rt5682\;-DAMP_SSP=1"
|
||||
|
|
|
@ -99,9 +99,10 @@ ifdef(`DMIC16KPROC_FILTER1', `define(PIPELINE_FILTER1, DMIC16KPROC_FILTER1)', `u
|
|||
ifdef(`DMIC16KPROC_FILTER2', `define(PIPELINE_FILTER2, DMIC16KPROC_FILTER2)', `undefine(`PIPELINE_FILTER2')')
|
||||
define(`PGA_NAME', Dmic1)
|
||||
|
||||
PIPELINE_PCM_ADD(sof/pipe-DMIC16KPROC-capture-16khz.m4,
|
||||
ifdef(NO16KDMIC, `',
|
||||
`PIPELINE_PCM_ADD(sof/pipe-DMIC16KPROC-capture-16khz.m4,
|
||||
DMIC_PIPELINE_16k_ID, DMIC_PCM_16k_ID, DMIC16K_PCM_CHANNELS, s32le,
|
||||
INTEL_GENERIC_DMIC_PERIOD_INV, 0, DMIC_16k_CORE_ID, 16000, 16000, 16000)
|
||||
INTEL_GENERIC_DMIC_PERIOD_INV, 0, DMIC_16k_CORE_ID, 16000, 16000, 16000)')
|
||||
|
||||
undefine(`PGA_NAME')
|
||||
undefine(`PIPELINE_FILTER1')
|
||||
|
@ -127,15 +128,18 @@ DAI_ADD(sof/pipe-dai-capture.m4,
|
|||
|
||||
# capture DAI is DMIC 1 using 2 periods
|
||||
# Buffers use s32le format, with 16 frame per 1000us on core 0 with priority 0
|
||||
DAI_ADD(sof/pipe-dai-capture.m4,
|
||||
ifdef(NO16KDMIC, `',
|
||||
`DAI_ADD(sof/pipe-dai-capture.m4,
|
||||
DMIC_PIPELINE_16k_ID, DMIC, 1, DMIC_DAI_LINK_16k_NAME,
|
||||
concat(`PIPELINE_SINK_', DMIC_PIPELINE_16k_ID), 2, s32le,
|
||||
INTEL_GENERIC_DMIC_PERIOD, 0, DMIC_16k_CORE_ID, SCHEDULE_TIME_DOMAIN_TIMER)
|
||||
INTEL_GENERIC_DMIC_PERIOD, 0, DMIC_16k_CORE_ID, SCHEDULE_TIME_DOMAIN_TIMER)')
|
||||
|
||||
dnl PCM_DUPLEX_ADD(name, pcm_id, playback, capture)
|
||||
dnl PCM_CAPTURE_ADD(name, pipeline, capture)
|
||||
PCM_CAPTURE_ADD(DMIC_48k_PCM_NAME, DMIC_PCM_48k_ID, concat(`PIPELINE_PCM_', DMIC_PIPELINE_48k_ID))
|
||||
PCM_CAPTURE_ADD(DMIC_16k_PCM_NAME, DMIC_PCM_16k_ID, concat(`PIPELINE_PCM_', DMIC_PIPELINE_16k_ID))
|
||||
|
||||
ifdef(NO16KDMIC, `',
|
||||
`PCM_CAPTURE_ADD(DMIC_16k_PCM_NAME, DMIC_PCM_16k_ID, concat(`PIPELINE_PCM_', DMIC_PIPELINE_16k_ID))')
|
||||
|
||||
#
|
||||
# BE configurations - overrides config in ACPI if present
|
||||
|
@ -152,7 +156,8 @@ ifelse(DMIC_DAI_CHANNELS, 4,
|
|||
DMIC_WORD_LENGTH(s32le), 200, DMIC, 0,
|
||||
PDM_CONFIG(DMIC, 0, STEREO_PDM0)))')
|
||||
|
||||
ifelse(DMIC16K_DAI_CHANNELS, 4,
|
||||
ifdef(NO16KDMIC, `',
|
||||
`ifelse(DMIC16K_DAI_CHANNELS, 4,
|
||||
`DAI_CONFIG(DMIC, 1, DMIC_DAI_LINK_16k_ID, DMIC_DAI_LINK_16k_NAME,
|
||||
DMIC_CONFIG(1, 2400000, 4800000, 40, 60, 16000,
|
||||
DMIC_WORD_LENGTH(s32le), 400, DMIC, 1,
|
||||
|
@ -160,4 +165,4 @@ ifelse(DMIC16K_DAI_CHANNELS, 4,
|
|||
`DAI_CONFIG(DMIC, 1, DMIC_DAI_LINK_16k_ID, DMIC_DAI_LINK_16k_NAME,
|
||||
DMIC_CONFIG(1, 2400000, 4800000, 40, 60, 16000,
|
||||
DMIC_WORD_LENGTH(s32le), 400, DMIC, 1,
|
||||
PDM_CONFIG(DMIC, 1, STEREO_PDM0)))')
|
||||
PDM_CONFIG(DMIC, 1, STEREO_PDM0)))')')
|
||||
|
|
|
@ -140,7 +140,11 @@ ifdef(`GOOGLE_RTC_AUDIO_PROCESSING', `define(`SPK_PLAYBACK_CORE', DMIC_PIPELINE_
|
|||
define(KWD_PIPE_SCH_DEADLINE_US, 5000)
|
||||
|
||||
# include the generic dmic with kwd
|
||||
include(`platform/intel/intel-generic-dmic-kwd.m4')
|
||||
ifdef(`NOHOTWORD',
|
||||
`
|
||||
define(NO16KDMIC)
|
||||
include(`platform/intel/intel-generic-dmic.m4')',
|
||||
`include(`platform/intel/intel-generic-dmic-kwd.m4')')
|
||||
|
||||
ifdef(`BT_OFFLOAD', `
|
||||
# BT offload support
|
||||
|
|
Loading…
Reference in New Issue