From 83f10c69e9dd45cfe46357998f6589395420cbd6 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Fri, 17 Nov 2023 16:56:43 +0100
Subject: [PATCH] toml: modularise TOML configuration

Split TOML configuration files into platform and module parts. Use
the C preprocessor to merge them back together.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/audio/aria/aria.toml                      |  25 +
 src/audio/copier/copier.toml                  |  30 +
 src/audio/crossover/crossover.toml            |  19 +
 src/audio/dcblock/dcblock.toml                |  16 +
 src/audio/drc/drc.toml                        |  16 +
 src/audio/eq_fir/eq_fir.toml                  |  19 +
 src/audio/eq_iir/eq_iir.toml                  |  19 +
 .../google/google_rtc_audio_processing.toml   |  17 +
 src/audio/kpb.toml                            |  18 +
 src/audio/mixin_mixout/mixin_mixout.toml      |  63 +++
 src/audio/multiband_drc/multiband_drc.toml    |  16 +
 src/audio/selector/selector.toml              |  19 +
 src/audio/src/src.toml                        |  40 ++
 src/audio/tdfb/tdfb.toml                      |  16 +
 src/audio/volume/gain.toml                    |  24 +
 src/audio/volume/peakvol.toml                 |  24 +
 src/probe/probe.toml                          |  14 +
 src/samples/audio/detect_test.toml            |  18 +
 src/samples/audio/smart_amp_test.toml         |  21 +
 tools/rimage/config/tgl-cavs-common.toml      | 159 ++++++
 tools/rimage/config/tgl.toml                  | 515 ------------------
 tools/rimage/config/tgl.toml.h                |   2 +
 tools/rimage/src/adsp_config.c                |   3 +
 23 files changed, 598 insertions(+), 515 deletions(-)
 create mode 100644 src/audio/aria/aria.toml
 create mode 100644 src/audio/copier/copier.toml
 create mode 100644 src/audio/crossover/crossover.toml
 create mode 100644 src/audio/dcblock/dcblock.toml
 create mode 100644 src/audio/drc/drc.toml
 create mode 100644 src/audio/eq_fir/eq_fir.toml
 create mode 100644 src/audio/eq_iir/eq_iir.toml
 create mode 100644 src/audio/google/google_rtc_audio_processing.toml
 create mode 100644 src/audio/kpb.toml
 create mode 100644 src/audio/mixin_mixout/mixin_mixout.toml
 create mode 100644 src/audio/multiband_drc/multiband_drc.toml
 create mode 100644 src/audio/selector/selector.toml
 create mode 100644 src/audio/src/src.toml
 create mode 100644 src/audio/tdfb/tdfb.toml
 create mode 100644 src/audio/volume/gain.toml
 create mode 100644 src/audio/volume/peakvol.toml
 create mode 100644 src/probe/probe.toml
 create mode 100644 src/samples/audio/detect_test.toml
 create mode 100644 src/samples/audio/smart_amp_test.toml
 create mode 100644 tools/rimage/config/tgl-cavs-common.toml
 delete mode 100644 tools/rimage/config/tgl.toml
 create mode 100644 tools/rimage/config/tgl.toml.h

diff --git a/src/audio/aria/aria.toml b/src/audio/aria/aria.toml
new file mode 100644
index 000000000000..5dd20c6cfc1d
--- /dev/null
+++ b/src/audio/aria/aria.toml
@@ -0,0 +1,25 @@
+	// Aria module config
+	[[module.entry]]
+	name = "ARIA"
+	uuid = "99F7166D-372C-43EF-81F6-22007AA15F03"
+	affinity_mask = "0x1"
+	instance_count = "8"
+	domain_types = "0"
+	load_type = "0"
+	init_config = "1"
+	module_type = "30"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 260, 1063000, 16, 21, 0, 0, 0,
+				1, 0, 0, 0, 260, 1873500, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 260, 2680000, 32, 42, 0, 0, 0,
+				3, 0, 0, 0, 260, 3591000, 64, 85, 0, 0, 0,
+				4, 0, 0, 0, 260, 4477000, 96, 128, 0, 0, 0,
+				5, 0, 0, 0, 260, 7195000, 192, 192, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/copier/copier.toml b/src/audio/copier/copier.toml
new file mode 100644
index 000000000000..895b2d6d220d
--- /dev/null
+++ b/src/audio/copier/copier.toml
@@ -0,0 +1,30 @@
+	[[module.entry]]
+	name = "COPIER"
+	uuid = "9BA00C83-CA12-4A83-943C-1FA2E82F9DDA"
+	affinity_mask = "0x1"
+	instance_count = "32"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "3"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [ 0, 0, 0, 0, 280, 640100, 45, 60, 0, 0, 0,
+				1, 0, 0, 0, 280, 1106300, 192, 192, 0, 0, 0,
+				2, 0, 0, 0, 280, 1573000, 45, 45, 0, 0, 0,
+				3, 0, 0, 0, 280, 2040600, 192, 256, 0, 0, 0,
+				4, 0, 0, 0, 280, 2507500, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 280, 2999000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 280, 3501000, 45, 60, 0, 0, 0,
+				7, 0, 0, 0, 280, 3927000, 192, 256, 0, 0, 0,
+				8, 0, 0, 0, 280, 4424000, 192, 256, 0, 0, 0,
+				9, 0, 0, 0, 280, 4941000, 192, 256, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/crossover/crossover.toml b/src/audio/crossover/crossover.toml
new file mode 100644
index 000000000000..2facff1ac97d
--- /dev/null
+++ b/src/audio/crossover/crossover.toml
@@ -0,0 +1,19 @@
+	// Crossover module config
+	// Note: Crossover has init_config set to 1 to let kernel know that the base_cfg_ext needs to
+	// be appended to the IPC payload. The Extension is needed to know the output pin indices.
+	[[module.entry]]
+	name = "XOVER"
+	uuid = "948C9AD1-806A-4131-AD6C-B2BDA9E35A9F"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	init_config = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/dcblock/dcblock.toml b/src/audio/dcblock/dcblock.toml
new file mode 100644
index 000000000000..a813dd4297c2
--- /dev/null
+++ b/src/audio/dcblock/dcblock.toml
@@ -0,0 +1,16 @@
+	// DCblock module config
+	[[module.entry]]
+	name = "DCBLOCK"
+	uuid = "B809EFAF-5681-42B1-9ED6-04BB012DD384"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/drc/drc.toml b/src/audio/drc/drc.toml
new file mode 100644
index 000000000000..e24897bfa6a3
--- /dev/null
+++ b/src/audio/drc/drc.toml
@@ -0,0 +1,16 @@
+	// DRC module config
+	[[module.entry]]
+	name = "DRC"
+	uuid = "B36EE4DA-006F-47F9-A06D-FECBE2D8B6CE"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/eq_fir/eq_fir.toml b/src/audio/eq_fir/eq_fir.toml
new file mode 100644
index 000000000000..7c3da9b05af4
--- /dev/null
+++ b/src/audio/eq_fir/eq_fir.toml
@@ -0,0 +1,19 @@
+	// eq fir module config
+	[[module.entry]]
+	name = "EQFIR"
+	uuid = "43A90CE7-f3A5-41Df-AC06-BA98651AE6A3"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/eq_iir/eq_iir.toml b/src/audio/eq_iir/eq_iir.toml
new file mode 100644
index 000000000000..c1968fcaa018
--- /dev/null
+++ b/src/audio/eq_iir/eq_iir.toml
@@ -0,0 +1,19 @@
+	// eq iir module config
+	[[module.entry]]
+	name = "EQIIR"
+	uuid = "5150C0E6-27F9-4EC8-8351-C705B642D12F"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/google/google_rtc_audio_processing.toml b/src/audio/google/google_rtc_audio_processing.toml
new file mode 100644
index 000000000000..67de5919aa66
--- /dev/null
+++ b/src/audio/google/google_rtc_audio_processing.toml
@@ -0,0 +1,17 @@
+	[[module.entry]]
+	name = "RTC_AEC"
+	uuid = "B780A0A6-269F-466F-B477-23DFA05AF758"
+	affinity_mask = "0x3"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "1"
+	module_type = "10"
+	init_config = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0x8, 0x2, 0x2, 0x1,
+	       0, 0, 0x8, 0x2, 0x2, 0x4,
+	       1, 0, 0x8, 0x2, 0x2, 0x1]
+	index = __COUNTER__
diff --git a/src/audio/kpb.toml b/src/audio/kpb.toml
new file mode 100644
index 000000000000..4ee13158a866
--- /dev/null
+++ b/src/audio/kpb.toml
@@ -0,0 +1,18 @@
+	[[module.entry]]
+	name = "KPB"
+	uuid = "D8218443-5FF3-4A4C-B388-6CFE07B9562E"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "1"
+	module_type = "0xB"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 14400, 1114000, 16, 16, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/mixin_mixout/mixin_mixout.toml b/src/audio/mixin_mixout/mixin_mixout.toml
new file mode 100644
index 000000000000..397671aebbfa
--- /dev/null
+++ b/src/audio/mixin_mixout/mixin_mixout.toml
@@ -0,0 +1,63 @@
+	[[module.entry]]
+	name = "MIXIN"
+	uuid = "39656EB2-3B71-4049-8D3F-F92CD5C43C09"
+	affinity_mask = "0x1"
+	instance_count = "30"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0,   0,   0xfeef, 0xc,  0x8,   0x45ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [ 0, 0, 0, 0, 296, 644000, 45, 60, 0, 0, 0,
+				1, 0, 0, 0, 296, 669900, 48, 64, 0, 0, 0,
+				2, 0, 0, 0, 296, 934000, 96, 128, 0, 0, 0,
+				3, 0, 0, 0, 296, 1137000, 96, 128, 0, 0, 0,
+				4, 0, 0, 0, 296, 1482000, 48, 64, 0, 0, 0,
+				5, 0, 0, 0, 296, 1746000, 96, 128, 0, 0, 0,
+				6, 0, 0, 0, 296, 2274000, 192, 256, 0, 0, 0,
+				7, 0, 0, 0, 296, 2700000, 48, 64, 0, 0, 0,
+				8, 0, 0, 0, 296, 2964000, 96, 128, 0, 0, 0,
+				9, 0, 0, 0, 296, 3492000, 192, 256, 0, 0, 0]
+	index = __COUNTER__
+
+	[[module.entry]]
+	name = "MIXOUT"
+	uuid = "3C56505A-24D7-418F-BDDC-C1F5A3AC2AE0"
+	affinity_mask = "0x1"
+	instance_count = "30"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "2"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [1, 0, 0xfeef, 0xc, 0x8, 0x45ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
+			0, 0, 0xfeef, 0xc, 0x8, 0x1ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 520, 649600, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 520, 966300, 96, 128, 0, 0, 0,
+				2, 0, 0, 0, 520, 2101000, 48, 64, 0, 0, 0,
+				3, 0, 0, 0, 520, 2500800, 192, 256, 0, 0, 0,
+				4, 0, 0, 0, 520, 2616700, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 520, 2964500, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 520, 4202000, 96, 128, 0, 0, 0,
+				7, 0, 0, 0, 520, 3730000, 192, 256, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/multiband_drc/multiband_drc.toml b/src/audio/multiband_drc/multiband_drc.toml
new file mode 100644
index 000000000000..f74e0d18d734
--- /dev/null
+++ b/src/audio/multiband_drc/multiband_drc.toml
@@ -0,0 +1,16 @@
+	// Multiband-DRC module config
+	[[module.entry]]
+	name = "MB_DRC"
+	uuid = "0D9F2256-8E4F-47B3-8448-239A334F1191"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/selector/selector.toml b/src/audio/selector/selector.toml
new file mode 100644
index 000000000000..85fdae6dace0
--- /dev/null
+++ b/src/audio/selector/selector.toml
@@ -0,0 +1,19 @@
+	[[module.entry]]
+	name = "MICSEL"
+	uuid = "32FE92C1-1E17-4FC2-9758-C7F3542E980A"
+	affinity_mask = "0x1"
+	instance_count = "8"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0xC"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xe, 0xa, 0x45ff, 1, 0, 0xfeef, 0xe, 0xa, 0x45ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 960, 488500, 16, 16, 0, 0, 0,
+			1, 0, 0, 0, 960, 964500, 16, 16, 0, 0, 0,
+			2, 0, 0, 0, 960, 2003000, 16, 16, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/src/src.toml b/src/audio/src/src.toml
new file mode 100644
index 000000000000..8fb0a7b7ec71
--- /dev/null
+++ b/src/audio/src/src.toml
@@ -0,0 +1,40 @@
+	[[module.entry]]
+	name = "SRCINTC"
+	uuid = "e61bb28d-149a-4c1f-b709-46823ef5f5ae"
+	affinity_mask = "0xF"
+	instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0x7"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xffff, 0xc, 0x8, 0x45ff,
+		1, 0, 0xf6c9, 0xc, 0x8, 0x45ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 12832, 1365500, 0, 0, 0, 1365, 0,
+		1, 0, 0, 0, 12832, 2302300, 0, 0, 0, 2302, 0,
+		2, 0, 0, 0, 12832, 3218200, 0, 0, 0, 3218, 0,
+		3, 0, 0, 0, 12832, 4169700, 0, 0, 0, 4169, 0,
+		4, 0, 0, 0, 12832, 5095100, 0, 0, 0, 5095, 0,
+		5, 0, 0, 0, 12832, 6014800, 0, 0, 0, 6014, 0,
+		6, 0, 0, 0, 12832, 6963500, 0, 0, 0, 6963, 0,
+		7, 0, 0, 0, 12832, 7791000, 0, 0, 0, 7791, 0,
+		8, 0, 0, 0, 12832, 8843000, 0, 0, 0, 8843, 0,
+		9, 0, 0, 0, 12832, 9755100, 0, 0, 0, 9755, 0,
+		10, 0, 0, 0, 12832, 10726500, 0, 0, 0, 10726, 0,
+		11, 0, 0, 0, 12832, 11624100, 0, 0, 0, 11624, 0,
+		12, 0, 0, 0, 12832, 12518700, 0, 0, 0, 12518, 0,
+		13, 0, 0, 0, 12832, 13555000, 0, 0, 0, 13555, 0,
+		14, 0, 0, 0, 12832, 14144500, 0, 0, 0, 14144, 0,
+		15, 0, 0, 0, 12832, 15809800, 0, 0, 0, 15809, 0,
+		16, 0, 0, 0, 12832, 16749000, 0, 0, 0, 16749, 0,
+		17, 0, 0, 0, 12832, 18433500, 0, 0, 0, 18433, 0,
+		18, 0, 0, 0, 12832, 19425900, 0, 0, 0, 19425, 0,
+		19, 0, 0, 0, 12832, 20396900, 0, 0, 0, 20396, 0,
+		20, 0, 0, 0, 12832, 20881000, 0, 0, 0, 20881, 0,
+		21, 0, 0, 0, 12832, 23431000, 0, 0, 0, 23431, 0,
+		22, 0, 0, 0, 12832, 30471000, 0, 0, 0, 30471, 0]
+	index = __COUNTER__
diff --git a/src/audio/tdfb/tdfb.toml b/src/audio/tdfb/tdfb.toml
new file mode 100644
index 000000000000..74d3f46f7f34
--- /dev/null
+++ b/src/audio/tdfb/tdfb.toml
@@ -0,0 +1,16 @@
+	// TDFB module config
+	[[module.entry]]
+	name = "TDFB"
+	uuid = "DD511749-D9FA-455C-B3A7-13585693F1AF"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/volume/gain.toml b/src/audio/volume/gain.toml
new file mode 100644
index 000000000000..7b52c39fcd46
--- /dev/null
+++ b/src/audio/volume/gain.toml
@@ -0,0 +1,24 @@
+	[[module.entry]]
+	name = "GAIN"
+	uuid = "61BCA9A8-18D0-4A18-8E7B-2639219804B7"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 416, 1786000, 192, 256, 0, 0, 0,
+				3, 0, 0, 0, 416, 2333000, 48, 64, 0, 0, 0,
+				4, 0, 0, 0, 416, 2910000, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 416, 3441000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 416, 4265000, 192, 256, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/audio/volume/peakvol.toml b/src/audio/volume/peakvol.toml
new file mode 100644
index 000000000000..b21437aa67db
--- /dev/null
+++ b/src/audio/volume/peakvol.toml
@@ -0,0 +1,24 @@
+	[[module.entry]]
+	name = "PEAKVOL"
+	uuid = "8A171323-94A3-4E1D-AFE9-FE5DBAA4C393"
+	affinity_mask = "0x1"
+	instance_count = "10"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "4"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x1ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0,
+				1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0,
+				2, 0, 0, 0, 480, 3786000, 192, 256, 0, 0, 0,
+				3, 0, 0, 0, 480, 4333000, 48, 64, 0, 0, 0,
+				4, 0, 0, 0, 480, 4910000, 192, 256, 0, 0, 0,
+				5, 0, 0, 0, 480, 5441000, 192, 256, 0, 0, 0,
+				6, 0, 0, 0, 480, 6265000, 192, 256, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/probe/probe.toml b/src/probe/probe.toml
new file mode 100644
index 000000000000..c4c2bcd075da
--- /dev/null
+++ b/src/probe/probe.toml
@@ -0,0 +1,14 @@
+	[[module.entry]]
+	name = "PROBE"
+	uuid = "7CAD0808-AB10-CD23-EF45-12AB34CD56EF"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 100000, 48, 48, 0, 1000, 0]
+	index = __COUNTER__
diff --git a/src/samples/audio/detect_test.toml b/src/samples/audio/detect_test.toml
new file mode 100644
index 000000000000..2e3c8aeaf2a9
--- /dev/null
+++ b/src/samples/audio/detect_test.toml
@@ -0,0 +1,18 @@
+	[[module.entry]]
+	name = "KDTEST"
+	uuid = "EBA8D51F-7827-47B5-82EE-DE6E7743AF67"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "1"
+	module_type = "8"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 480, 1114000, 64, 64, 0, 0, 0]
+	index = __COUNTER__
diff --git a/src/samples/audio/smart_amp_test.toml b/src/samples/audio/smart_amp_test.toml
new file mode 100644
index 000000000000..efa8f0945f78
--- /dev/null
+++ b/src/samples/audio/smart_amp_test.toml
@@ -0,0 +1,21 @@
+	// smart amp test module config
+	[[module.entry]]
+	name = "SMATEST"
+	uuid = "167A961E-8AE4-11EA-89F1-000C29CE1635"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0xD"
+	init_config = "1"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+
+	// pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
+			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
+
+	// mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+	index = __COUNTER__
diff --git a/tools/rimage/config/tgl-cavs-common.toml b/tools/rimage/config/tgl-cavs-common.toml
new file mode 100644
index 000000000000..6d6274624cbf
--- /dev/null
+++ b/tools/rimage/config/tgl-cavs-common.toml
@@ -0,0 +1,159 @@
+version = [2, 5]
+
+[adsp]
+name = "tgl"
+image_size = IMAGE_SIZE
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0x9F180000"
+size = "0x00002000"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xB0000000"
+size = "0x1000000"
+[[adsp.mem_zone]]
+type = "HP-SRAM"
+base = "0xBE000000"
+size = "0x800000"
+[[adsp.mem_zone]]
+type = "LP-SRAM"
+base = "0xBE800000"
+size = "0x40"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x9E000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xBE000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x5c"
+length = "0x464"
+[[cse.entry]]
+name = "cavs0015.met"
+offset = "0x4c0"
+length = "0x70"
+[[cse.entry]]
+name = "cavs0015"
+offset = "0x540"
+length = "0x0"  // calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "cavs0015.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x30000"
+
+	[[module.entry]]
+	name = "BRNGUP"
+	uuid = "61EB0CB9-34D8-4F59-A21D-04C54C21D3A4"
+	affinity_mask = "0x1"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0"
+	auto_start = "0"
+	index = __COUNTER__
+
+	[[module.entry]]
+	name = "BASEFW"
+	uuid = "383B9BE2-3518-4DB0-8891-B1470A8914F8"
+	affinity_mask = "3"
+	instance_count = "1"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "0"
+	auto_start = "0"
+	index = __COUNTER__
+
+#include <audio/mixin_mixout/mixin_mixout.toml>
+
+#ifdef CONFIG_COMP_COPIER
+#include <audio/copier/copier.toml>
+#endif
+
+#ifdef CONFIG_COMP_GAIN
+#include <audio/volume/gain.toml>
+#endif
+
+#ifdef CONFIG_COMP_PEAK_VOL
+#include <audio/volume/peakvol.toml>
+#endif
+
+#ifdef CONFIG_PROBE
+#include <probe/probe.toml>
+#endif
+
+#ifdef CONFIG_COMP_SRC
+#include <audio/src/src.toml>
+#endif
+
+#ifdef CONFIG_SAMPLE_SMART_AMP
+#include <samples/audio/smart_amp_test.toml>
+#endif
+
+#ifdef CONFIG_COMP_IIR
+#include <audio/eq_iir/eq_iir.toml>
+#endif
+
+#ifdef CONFIG_COMP_FIR
+#include <audio/eq_fir/eq_fir.toml>
+#endif
+
+#ifdef CONFIG_SAMPLE_KEYPHRASE
+#include <samples/audio/detect_test.toml>
+#endif
+
+#ifdef CONFIG_COMP_KPB
+#include <audio/kpb.toml>
+#endif
+
+#ifdef CONFIG_COMP_SEL
+#include <audio/selector/selector.toml>
+#endif
+
+#ifdef CONFIG_COMP_ARIA
+#include <audio/aria/aria.toml>
+#endif
+
+#ifdef CONFIG_COMP_DRC
+#include <audio/drc/drc.toml>
+#endif
+
+#ifdef CONFIG_COMP_CROSSOVER
+#include <audio/crossover/crossover.toml>
+#endif
+
+#ifdef CONFIG_COMP_MULTIBAND_DRC
+#include <audio/multiband_drc/multiband_drc.toml>
+#endif
+
+#ifdef CONFIG_COMP_DCBLOCK
+#include <audio/dcblock/dcblock.toml>
+#endif
+
+#ifdef CONFIG_COMP_TDFB
+#include <audio/tdfb/tdfb.toml>
+#endif
+
+#ifdef CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING
+#include <audio/google/google_rtc_audio_processing.toml>
+#endif
+
+[module]
+count = __COUNTER__
diff --git a/tools/rimage/config/tgl.toml b/tools/rimage/config/tgl.toml
deleted file mode 100644
index 3811e2e170c7..000000000000
--- a/tools/rimage/config/tgl.toml
+++ /dev/null
@@ -1,515 +0,0 @@
-version = [2, 5]
-
-[adsp]
-name = "tgl"
-image_size = "0x2F0000"
-alias_mask = "0xE0000000"
-
-[[adsp.mem_zone]]
-type = "ROM"
-base = "0x9F180000"
-size = "0x00002000"
-[[adsp.mem_zone]]
-type = "IMR"
-base = "0xB0000000"
-size = "0x1000000"
-[[adsp.mem_zone]]
-type = "HP-SRAM"
-base = "0xBE000000"
-size = "0x800000"
-[[adsp.mem_zone]]
-type = "LP-SRAM"
-base = "0xBE800000"
-size = "0x40"
-
-[[adsp.mem_alias]]
-type = "uncached"
-base = "0x9E000000"
-[[adsp.mem_alias]]
-type = "cached"
-base = "0xBE000000"
-
-[cse]
-partition_name = "ADSP"
-[[cse.entry]]
-name = "ADSP.man"
-offset = "0x5c"
-length = "0x464"
-[[cse.entry]]
-name = "cavs0015.met"
-offset = "0x4c0"
-length = "0x70"
-[[cse.entry]]
-name = "cavs0015"
-offset = "0x540"
-length = "0x0"  # calculated by rimage
-
-[css]
-
-[signed_pkg]
-name = "ADSP"
-[[signed_pkg.module]]
-name = "cavs0015.met"
-
-[adsp_file]
-[[adsp_file.comp]]
-base_offset = "0x2000"
-
-[fw_desc.header]
-name = "ADSPFW"
-load_offset = "0x30000"
-
-[module]
-count = 22
-	[[module.entry]]
-	name = "BRNGUP"
-	uuid = "61EB0CB9-34D8-4F59-A21D-04C54C21D3A4"
-	affinity_mask = "0x1"
-	instance_count = "1"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "0"
-	auto_start = "0"
-
-	[[module.entry]]
-	name = "BASEFW"
-	uuid = "383B9BE2-3518-4DB0-8891-B1470A8914F8"
-	affinity_mask = "3"
-	instance_count = "1"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "0"
-	auto_start = "0"
-
-	[[module.entry]]
-	name = "MIXIN"
-	uuid = "39656EB2-3B71-4049-8D3F-F92CD5C43C09"
-	affinity_mask = "0x1"
-	instance_count = "30"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "1"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0,   0,   0xfeef, 0xc,  0x8,   0x45ff,
-		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
-		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
-		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
-		   1, 0, 0xfeef, 0xc, 0x8, 0x1ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [ 0, 0, 0, 0, 296, 644000, 45, 60, 0, 0, 0,
-				1, 0, 0, 0, 296, 669900, 48, 64, 0, 0, 0,
-				2, 0, 0, 0, 296, 934000, 96, 128, 0, 0, 0,
-				3, 0, 0, 0, 296, 1137000, 96, 128, 0, 0, 0,
-				4, 0, 0, 0, 296, 1482000, 48, 64, 0, 0, 0,
-				5, 0, 0, 0, 296, 1746000, 96, 128, 0, 0, 0,
-				6, 0, 0, 0, 296, 2274000, 192, 256, 0, 0, 0,
-				7, 0, 0, 0, 296, 2700000, 48, 64, 0, 0, 0,
-				8, 0, 0, 0, 296, 2964000, 96, 128, 0, 0, 0,
-				9, 0, 0, 0, 296, 3492000, 192, 256, 0, 0, 0]
-
-	[[module.entry]]
-	name = "MIXOUT"
-	uuid = "3C56505A-24D7-418F-BDDC-C1F5A3AC2AE0"
-	affinity_mask = "0x1"
-	instance_count = "30"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "2"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [1, 0, 0xfeef, 0xc, 0x8, 0x45ff,
-			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
-			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
-			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
-			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
-			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
-			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
-			1, 0, 0xfeef, 0xc, 0x8, 0x1ff,
-			0, 0, 0xfeef, 0xc, 0x8, 0x1ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 520, 649600, 48, 64, 0, 0, 0,
-				1, 0, 0, 0, 520, 966300, 96, 128, 0, 0, 0,
-				2, 0, 0, 0, 520, 2101000, 48, 64, 0, 0, 0,
-				3, 0, 0, 0, 520, 2500800, 192, 256, 0, 0, 0,
-				4, 0, 0, 0, 520, 2616700, 192, 256, 0, 0, 0,
-				5, 0, 0, 0, 520, 2964500, 192, 256, 0, 0, 0,
-				6, 0, 0, 0, 520, 4202000, 96, 128, 0, 0, 0,
-				7, 0, 0, 0, 520, 3730000, 192, 256, 0, 0, 0]
-
-	[[module.entry]]
-	name = "COPIER"
-	uuid = "9BA00C83-CA12-4A83-943C-1FA2E82F9DDA"
-	affinity_mask = "0x1"
-	instance_count = "32"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "3"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
-			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
-			1, 0, 0xfeef, 0xf, 0xf, 0x1ff,
-			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [ 0, 0, 0, 0, 280, 640100, 45, 60, 0, 0, 0,
-				1, 0, 0, 0, 280, 1106300, 192, 192, 0, 0, 0,
-				2, 0, 0, 0, 280, 1573000, 45, 45, 0, 0, 0,
-				3, 0, 0, 0, 280, 2040600, 192, 256, 0, 0, 0,
-				4, 0, 0, 0, 280, 2507500, 192, 256, 0, 0, 0,
-				5, 0, 0, 0, 280, 2999000, 192, 256, 0, 0, 0,
-				6, 0, 0, 0, 280, 3501000, 45, 60, 0, 0, 0,
-				7, 0, 0, 0, 280, 3927000, 192, 256, 0, 0, 0,
-				8, 0, 0, 0, 280, 4424000, 192, 256, 0, 0, 0,
-				9, 0, 0, 0, 280, 4941000, 192, 256, 0, 0, 0]
-
-	[[module.entry]]
-	name = "PEAKVOL"
-	uuid = "8A171323-94A3-4E1D-AFE9-FE5DBAA4C393"
-	affinity_mask = "0x1"
-	instance_count = "10"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "4"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xa, 0x1ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0,
-				1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0,
-				2, 0, 0, 0, 480, 3786000, 192, 256, 0, 0, 0,
-				3, 0, 0, 0, 480, 4333000, 48, 64, 0, 0, 0,
-				4, 0, 0, 0, 480, 4910000, 192, 256, 0, 0, 0,
-				5, 0, 0, 0, 480, 5441000, 192, 256, 0, 0, 0,
-				6, 0, 0, 0, 480, 6265000, 192, 256, 0, 0, 0]
-
-	[[module.entry]]
-	name = "GAIN"
-	uuid = "61BCA9A8-18D0-4A18-8E7B-2639219804B7"
-	affinity_mask = "0x1"
-	instance_count = "40"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "9"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0,
-				1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0,
-				2, 0, 0, 0, 416, 1786000, 192, 256, 0, 0, 0,
-				3, 0, 0, 0, 416, 2333000, 48, 64, 0, 0, 0,
-				4, 0, 0, 0, 416, 2910000, 192, 256, 0, 0, 0,
-				5, 0, 0, 0, 416, 3441000, 192, 256, 0, 0, 0,
-				6, 0, 0, 0, 416, 4265000, 192, 256, 0, 0, 0]
-
-	[[module.entry]]
-	name = "PROBE"
-	uuid = "7CAD0808-AB10-CD23-EF45-12AB34CD56EF"
-	affinity_mask = "0x1"
-	instance_count = "1"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "9"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 4096, 100000, 48, 48, 0, 1000, 0]
-
-	[[module.entry]]
-	name = "SRCINTC"
-	uuid = "e61bb28d-149a-4c1f-b709-46823ef5f5ae"
-	affinity_mask = "0xF"
-	instance_count = "10"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "0x7"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xffff, 0xc, 0x8, 0x45ff,
-		1, 0, 0xf6c9, 0xc, 0x8, 0x45ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 12832, 1365500, 0, 0, 0, 1365, 0,
-		1, 0, 0, 0, 12832, 2302300, 0, 0, 0, 2302, 0,
-		2, 0, 0, 0, 12832, 3218200, 0, 0, 0, 3218, 0,
-		3, 0, 0, 0, 12832, 4169700, 0, 0, 0, 4169, 0,
-		4, 0, 0, 0, 12832, 5095100, 0, 0, 0, 5095, 0,
-		5, 0, 0, 0, 12832, 6014800, 0, 0, 0, 6014, 0,
-		6, 0, 0, 0, 12832, 6963500, 0, 0, 0, 6963, 0,
-		7, 0, 0, 0, 12832, 7791000, 0, 0, 0, 7791, 0,
-		8, 0, 0, 0, 12832, 8843000, 0, 0, 0, 8843, 0,
-		9, 0, 0, 0, 12832, 9755100, 0, 0, 0, 9755, 0,
-		10, 0, 0, 0, 12832, 10726500, 0, 0, 0, 10726, 0,
-		11, 0, 0, 0, 12832, 11624100, 0, 0, 0, 11624, 0,
-		12, 0, 0, 0, 12832, 12518700, 0, 0, 0, 12518, 0,
-		13, 0, 0, 0, 12832, 13555000, 0, 0, 0, 13555, 0,
-		14, 0, 0, 0, 12832, 14144500, 0, 0, 0, 14144, 0,
-		15, 0, 0, 0, 12832, 15809800, 0, 0, 0, 15809, 0,
-		16, 0, 0, 0, 12832, 16749000, 0, 0, 0, 16749, 0,
-		17, 0, 0, 0, 12832, 18433500, 0, 0, 0, 18433, 0,
-		18, 0, 0, 0, 12832, 19425900, 0, 0, 0, 19425, 0,
-		19, 0, 0, 0, 12832, 20396900, 0, 0, 0, 20396, 0,
-		20, 0, 0, 0, 12832, 20881000, 0, 0, 0, 20881, 0,
-		21, 0, 0, 0, 12832, 23431000, 0, 0, 0, 23431, 0,
-		22, 0, 0, 0, 12832, 30471000, 0, 0, 0, 30471, 0]
-
-	# smart amp test module config
-	[[module.entry]]
-	name = "SMATEST"
-	uuid = "167A961E-8AE4-11EA-89F1-000C29CE1635"
-	affinity_mask = "0x1"
-	instance_count = "1"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "0xD"
-	init_config = "1"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
-			0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
-
-	# eq iir module config
-	[[module.entry]]
-	name = "EQIIR"
-	uuid = "5150C0E6-27F9-4EC8-8351-C705B642D12F"
-	affinity_mask = "0x1"
-	instance_count = "40"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "9"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
-
-	# eq fir module config
-	[[module.entry]]
-	name = "EQFIR"
-	uuid = "43A90CE7-f3A5-41Df-AC06-BA98651AE6A3"
-	affinity_mask = "0x1"
-	instance_count = "40"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "9"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
-
-	[[module.entry]]
-	name = "KDTEST"
-	uuid = "EBA8D51F-7827-47B5-82EE-DE6E7743AF67"
-	affinity_mask = "0x1"
-	instance_count = "1"
-	domain_types = "0"
-	load_type = "1"
-	module_type = "8"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 480, 1114000, 64, 64, 0, 0, 0]
-
-	[[module.entry]]
-	name = "KPB"
-	uuid = "D8218443-5FF3-4A4C-B388-6CFE07B9562E"
-	affinity_mask = "0x1"
-	instance_count = "1"
-	domain_types = "0"
-	load_type = "1"
-	module_type = "0xB"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 14400, 1114000, 16, 16, 0, 0, 0]
-
-	[[module.entry]]
-	name = "MICSEL"
-	uuid = "32FE92C1-1E17-4FC2-9758-C7F3542E980A"
-	affinity_mask = "0x1"
-	instance_count = "8"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "0xC"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xe, 0xa, 0x45ff, 1, 0, 0xfeef, 0xe, 0xa, 0x45ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 960, 488500, 16, 16, 0, 0, 0,
-			1, 0, 0, 0, 960, 964500, 16, 16, 0, 0, 0,
-			2, 0, 0, 0, 960, 2003000, 16, 16, 0, 0, 0]
-
-	# Aria module config
-	[[module.entry]]
-	name = "ARIA"
-	uuid = "99F7166D-372C-43EF-81F6-22007AA15F03"
-	affinity_mask = "0x1"
-	instance_count = "8"
-	domain_types = "0"
-	load_type = "0"
-	init_config = "1"
-	module_type = "30"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
-			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
-
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 260, 1063000, 16, 21, 0, 0, 0,
-				1, 0, 0, 0, 260, 1873500, 192, 256, 0, 0, 0,
-				2, 0, 0, 0, 260, 2680000, 32, 42, 0, 0, 0,
-				3, 0, 0, 0, 260, 3591000, 64, 85, 0, 0, 0,
-				4, 0, 0, 0, 260, 4477000, 96, 128, 0, 0, 0,
-				5, 0, 0, 0, 260, 7195000, 192, 192, 0, 0, 0]
-
-	# DRC module config
-	[[module.entry]]
-	name = "DRC"
-	uuid = "B36EE4DA-006F-47F9-A06D-FECBE2D8B6CE"
-	affinity_mask = "0x1"
-	instance_count = "40"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "9"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
-
-	# Crossover module config
-	# Note: Crossover has init_config set to 1 to let kernel know that the base_cfg_ext needs to
-	# be appended to the IPC payload. The Extension is needed to know the output pin indices.
-	[[module.entry]]
-	name = "XOVER"
-	uuid = "948C9AD1-806A-4131-AD6C-B2BDA9E35A9F"
-	affinity_mask = "0x1"
-	instance_count = "40"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "9"
-	init_config = "1"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
-
-	# Multiband-DRC module config
-	[[module.entry]]
-	name = "MB_DRC"
-	uuid = "0D9F2256-8E4F-47B3-8448-239A334F1191"
-	affinity_mask = "0x1"
-	instance_count = "40"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "9"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
-
-	# DCblock module config
-	[[module.entry]]
-	name = "DCBLOCK"
-	uuid = "B809EFAF-5681-42B1-9ED6-04BB012DD384"
-	affinity_mask = "0x1"
-	instance_count = "40"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "9"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
-
-	# TDFB module config
-	[[module.entry]]
-	name = "TDFB"
-	uuid = "DD511749-D9FA-455C-B3A7-13585693F1AF"
-	affinity_mask = "0x1"
-	instance_count = "40"
-	domain_types = "0"
-	load_type = "0"
-	module_type = "9"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
-	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
-
-	[[module.entry]]
-	name = "RTC_AEC"
-	uuid = "B780A0A6-269F-466F-B477-23DFA05AF758"
-	affinity_mask = "0x3"
-	instance_count = "1"
-	domain_types = "0"
-	load_type = "1"
-	module_type = "10"
-	init_config = "1"
-	auto_start = "0"
-	sched_caps = [1, 0x00008000]
-
-	# pin = [dir, type, sample rate, size, container, channel-cfg]
-	pin = [0, 0, 0x8, 0x2, 0x2, 0x1,
-	       0, 0, 0x8, 0x2, 0x2, 0x4,
-	       1, 0, 0x8, 0x2, 0x2, 0x1]
diff --git a/tools/rimage/config/tgl.toml.h b/tools/rimage/config/tgl.toml.h
new file mode 100644
index 000000000000..1b0cab1b24e0
--- /dev/null
+++ b/tools/rimage/config/tgl.toml.h
@@ -0,0 +1,2 @@
+#define IMAGE_SIZE "0x2F0000"
+#include "tgl-cavs-common.toml"
diff --git a/tools/rimage/src/adsp_config.c b/tools/rimage/src/adsp_config.c
index 9a9423cbada7..189e3bf56cd2 100644
--- a/tools/rimage/src/adsp_config.c
+++ b/tools/rimage/src/adsp_config.c
@@ -1939,6 +1939,9 @@ static int parse_module(const toml_table_t *toml, struct parse_ctx *pctx,
 		if (ret < 0)
 			return err_key_parse("auto_start", NULL);
 
+		parse_uint32_key(mod_entry, &ctx_entry, "index", 1, &ret);
+		/* Ignore if "index" is missing for backwards compatibility */
+
 		header = &modules->mod_ext.ext_mod_config_array[i].header;
 		header->version_major = 2;
 		header->version_minor = 5;