smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

part: Add accessors for struct disk_partition uuid

Browse Source 
This field is only present when a CONFIG is set. To avoid annoying #ifdefs
in the source code, add accessors. Update all code to use it.

Note that the accessor is optional. It can be omitted if it is known that
the option is enabled.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2023-08-24 13:55:31 -06:00
committed by Tom Rini
parent ade2316da3
commit c5f1d005f5
6 changed files with 58 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
disk/part_dos.c
View File

@@ -231,10 +231,8 @@ static int part_get_info_extended(struct blk_desc *desc,
return -1;
}
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
if (!ext_part_sector)
if (CONFIG_IS_ENABLED(PARTITION_UUIDS) && !ext_part_sector)
disksig = get_unaligned_le32(&buffer[DOS_PART_DISKSIG_OFFSET]);
#endif
ret = part_get_info_whole_disk(desc, &wdinfo);
if (ret)
@@ -263,9 +261,12 @@ static int part_get_info_extended(struct blk_desc *desc,
/* sprintf(info->type, "%d, pt->sys_ind); */
strcpy((char *)info->type, "U-Boot");
info->bootable = get_bootable(pt);
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
sprintf(info->uuid, "%08x-%02x", disksig, part_num);
#endif
if (CONFIG_IS_ENABLED(PARTITION_UUIDS)) {
char str[12];
sprintf(str, "%08x-%02x", disksig, part_num);
disk_partition_set_uuid(info, str);
}
info->sys_ind = pt->sys_ind;
return 0;
}
@@ -302,9 +303,7 @@ static int part_get_info_extended(struct blk_desc *desc,
info->blksz = DOS_PART_DEFAULT_SECTOR;
info->bootable = 0;
strcpy((char *)info->type, "U-Boot");
#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
info->uuid[0] = 0;
#endif
disk_partition_clr_uuid(info);
return 0;
}