From 9fff491710e90244237e62136efca613f75d849e Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Tue, 24 Sep 2024 15:20:30 +0200 Subject: [PATCH 1/2] rimage: use platform extra flags when signing LLEXT modules The user can configure west to pass additional arguments to rimage for signing, we need to use them when signing LLEXT modules too. Signed-off-by: Guennadi Liakhovetski (cherry picked from commit e936b3a2a42de286cdbe2ac7921a7ff696ff159b) Signed-off-by: Kai Vehmanen --- scripts/xtensa-build-zephyr.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py index d4049df7c2f4..05389f428463 100755 --- a/scripts/xtensa-build-zephyr.py +++ b/scripts/xtensa-build-zephyr.py @@ -957,8 +957,11 @@ def install_lib(sof_lib_dir, abs_build_dir, platform_wconfig): rimage_cmd = shlex.split(platform_wconfig.get('rimage.path'))[0] sign_cmd = [rimage_cmd, "-o", str(llext_output), "-e", "-c", str(rimage_cfg), - "-k", str(signing_key), "-l", "-r", - str(llext_input)] + "-k", str(signing_key), "-l", "-r"] + _ws_args = platform_wconfig.get("rimage.extra-args") + if _ws_args is not None: + sign_cmd.extend(shlex.split(_ws_args)) + sign_cmd.append(str(llext_input)) execute_command(sign_cmd, cwd=west_top) # An intuitive way to make this multiline would be From 0fbd5cbb9c694c4a36127fafb5269fd2e1820b51 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Tue, 24 Sep 2024 17:24:34 +0300 Subject: [PATCH 2/2] versions.js: bump version to 2.11.1 Bump the version to 2.11.1 to prepare for release. Signed-off-by: Kai Vehmanen --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index d11440dcb8e7..f7e7858a491d 100644 --- a/versions.json +++ b/versions.json @@ -2,6 +2,6 @@ "SOF": { "MAJOR": "2", "MINOR": "11", - "MICRO": "0" + "MICRO": "1" } }