Topology2: sof-hda-generic.conf: make HDMI be optional

bardliao · bardliao · commit 1e60bed6454e · 2024-11-20T15:57:00.000+08:00
This is a preparation commit for splitting topologies by devices.
That means we will have generic hda topologies without HDMI.

Signed-off-by: Bard Liao &lt;yung-chuan.liao@linux.intel.com&gt;
diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf
@@ -85,8 +85,9 @@ Define {
 	DMIC0_PCM_ID	6
 }
 
-# always include HDMI config
-<hdmi-generic.conf>
+IncludeByKey.NUM_HDMIS {
+"[3-4]" "platform/intel/hdmi-generic.conf"
+}
 
 Object.Widget.virtual [
 	{

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,9 @@ Define {`
`85`	`85`	`DMIC0_PCM_ID 6`
`86`	`86`	`}`
`87`	`87`
`88`		`-# always include HDMI config`
`89`		`-<hdmi-generic.conf>`
	`88`	`+IncludeByKey.NUM_HDMIS {`
	`89`	`+"[3-4]" "platform/intel/hdmi-generic.conf"`
	`90`	`+}`
`90`	`91`
`91`	`92`	`Object.Widget.virtual [`
`92`	`93`	`{`