OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xtensa-build-zephyr.py: stop passing `--tool-data rimage/config/` 

We used to use `-- -c rimage/config/platf.toml` for the IPC4 overlay and
the older `--tool-data rimage/config/` for the rest. This was confusing,
inconsistent and used to print this warning:

```
WARNING: --tool-data /var/home/mherber2/SOF/sof/rimage/config ignored,
         overridden by: -- -c ...
```

`--tool-data` was always a bad idea. It looks generic but it's not; it
allows changing only a config directory that is always in the same
location.

Copy what `west sign` does with `--tool-data`, drop it and use `-- -c`
always.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2023-05-09 23:36:35 +00:00 committed by Kai Vehmanen
parent 9bbbac778a
commit 3ac849eac5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/xtensa-build-zephyr.py
View File

@ -525,7 +525,6 @@ def rimage_configuration(platform_dict):
sign_cmd = []
rimage_executable = shutil.which("rimage", path=RIMAGE_BUILD_DIR)
rimage_config = RIMAGE_SOURCE_DIR / "config"
sign_cmd += ["--tool-path", rimage_executable]
signing_key = ""
@ -536,7 +535,7 @@ def rimage_configuration(platform_dict):
else:
signing_key = default_rimage_key
sign_cmd += ["--tool-data", str(rimage_config), "--", "-k", str(signing_key)]
sign_cmd += ["--", "-k", str(signing_key)]
sof_fw_vers = get_sof_version()
@ -551,8 +550,11 @@ def rimage_configuration(platform_dict):
sign_cmd += ["-b", "1"]
if args.ipc == "IPC4":
rimage_desc = pathlib.Path(SOF_TOP, "rimage", "config", platform_dict["IPC4_RIMAGE_DESC"])
sign_cmd += ["-c", str(rimage_desc)]
rimage_desc = platform_dict["IPC4_RIMAGE_DESC"]
else:
rimage_desc = platform_dict["name"] + ".toml"
sign_cmd += ["-c", str(RIMAGE_SOURCE_DIR / "config" / rimage_desc)]
return sign_cmd