rimage: mtl: extract platform part from mtl.toml.h

A part of mtl.toml.h is also needed for loadable modules, built for MTL. Extract it into a separate file. Signed-off-by: Guennadi Liakhovetski <[email protected]>
thesofproject · Jan 26, 2024 · a967d95 · a967d95
1 parent a8397de
commit a967d95
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 56 deletions.
diff --git a/tools/rimage/config/mtl.toml.h b/tools/rimage/config/mtl.toml.h
@@ -1,59 +1,4 @@
-version = [3, 0]
-
-[adsp]
-name = "mtl"
-image_size = "0x2C0000" # (22) bank * 128KB
-alias_mask = "0xE0000000"
-
-[[adsp.mem_zone]]
-type = "ROM"
-base = "0x1FF80000"
-size = "0x400"
-[[adsp.mem_zone]]
-type = "IMR"
-base = "0xA104A000"
-size = "0x2000"
-[[adsp.mem_zone]]
-type = "SRAM"
-base = "0xa00f0000"
-size = "0x100000"
-
-[[adsp.mem_alias]]
-type = "uncached"
-base = "0x40000000"
-[[adsp.mem_alias]]
-type = "cached"
-base = "0xA0000000"
-
-[cse]
-partition_name = "ADSP"
-[[cse.entry]]
-name = "ADSP.man"
-offset = "0x5c"
-length = "0x4b8"
-[[cse.entry]]
-name = "ADSP.met"
-offset = "0x4c0"
-length = "0x70"
-[[cse.entry]]
-name = "ADSP"
-offset = "0x540"
-length = "0x0"  # calculated by rimage
-
-[css]
-
-[signed_pkg]
-name = "ADSP"
-[[signed_pkg.module]]
-name = "ADSP.met"
-
-[adsp_file]
-[[adsp_file.comp]]
-base_offset = "0x2000"
-
-[fw_desc.header]
-name = "ADSPFW"
-load_offset = "0x40000"
+#include "platform-mtl.toml"
 
 	[[module.entry]]
 	name = "BRNGUP"

diff --git a/tools/rimage/config/platform-mtl.toml b/tools/rimage/config/platform-mtl.toml
@@ -0,0 +1,56 @@
+version = [3, 0]
+
+[adsp]
+name = "mtl"
+image_size = "0x2C0000" # (22) bank * 128KB
+alias_mask = "0xE0000000"
+
+[[adsp.mem_zone]]
+type = "ROM"
+base = "0x1FF80000"
+size = "0x400"
+[[adsp.mem_zone]]
+type = "IMR"
+base = "0xA104A000"
+size = "0x2000"
+[[adsp.mem_zone]]
+type = "SRAM"
+base = "0xa00f0000"
+size = "0x100000"
+
+[[adsp.mem_alias]]
+type = "uncached"
+base = "0x40000000"
+[[adsp.mem_alias]]
+type = "cached"
+base = "0xA0000000"
+
+[cse]
+partition_name = "ADSP"
+[[cse.entry]]
+name = "ADSP.man"
+offset = "0x5c"
+length = "0x4b8"
+[[cse.entry]]
+name = "ADSP.met"
+offset = "0x4c0"
+length = "0x70"
+[[cse.entry]]
+name = "ADSP"
+offset = "0x540"
+length = "0x0"  # calculated by rimage
+
+[css]
+
+[signed_pkg]
+name = "ADSP"
+[[signed_pkg.module]]
+name = "ADSP.met"
+
+[adsp_file]
+[[adsp_file.comp]]
+base_offset = "0x2000"
+
+[fw_desc.header]
+name = "ADSPFW"
+load_offset = "0x40000"