rimage

Author: softwarecki

tools/rimage/src/adsp_config.c

@@ -1910,7 +1910,7 @@ static int parse_module(const toml_table_t *toml, struct parse_ctx *pctx,
 		if (ret < 0)
 			return err_key_parse("uuid", NULL);
 
-		parse_uuid(buf, mod_man->uuid);
+		parse_uuid(buf, &mod_man->uuid);
 
 		mod_man->affinity_mask = parse_uint32_hex_key(mod_entry, &ctx_entry,
 							      "affinity_mask", 1, &ret);
@@ -1952,7 +1952,7 @@ static int parse_module(const toml_table_t *toml, struct parse_ctx *pctx,
 		header->version_major = 2;
 		header->version_minor = 5;
 		header->ext_module_config_length = sizeof(struct fw_ext_mod_config_header);
-		memcpy(header->guid, mod_man->uuid, sizeof(mod_man->uuid));
+		memcpy(header->guid, &mod_man->uuid, sizeof(mod_man->uuid));
 
 		type = parse_uint32_hex_key(mod_entry, &ctx_entry, "module_type", 1, &ret);
 		if (ret < 0)

tools/rimage/src/include/rimage/sof/user/manifest.h

@@ -86,13 +86,21 @@ struct sof_man_segment_desc {
 #define SOF_MAN_MOD_SHA384_LEN		48
 #define SOF_MAN_MOD_ID			{'$', 'A', 'M', 'E'}
 
+struct sof_man_uuid {
+	uint32_t a;
+	uint16_t b;
+	uint16_t c;
+	uint8_t  d[8];
+};
+
 /*
  * Each module has an entry in the FW header. Used by ROM - Immutable.
  */
 struct sof_man_module {
 	uint8_t struct_id[SOF_MAN_MOD_ID_LEN];	/* SOF_MAN_MOD_ID */
 	uint8_t name[SOF_MAN_MOD_NAME_LEN];
-	uint8_t uuid[16];
+	//uint8_t uuid[16];
+	struct sof_man_uuid uuid;
 	struct sof_man_module_type type;
 	uint8_t hash[SOF_MAN_MOD_SHA256_LEN];
 	uint32_t entry_point;

tools/rimage/src/include/rimage/toml_utils.h

@@ -115,7 +115,7 @@ void parse_str_key(const toml_table_t *table, struct parse_ctx *ctx, const char
  * Parse UUID hex string into a byte array. The endianness of the output
  * is architecture-dependent: do not use in any portable code.
  */
-void parse_uuid(const char *buf, uint8_t *uuid);
+void parse_uuid(const char *buf, void *uuid);
 
 /** version is stored as toml array with integer number, something like:
  *   "version = [1, 8]"

tools/rimage/src/manifest.c

@@ -205,7 +205,7 @@ static void man_get_section_manifest(struct image *image,
 	memcpy(man_module->struct_id, "$AME", 4);
 	man_module->entry_point = sof_mod->module.entry_point;
 	memcpy(man_module->name, sof_mod->module.name, SOF_MAN_MOD_NAME_LEN);
-	memcpy(man_module->uuid, sof_mod->module.uuid, 16);
+	memcpy(&man_module->uuid, &sof_mod->module.uuid, sizeof(man_module->uuid));
 	man_module->affinity_mask = sof_mod->module.affinity_mask;
 	man_module->instance_max_count = sof_mod->module.instance_max_count;
 	man_module->type.auto_start = sof_mod->module.type.auto_start;

tools/rimage/src/toml_utils.c

@@ -290,7 +290,7 @@ void parse_str_key(const toml_table_t *table, struct parse_ctx *ctx, const char
 	dst[capacity - 1] = 0;
 }
 
-void parse_uuid(const char *buf, uint8_t *uuid)
+void parse_uuid(const char *buf, void *uuid)
 {
 	struct uuid_t id;
 	uint32_t d[11];