Merge git://www.denx.de/git/u-boot-imx

[platform/kernel/u-boot.git] / include / part.h

diff --git a/include/part.h b/include/part.h
index 243bcfd..83bce05 100644 (file)
--- a/include/part.h
+++ b/include/part.h
@@ -53,12 +53,15 @@ typedef struct disk_partition {
        uchar   name[32];       /* partition name                       */
        uchar   type[32];       /* string type description              */
        int     bootable;       /* Active/Bootable flag is set          */
-#ifdef CONFIG_PARTITION_UUIDS
+#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
        char    uuid[37];       /* filesystem UUID as string, if exists */
 #endif
 #ifdef CONFIG_PARTITION_TYPE_GUID
        char    type_guid[37];  /* type GUID as string, if exists       */
 #endif
+#ifdef CONFIG_DOS_PARTITION
+       uchar   sys_ind;        /* partition type                       */
+#endif
 } disk_partition_t;
 
 /* Misc _get_dev functions */
@@ -160,7 +163,8 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
  * @param gpt_name - the specified table entry name
  * @param info - returns the disk partition info
  *
- * @return - '0' on match, '-1' on no match, otherwise error
+ * @return - the partition number on match (starting on 1), -1 on no match,
+ * otherwise error
  */
 int part_get_info_by_name(struct blk_desc *dev_desc,
                              const char *name, disk_partition_t *info);