rimage: mtl: fix key slot setup based on imr type

Clean cherry-pick from separate rimage repo https://github.com/thesofproject/rimage/commits/stable-v2.7 This will properly setup partition_usage field and remove fixed 0x23 value from mtl toml Signed-off-by: Adrian Bonislawski <[email protected]> (cherry picked from commit fbea59358d06ffa86645cdf4ce0996e352742eb5)
thesofproject · Oct 27, 2023 · fdaaeb4 · fdaaeb4
1 parent 20705ad
commit fdaaeb4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/tools/rimage/config/mtl.toml b/tools/rimage/config/mtl.toml
@@ -44,7 +44,6 @@ length = "0x0"  # calculated by rimage
 
 [signed_pkg]
 name = "ADSP"
-partition_usage = "0x23"
 [[signed_pkg.module]]
 name = "ADSP.met"
 

diff --git a/tools/rimage/src/adsp_config.c b/tools/rimage/src/adsp_config.c
@@ -1087,9 +1087,7 @@ static int parse_signed_pkg_ace_v1_5(const toml_table_t *toml, struct parse_ctx
 	if (ret < 0)
 		return ret;
 
-	out->partition_usage = parse_uint32_hex_key(signed_pkg, &ctx, "partition_usage", 0, &ret);
-	if (ret < 0)
-		return ret;
+	out->partition_usage = 0x20 + image->imr_type;
 
 	/* check everything parsed, expect 1 more array */
 	ctx.array_cnt += 1;

diff --git a/tools/rimage/src/rimage.c b/tools/rimage/src/rimage.c
@@ -191,8 +191,6 @@ int main(int argc, char *argv[])
 	}
 
 	if (image.adsp->man_ace_v1_5) {
-		if (imr_type_override)
-			image.adsp->man_ace_v1_5->adsp_file_ext.imr_type = image.imr_type;
 		image.adsp->man_ace_v1_5->css.reserved0 = pv_bit;
 	}