From 64a51705338ddc7397c18fedb57abeac1dd323cb Mon Sep 17 00:00:00 2001 From: Chao Song <chao.song@linux.intel.com> Date: Fri, 22 Sep 2023 14:00:34 +0800 Subject: [PATCH] sof: config: split toml configs This patch splits toml configs to platform related configs and module related configs. Link: https://github.com/thesofproject/sof/issues/7270 Signed-off-by: Chao Song <chao.song@linux.intel.com> --- config/{imx8.toml => imx8/10-platform.toml} | 0 config/{imx8m.toml => imx8m/10-platform.toml} | 0 config/{imx8x.toml => imx8x/10-platform.toml} | 0 config/lnl/10-platform.toml | 57 +++++++++++++++++ config/{lnl.toml => lnl/20-module.toml} | 58 ------------------ config/mtl/10-platform.toml | 57 +++++++++++++++++ config/{mtl.toml => mtl/20-module.toml} | 58 ------------------ config/tgl-h/10-platform.toml | 60 ++++++++++++++++++ config/{tgl.toml => tgl-h/20-module.toml} | 61 ------------------- config/tgl/10-platform.toml | 60 ++++++++++++++++++ config/{tgl-h.toml => tgl/20-module.toml} | 61 ------------------- 11 files changed, 234 insertions(+), 238 deletions(-) rename config/{imx8.toml => imx8/10-platform.toml} (100%) rename config/{imx8m.toml => imx8m/10-platform.toml} (100%) rename config/{imx8x.toml => imx8x/10-platform.toml} (100%) create mode 100644 config/lnl/10-platform.toml rename config/{lnl.toml => lnl/20-module.toml} (94%) create mode 100644 config/mtl/10-platform.toml rename config/{mtl.toml => mtl/20-module.toml} (95%) create mode 100644 config/tgl-h/10-platform.toml rename config/{tgl.toml => tgl-h/20-module.toml} (93%) create mode 100644 config/tgl/10-platform.toml rename config/{tgl-h.toml => tgl/20-module.toml} (93%) diff --git a/config/imx8.toml b/config/imx8/10-platform.toml similarity index 100% rename from config/imx8.toml rename to config/imx8/10-platform.toml diff --git a/config/imx8m.toml b/config/imx8m/10-platform.toml similarity index 100% rename from config/imx8m.toml rename to config/imx8m/10-platform.toml diff --git a/config/imx8x.toml b/config/imx8x/10-platform.toml similarity index 100% rename from config/imx8x.toml rename to config/imx8x/10-platform.toml diff --git a/config/lnl/10-platform.toml b/config/lnl/10-platform.toml new file mode 100644 index 000000000000..3bac03e707db --- /dev/null +++ b/config/lnl/10-platform.toml @@ -0,0 +1,57 @@ +version = [3, 0] + +[adsp] +name = "lnl" +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" +partition_usage = "0x23" +[[signed_pkg.module]] +name = "ADSP.met" + +[adsp_file] +[[adsp_file.comp]] +base_offset = "0x2000" + +[fw_desc.header] +name = "ADSPFW" +load_offset = "0x40000" diff --git a/config/lnl.toml b/config/lnl/20-module.toml similarity index 94% rename from config/lnl.toml rename to config/lnl/20-module.toml index 76bcdfb18d93..91bf1f81ee6e 100644 --- a/config/lnl.toml +++ b/config/lnl/20-module.toml @@ -1,61 +1,3 @@ -version = [3, 0] - -[adsp] -name = "lnl" -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" -partition_usage = "0x23" -[[signed_pkg.module]] -name = "ADSP.met" - -[adsp_file] -[[adsp_file.comp]] -base_offset = "0x2000" - -[fw_desc.header] -name = "ADSPFW" -load_offset = "0x40000" - [module] count = 23 [[module.entry]] diff --git a/config/mtl/10-platform.toml b/config/mtl/10-platform.toml new file mode 100644 index 000000000000..33e5d94ca7d1 --- /dev/null +++ b/config/mtl/10-platform.toml @@ -0,0 +1,57 @@ +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" +partition_usage = "0x23" +[[signed_pkg.module]] +name = "ADSP.met" + +[adsp_file] +[[adsp_file.comp]] +base_offset = "0x2000" + +[fw_desc.header] +name = "ADSPFW" +load_offset = "0x40000" diff --git a/config/mtl.toml b/config/mtl/20-module.toml similarity index 95% rename from config/mtl.toml rename to config/mtl/20-module.toml index 844fa7ef77a8..806fce605c90 100644 --- a/config/mtl.toml +++ b/config/mtl/20-module.toml @@ -1,61 +1,3 @@ -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" -partition_usage = "0x23" -[[signed_pkg.module]] -name = "ADSP.met" - -[adsp_file] -[[adsp_file.comp]] -base_offset = "0x2000" - -[fw_desc.header] -name = "ADSPFW" -load_offset = "0x40000" - [module] count = 23 [[module.entry]] diff --git a/config/tgl-h/10-platform.toml b/config/tgl-h/10-platform.toml new file mode 100644 index 000000000000..8e98866d9bcb --- /dev/null +++ b/config/tgl-h/10-platform.toml @@ -0,0 +1,60 @@ +version = [2, 5] + +[adsp] +name = "tgl" +image_size = "0x1F0000" # (30 + 1) bank * 64KB +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" diff --git a/config/tgl.toml b/config/tgl-h/20-module.toml similarity index 93% rename from config/tgl.toml rename to config/tgl-h/20-module.toml index 15638424c9fe..9ae57053e0f1 100644 --- a/config/tgl.toml +++ b/config/tgl-h/20-module.toml @@ -1,64 +1,3 @@ -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 = 20 [[module.entry]] diff --git a/config/tgl/10-platform.toml b/config/tgl/10-platform.toml new file mode 100644 index 000000000000..ffbf15862ac4 --- /dev/null +++ b/config/tgl/10-platform.toml @@ -0,0 +1,60 @@ +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" diff --git a/config/tgl-h.toml b/config/tgl/20-module.toml similarity index 93% rename from config/tgl-h.toml rename to config/tgl/20-module.toml index 04a0df56a861..9ae57053e0f1 100644 --- a/config/tgl-h.toml +++ b/config/tgl/20-module.toml @@ -1,64 +1,3 @@ -version = [2, 5] - -[adsp] -name = "tgl" -image_size = "0x1F0000" # (30 + 1) bank * 64KB -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 = 20 [[module.entry]]