board_f: powerpc: Make prt_8260_rsr(), prt_8260_clks() private

[J-u-boot.git] / disk / part_dos.c

diff --git a/disk/part_dos.c b/disk/part_dos.c
index 511917a44491e039a396f606da6806d2f4cbe7ac..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
@@ -209,41 +209,15 @@ static int part_get_info_extended(struct blk_desc *dev_desc,
                        info->start = (lbaint_t)(ext_part_sector +
                                        le32_to_int(pt->start4));
                        info->size  = (lbaint_t)le32_to_int(pt->size4);
-                       switch(dev_desc->if_type) {
-                               case IF_TYPE_IDE:
-                               case IF_TYPE_SATA:
-                               case IF_TYPE_ATAPI:
-                                       sprintf((char *)info->name, "hd%c%d",
-                                               'a' + dev_desc->devnum,
-                                               part_num);
-                                       break;
-                               case IF_TYPE_SCSI:
-                                       sprintf((char *)info->name, "sd%c%d",
-                                               'a' + dev_desc->devnum,
-                                               part_num);
-                                       break;
-                               case IF_TYPE_USB:
-                                       sprintf((char *)info->name, "usbd%c%d",
-                                               'a' + dev_desc->devnum,
-                                               part_num);
-                                       break;
-                               case IF_TYPE_DOC:
-                                       sprintf((char *)info->name, "docd%c%d",
-                                               'a' + dev_desc->devnum,
-                                               part_num);
-                                       break;
-                               default:
-                                       sprintf((char *)info->name, "xx%c%d",
-                                               'a' + dev_desc->devnum,
-                                               part_num);
-                                       break;
-                       }
+                       part_set_generic_name(dev_desc, part_num,
+                                             (char *)info->name);
                        /* 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;
                }
 
@@ -276,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;
@@ -297,9 +271,30 @@ int part_get_info_dos(struct blk_desc *dev_desc, int part,
        return part_get_info_extended(dev_desc, 0, 0, 1, part, info, 0);
 }
 
+int is_valid_dos_buf(void *buf)
+{
+       return test_block_type(buf) == DOS_MBR ? 0 : -1;
+}
+
+int write_mbr_partition(struct blk_desc *dev_desc, void *buf)
+{
+       if (is_valid_dos_buf(buf))
+               return -1;
+
+       /* write MBR */
+       if (blk_dwrite(dev_desc, 0, 1, buf) != 1) {
+               printf("%s: failed writing '%s' (1 blks at 0x0)\n",
+                      __func__, "MBR");
+               return 1;
+       }
+
+       return 0;
+}
+
 U_BOOT_PART_TYPE(dos) = {
        .name           = "DOS",
        .part_type      = PART_TYPE_DOS,
+       .max_entries    = DOS_ENTRY_NUMBERS,
        .get_info       = part_get_info_ptr(part_get_info_dos),
        .print          = part_print_ptr(part_print_dos),
        .test           = part_test_dos,