diff --git a/tools/rimage/config/lnl.toml b/tools/rimage/config/lnl.toml index 04f9cb18b75e..879ec9097231 100644 --- a/tools/rimage/config/lnl.toml +++ b/tools/rimage/config/lnl.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 index ac196075a2b0..9a9423cbada7 100644 --- 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 index 735075c130cc..887dd85ed755 100644 --- 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; }