fsl-lsch2: csu: correct the workaround A-010315

[u-boot] / disk / part_dos.c

diff --git a/disk/part_dos.c b/disk/part_dos.c
index ed78334a9dd85059c81dc744692fa6dd34308853..7ede15ec261315e6922fdfd6298bf0f17f5220a4 100644 (file)
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -189,7 +189,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc,
                return -1;
        }
 
-#ifdef CONFIG_PARTITION_UUIDS
+#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
        if (!ext_part_sector)
                disksig = le32_to_int(&buffer[DOS_PART_DISKSIG_OFFSET]);
 #endif
@@ -214,9 +214,10 @@ static int part_get_info_extended(struct blk_desc *dev_desc,
                        /* sprintf(info->type, "%d, pt->sys_ind); */
                        strcpy((char *)info->type, "U-Boot");
                        info->bootable = is_bootable(pt);
-#ifdef CONFIG_PARTITION_UUIDS
+#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
                        sprintf(info->uuid, "%08x-%02x", disksig, part_num);
 #endif
+                       info->sys_ind = pt->sys_ind;
                        return 0;
                }
 
@@ -249,7 +250,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc,
                info->blksz = DOS_PART_DEFAULT_SECTOR;
                info->bootable = 0;
                strcpy((char *)info->type, "U-Boot");
-#ifdef CONFIG_PARTITION_UUIDS
+#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
                info->uuid[0] = 0;
 #endif
                return 0;