Skip to content

Commit

Permalink
Copy rimage toml config files to SOF repository
Browse files Browse the repository at this point in the history
This patch copies rimage/config to sof/config,
and use toml files in sof/config for signing.

Firmware manifest configuration files should stay
with SOF instead of rimage tool.

Deletion of rimage/config will be done later.

Link: thesofproject#7270

Signed-off-by: Chao Song <[email protected]>
  • Loading branch information
Chao Song committed Mar 21, 2023
1 parent afb1a0d commit 24d5925
Show file tree
Hide file tree
Showing 28 changed files with 1,736 additions and 4 deletions.
49 changes: 49 additions & 0 deletions config/apl.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
version = [1, 8]

[adsp]
name = "apl"
image_size = "0x0A0000" # (8 + 2) bank * 64KB

[[adsp.mem_zone]]
type = "ROM"
base = "0xBEFE0000"
size = "0x00002000"
[[adsp.mem_zone]]
type = "SRAM"
base = "0xA000A000"
size = "0x100000"

[cse]
partition_name = "ADSP"
[[cse.entry]]
name = "ADSP.man"
offset = "0x58"
length = "0x378"
[[cse.entry]]
name = "cavs0015.met"
offset = "0x400"
length = "0x60"
[[cse.entry]]
name = "cavs0015"
offset = "0x480"
length = "0x0" # calculated by rimage

[css]

[signed_pkg]
name = "ADSP"
[[signed_pkg.module]]
name = "cavs0015.met"

[partition_info]
name = "ADSP"
[[partition_info.module]]
name = "cavs0015.met"

[adsp_file]
[[adsp_file.comp]]
base_offset = "0x2000"

[fw_desc.header]
name = "ADSPFW"
load_offset = "0x2000"
15 changes: 15 additions & 0 deletions config/bdw.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version = [1, 0] # use simple file write

[adsp]
name = "bdw"

[[adsp.mem_zone]]
type = "IRAM"
base = "0"
size = "0x50000"
host_offset = "0x000A0000"
[[adsp.mem_zone]]
type = "DRAM"
base = "0x00400000"
size = "0xA0000"
host_offset = "0x0"
15 changes: 15 additions & 0 deletions config/bsw.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version = [1, 0] # use simple file write

[adsp]
name = "bsw"

[[adsp.mem_zone]]
type = "IRAM"
base = "0xFF2C0000"
size = "0x14000"
host_offset = "0x0C0000"
[[adsp.mem_zone]]
type = "DRAM"
base = "0xFF300000"
size = "0x28000"
host_offset = "0x100000"
15 changes: 15 additions & 0 deletions config/byt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version = [1, 0] # use simple file write

[adsp]
name = "byt"

[[adsp.mem_zone]]
type = "IRAM"
base = "0xFF2C0000"
size = "0x14000"
host_offset = "0x0C0000"
[[adsp.mem_zone]]
type = "DRAM"
base = "0xFF300000"
size = "0x28000"
host_offset = "0x100000"
15 changes: 15 additions & 0 deletions config/cht.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version = [1, 0] # use simple file write

[adsp]
name = "cht"

[[adsp.mem_zone]]
type = "IRAM"
base = "0xFF2C0000"
size = "0x14000"
host_offset = "0x0C0000"
[[adsp.mem_zone]]
type = "DRAM"
base = "0xFF300000"
size = "0x28000"
host_offset = "0x100000"
53 changes: 53 additions & 0 deletions config/cnl.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
version = [1, 8]

[adsp]
name = "cnl"
image_size = "0x300000" # (47 + 1) bank * 64KB

[[adsp.mem_zone]]
type = "ROM"
base = "0xBEFE0000"
size = "0x00002000"
[[adsp.mem_zone]]
type = "IMR"
base = "0xB0038000"
size = "0x100000"
[[adsp.mem_zone]]
type = "SRAM"
base = "0xBE040000"
size = "0x100000"

[cse]
partition_name = "ADSP"
[[cse.entry]]
name = "ADSP.man"
offset = "0x58"
length = "0x378"
[[cse.entry]]
name = "cavs0015.met"
offset = "0x400"
length = "0x60"
[[cse.entry]]
name = "cavs0015"
offset = "0x480"
length = "0x0" # calculated by rimage

[css]

[signed_pkg]
name = "ADSP"
[[signed_pkg.module]]
name = "cavs0015.met"

[partition_info]
name = "ADSP"
[[partition_info.module]]
name = "cavs0015.met"

[adsp_file]
[[adsp_file.comp]]
base_offset = "0x2000"

[fw_desc.header]
name = "ADSPFW"
load_offset = "0x30000"
15 changes: 15 additions & 0 deletions config/hsw.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version = [1, 0] # use simple file write

[adsp]
name = "hsw"

[[adsp.mem_zone]]
type = "IRAM"
base = "0"
size = "0x60000"
host_offset = "0x80000"
[[adsp.mem_zone]]
type = "DRAM"
base = "0x00400000"
size = "0x80000"
host_offset = "0x0"
53 changes: 53 additions & 0 deletions config/icl.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
version = [1, 8]

[adsp]
name = "icl"
image_size = "0x300000" # (47 + 1) bank * 64KB

[[adsp.mem_zone]]
type = "ROM"
base = "0xBEFE0000"
size = "0x00002000"
[[adsp.mem_zone]]
type = "IMR"
base = "0xB0038000"
size = "0x100000"
[[adsp.mem_zone]]
type = "SRAM"
base = "0xBE040000"
size = "0x100000"

[cse]
partition_name = "ADSP"
[[cse.entry]]
name = "ADSP.man"
offset = "0x58"
length = "0x378"
[[cse.entry]]
name = "cavs0015.met"
offset = "0x400"
length = "0x60"
[[cse.entry]]
name = "cavs0015"
offset = "0x480"
length = "0x0" # calculated by rimage

[css]

[signed_pkg]
name = "ADSP"
[[signed_pkg.module]]
name = "cavs0015.met"

[partition_info]
name = "ADSP"
[[partition_info.module]]
name = "cavs0015.met"

[adsp_file]
[[adsp_file.comp]]
base_offset = "0x2000"

[fw_desc.header]
name = "ADSPFW"
load_offset = "0x30000"
20 changes: 20 additions & 0 deletions config/imx8.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version = [1, 0] # use simple file write

[adsp]
name = "imx8"

[[adsp.mem_zone]]
type = "IRAM"
base = "0x596F8000"
size = "0x800"
host_offset = "0x10000"
[[adsp.mem_zone]]
type = "DRAM"
base = "0x596E8000"
size = "0x8000"
host_offset = "0x0"
[[adsp.mem_zone]]
type = "SRAM"
base = "0x92400000"
size = "0x800000"
host_offset = "0x0"
20 changes: 20 additions & 0 deletions config/imx8m.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version = [1, 0] # use simple file write

[adsp]
name = "imx8m"

[[adsp.mem_zone]]
type = "IRAM"
base = "0x3b6F8000"
size = "0x800"
host_offset = "0x10000"
[[adsp.mem_zone]]
type = "DRAM"
base = "0x3B6E8000"
size = "0x8000"
host_offset = "0x0"
[[adsp.mem_zone]]
type = "SRAM"
base = "0x92400000"
size = "0x800000"
host_offset = "0x0"
20 changes: 20 additions & 0 deletions config/imx8ulp.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version = [1, 0] # use simple file write

[adsp]
name = "imx8ulp"

[[adsp.mem_zone]]
type = "IRAM"
base = "0x21170000"
size = "0x10000"
host_offset = "0x0"
[[adsp.mem_zone]]
type = "DRAM"
base = "0x21180000"
size = "0x10000"
host_offset = "0x10000"
[[adsp.mem_zone]]
type = "SRAM"
base = "0x1a000000"
size = "0x800000"
host_offset = "0x0"
20 changes: 20 additions & 0 deletions config/imx8x.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version = [1, 0] # use simple file write

[adsp]
name = "imx8x"

[[adsp.mem_zone]]
type = "IRAM"
base = "0x596F8000"
size = "0x800"
host_offset = "0x10000"
[[adsp.mem_zone]]
type = "DRAM"
base = "0x596e8000"
size = "0x8000"
host_offset = "0x0"
[[adsp.mem_zone]]
type = "SRAM"
base = "0x92400000"
size = "0x800000"
host_offset = "0x0"
53 changes: 53 additions & 0 deletions config/jsl.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
version = [1, 8]

[adsp]
name = "icl"
image_size = "0x110000" # (16 + 1) bank * 64KB

[[adsp.mem_zone]]
type = "ROM"
base = "0xBEFE0000"
size = "0x00002000"
[[adsp.mem_zone]]
type = "IMR"
base = "0xB0038000"
size = "0x100000"
[[adsp.mem_zone]]
type = "SRAM"
base = "0xBE040000"
size = "0x100000"

[cse]
partition_name = "ADSP"
[[cse.entry]]
name = "ADSP.man"
offset = "0x58"
length = "0x378"
[[cse.entry]]
name = "cavs0015.met"
offset = "0x400"
length = "0x60"
[[cse.entry]]
name = "cavs0015"
offset = "0x480"
length = "0x0" # calculated by rimage

[css]

[signed_pkg]
name = "ADSP"
[[signed_pkg.module]]
name = "cavs0015.met"

[partition_info]
name = "ADSP"
[[partition_info.module]]
name = "cavs0015.met"

[adsp_file]
[[adsp_file.comp]]
base_offset = "0x2000"

[fw_desc.header]
name = "ADSPFW"
load_offset = "0x30000"
22 changes: 22 additions & 0 deletions config/kbl.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
version = [1, 5]

[adsp]
name = "kbl"
image_size = "0x200000" # (30 + 2) bank * 64KB

[[adsp.mem_zone]]
type = "ROM"
base = "0xBEFE0000"
size = "0x00002000"
[[adsp.mem_zone]]
type = "SRAM"
base = "0xA000A000"
size = "0x100000"

[css]

[fw_desc.header]
name = "ADSPFW"
load_offset = "0"
hw_buf_base_addr = "0xBE500000"
hw_buf_length = "0x4A000"
Loading

0 comments on commit 24d5925

Please sign in to comment.