Skip to content

Commit

Permalink
sof: config: split toml configs for IPC4 platforms
Browse files Browse the repository at this point in the history
This patch splits IPC4 toml configs to platform
related configs and module related configs.

Signed-off-by: Chao Song <[email protected]>
  • Loading branch information
Chao Song committed Sep 22, 2023
1 parent 24bae6a commit f744c8f
Show file tree
Hide file tree
Showing 8 changed files with 236 additions and 240 deletions.
60 changes: 1 addition & 59 deletions config/lnl.toml → config/module/lnl.toml
Original file line number Diff line number Diff line change
@@ -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]]
Expand Down Expand Up @@ -348,7 +290,7 @@ count = 23
# 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]]
[[module.entry]]
name = "MUX"
uuid = "64ce6e35-857a-4878-ace8-e2a2f42e3069"
affinity_mask = "0x1"
Expand Down
60 changes: 1 addition & 59 deletions config/mtl.toml → config/module/mtl.toml
Original file line number Diff line number Diff line change
@@ -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]]
Expand Down Expand Up @@ -391,7 +333,7 @@ count = 23
# 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]]
[[module.entry]]
name = "MUX"
uuid = "64ce6e35-857a-4878-ace8-e2a2f42e3069"
affinity_mask = "0x1"
Expand Down
61 changes: 0 additions & 61 deletions config/tgl-h.toml → config/module/tgl-h.toml
Original file line number Diff line number Diff line change
@@ -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]]
Expand Down
61 changes: 0 additions & 61 deletions config/tgl.toml → config/module/tgl.toml
Original file line number Diff line number Diff line change
@@ -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]]
Expand Down
57 changes: 57 additions & 0 deletions config/platform/lnl.toml
Original file line number Diff line number Diff line change
@@ -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"
57 changes: 57 additions & 0 deletions config/platform/mtl.toml
Original file line number Diff line number Diff line change
@@ -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"
Loading

0 comments on commit f744c8f

Please sign in to comment.