net: enc28j60_lpc2292: drop unused !NET_MULTI driver

[u-boot] / disk / part_efi.c

diff --git a/disk/part_efi.c b/disk/part_efi.c
index d8a81115c5a94993862cd06fe1a29260a880bae4..0a513c6ed03927b5d8fb1e8cd90e5c01857aa922 100644 (file)
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -35,13 +35,15 @@
 #include <ide.h>
 #include <malloc.h>
 #include "part_efi.h"
+#include <linux/ctype.h>
 
-#if (defined(CONFIG_CMD_IDE) || \
-     defined(CONFIG_CMD_SATA) || \
-     defined(CONFIG_CMD_SCSI) || \
-     defined(CONFIG_CMD_USB) || \
-     defined(CONFIG_MMC) || \
-     defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_EFI_PARTITION)
+#if defined(CONFIG_CMD_IDE) || \
+    defined(CONFIG_CMD_MG_DISK) || \
+    defined(CONFIG_CMD_SATA) || \
+    defined(CONFIG_CMD_SCSI) || \
+    defined(CONFIG_CMD_USB) || \
+    defined(CONFIG_MMC) || \
+    defined(CONFIG_SYSTEMACE)
 
 /* Convert char[2] in little endian format to the host format integer
  */
@@ -98,6 +100,20 @@ static gpt_entry *alloc_read_gpt_entries(block_dev_desc_t * dev_desc,
 
 static int is_pte_valid(gpt_entry * pte);
 
+static char *print_efiname(gpt_entry *pte)
+{
+       static char name[PARTNAME_SZ + 1];
+       int i;
+       for (i = 0; i < PARTNAME_SZ; i++) {
+               u8 c;
+               c = pte->partition_name[i] & 0xff;
+               c = (c && !isprint(c)) ? '.' : c;
+               name[i] = c;
+       }
+       name[PARTNAME_SZ] = 0;
+       return name;
+}
+
 /*
  * Public Functions (include/part.h)
  */
@@ -121,12 +137,12 @@ void print_part_efi(block_dev_desc_t * dev_desc)
 
        debug("%s: gpt-entry at 0x%08X\n", __FUNCTION__, (unsigned int)*pgpt_pte);
 
-       printf("Part  Start LBA  End LBA\n");
+       printf("Part\tName\t\t\tStart LBA\tEnd LBA\n");
        for (i = 0; i < le32_to_int(gpt_head.num_partition_entries); i++) {
 
                if (is_pte_valid(&(*pgpt_pte)[i])) {
-                       printf("%s%d  0x%llX    0x%llX\n", GPT_ENTRY_NAME,
-                               (i + 1),
+                       printf("%3d\t%-18s\t0x%08llX\t0x%08llX\n", (i + 1),
+                               print_efiname(&(*pgpt_pte)[i]),
                                le64_to_int((*pgpt_pte)[i].starting_lba),
                                le64_to_int((*pgpt_pte)[i].ending_lba));
                } else {
@@ -168,7 +184,8 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part,
                     - info->start;
        info->blksz = GPT_BLOCK_SIZE;
 
-       sprintf((char *)info->name, "%s%d\n", GPT_ENTRY_NAME, part);
+       sprintf((char *)info->name, "%s",
+                       print_efiname(&(*pgpt_pte)[part - 1]));
        sprintf((char *)info->type, "U-Boot");
 
        debug("%s: start 0x%lX, size 0x%lX, name %s", __FUNCTION__,